From: Greg Kroah-Hartman Date: Thu, 29 Mar 2018 17:24:01 +0000 (+0200) Subject: drop broken 3.18 patch X-Git-Tag: v4.15.15~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05dd7d429cf34360aedbb25fd24e136bb7ea4a3a;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken 3.18 patch --- diff --git a/queue-3.18/net-ethernet-ti-cpsw-add-check-for-in-band-mode-setting-with-rgmii-phy-interface.patch b/queue-3.18/net-ethernet-ti-cpsw-add-check-for-in-band-mode-setting-with-rgmii-phy-interface.patch deleted file mode 100644 index 1d394eab29a..00000000000 --- a/queue-3.18/net-ethernet-ti-cpsw-add-check-for-in-band-mode-setting-with-rgmii-phy-interface.patch +++ /dev/null @@ -1,47 +0,0 @@ -From foo@baz Thu Mar 29 08:53:48 CEST 2018 -From: "SZ Lin (林上智)" -Date: Fri, 16 Mar 2018 00:56:01 +0800 -Subject: net: ethernet: ti: cpsw: add check for in-band mode setting with RGMII PHY interface - -From: "SZ Lin (林上智)" - - -[ Upstream commit f9db50691db4a7d860fce985f080bb3fc23a7ede ] - -According to AM335x TRM[1] 14.3.6.2, AM437x TRM[2] 15.3.6.2 and -DRA7 TRM[3] 24.11.4.8.7.3.3, in-band mode in EXT_EN(bit18) register is only -available when PHY is configured in RGMII mode with 10Mbps speed. It will -cause some networking issues without RGMII mode, such as carrier sense -errors and low throughput. TI also mentioned this issue in their forum[4]. - -This patch adds the check mechanism for PHY interface with RGMII interface -type, the in-band mode can only be set in RGMII mode with 10Mbps speed. - -References: -[1]: https://www.ti.com/lit/ug/spruh73p/spruh73p.pdf -[2]: http://www.ti.com/lit/ug/spruhl7h/spruhl7h.pdf -[3]: http://www.ti.com/lit/ug/spruic2b/spruic2b.pdf -[4]: https://e2e.ti.com/support/arm/sitara_arm/f/791/p/640765/2392155 - -Suggested-by: Holsety Chen (陳憲輝) -Signed-off-by: SZ Lin (林上智) -Signed-off-by: Schuyler Patton -Reviewed-by: Grygorii Strashko -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ti/cpsw.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -872,7 +872,8 @@ static void _cpsw_adjust_link(struct cps - /* set speed_in input in case RMII mode is used in 100Mbps */ - if (phy->speed == 100) - mac_control |= BIT(15); -- else if (phy->speed == 10) -+ /* in band mode only works in 10Mbps RGMII mode */ -+ else if ((phy->speed == 10) && phy_interface_is_rgmii(phy)) - mac_control |= BIT(18); /* In Band mode */ - - if (priv->rx_pause) diff --git a/queue-3.18/series b/queue-3.18/series index 8723fafa678..0b119ced542 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -24,7 +24,6 @@ dccp-check-sk-for-closed-state-in-dccp_sendmsg.patch ipv6-fix-access-to-non-linear-packet-in-ndisc_fill_redirect_hdr_option.patch l2tp-do-not-accept-arbitrary-sockets.patch net-ethernet-arc-fix-a-potential-memory-leak-if-an-optional-regulator-is-deferred.patch -net-ethernet-ti-cpsw-add-check-for-in-band-mode-setting-with-rgmii-phy-interface.patch net-iucv-free-memory-obtained-by-kzalloc.patch netlink-avoid-a-double-skb-free-in-genlmsg_mcast.patch net-only-honor-ifindex-in-ip_pktinfo-if-non-0.patch