diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 19:12:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 19:12:07 -0400 |
| commit | f41842c3d46da781e372fbb22fdaeaf482ab5ce8 (patch) | |
| tree | f3980a8717d590e07801809e96a8a3c9d01358a0 | |
| parent | e7b8e883d1fb136933aa5e564a33063660904634 (diff) | |
| download | longterm-queue-4.12-f41842c3d46da781e372fbb22fdaeaf482ab5ce8.tar.gz | |
net: drop dsa patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-dsa-lan9303-Do-not-disable-switch-fabric-port-0-.patch | 48 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 49 deletions
diff --git a/queue/net-dsa-lan9303-Do-not-disable-switch-fabric-port-0-.patch b/queue/net-dsa-lan9303-Do-not-disable-switch-fabric-port-0-.patch deleted file mode 100644 index fdcb1d1..0000000 --- a/queue/net-dsa-lan9303-Do-not-disable-switch-fabric-port-0-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3c91b0c1de8d013490bbc41ce9ee8810ea5baddd Mon Sep 17 00:00:00 2001 -From: Egil Hjelmeland <privat@egil-hjelmeland.no> -Date: Tue, 24 Oct 2017 17:14:10 +0200 -Subject: [PATCH] net: dsa: lan9303: Do not disable switch fabric port 0 at - .probe - -commit 3c91b0c1de8d013490bbc41ce9ee8810ea5baddd upstream. - -Make the LAN9303 work when lan9303_probe() is called twice. - -For some unknown reason the LAN9303 switch fail to forward data when switch -fabric port 0 TX is disabled during probe. (Write of LAN9303_MAC_TX_CFG_0 -in lan9303_disable_processing_port().) - -In that situation the switch fabric seem to receive frames, because the ALR -is learning addresses. But no frames are transmitted on any of the ports. - -In our system lan9303_probe() is called twice, first time -dsa_register_switch() return -EPROBE_DEFER. As an experiment, modified the -code to skip writing LAN9303_MAC_TX_CFG_0, port 0 during the first probe. -Then the switch works as expected. - -Resolve the problem by not calling lan9303_disable_processing_port() on -port 0 during probe. Ports 1 and 2 are still disabled. - -Although unsatisfying that the exact failure mechanism is not known, -the patch should not cause any harm. - -Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no> -Reviewed-by: Andrew Lunn <andrew@lunn.ch> -Signed-off-by: David S. Miller <davem@davemloft.net> - -diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c -index 87f919f0e641..4c412bd52319 100644 ---- a/drivers/net/dsa/lan9303-core.c -+++ b/drivers/net/dsa/lan9303-core.c -@@ -818,7 +818,7 @@ static int lan9303_disable_processing(struct lan9303 *chip) - { - int p; - -- for (p = 0; p < LAN9303_NUM_PORTS; p++) { -+ for (p = 1; p < LAN9303_NUM_PORTS; p++) { - int ret = lan9303_disable_processing_port(chip, p); - - if (ret) --- -2.15.0 - diff --git a/queue/series b/queue/series index 27fee63..c191b6d 100644 --- a/queue/series +++ b/queue/series @@ -81,7 +81,6 @@ nvme-use-kref_get_unless_zero-in-nvme_find_get_ns.patch l2tp-cleanup-l2tp_tunnel_delete-calls.patch xfs-fix-log-block-underflow-during-recovery-cycle-ve.patch xfs-fix-incorrect-extent-state-in-xfs_bmap_add_exten.patch -net-dsa-lan9303-Do-not-disable-switch-fabric-port-0-.patch RDMA-cxgb4-Declare-stag-as-__be32.patch PCI-Detach-driver-before-procfs-sysfs-teardown-on-de.patch scsi-hisi_sas-fix-the-risk-of-freeing-slot-twice.patch |