From 3ad7a67afcb6c8bd940f9e8e8720941a3dbf66d4 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 22 Jun 2020 21:31:04 -0400 Subject: [PATCH] Drop arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch Signed-off-by: Sasha Levin --- ...itch-existing-boards-with-rgmii-phy-.patch | 72 ------------------- queue-4.19/series | 1 - ...itch-existing-boards-with-rgmii-phy-.patch | 72 ------------------- queue-5.4/series | 1 - ...itch-existing-boards-with-rgmii-phy-.patch | 72 ------------------- queue-5.7/series | 1 - 6 files changed, 219 deletions(-) delete mode 100644 queue-4.19/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch delete mode 100644 queue-5.4/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch delete mode 100644 queue-5.7/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch diff --git a/queue-4.19/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch b/queue-4.19/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch deleted file mode 100644 index 2e573da9582..00000000000 --- a/queue-4.19/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From d8ab4d7f5e33de5a91ad6d2f97211b498b781f35 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 12 May 2020 23:51:48 +0200 -Subject: ARM: dts: meson: Switch existing boards with RGMII PHY to "rgmii-id" - -From: Martin Blumenstingl - -[ Upstream commit 005231128e9e97461e81fa32421957a7664317ca ] - -Let the PHY generate the RX and TX delay on the Odroid-C1 and MXIII -Plus. - -Previously we did not know that these boards used an RX delay. We -assumed that setting the TX delay on the MAC side It turns out that -these boards also require an RX delay of 2ns (verified on Odroid-C1, -but the u-boot code uses the same setup on both boards). Ethernet only -worked because u-boot added this RX delay on the MAC side. - -The 4ns TX delay was also wrong and the result of using an unsupported -RGMII TX clock divider setting. This has been fixed in the driver with -commit bd6f48546b9cb7 ("net: stmmac: dwmac-meson8b: Fix the RGMII TX -delay on Meson8b/8m2 SoCs"). - -Switch to phy-mode "rgmii-id" to let the PHY side handle all the delays, -(as recommended by the Ethernet maintainers anyways) to correctly -describe the need for a 2ns RX as well as 2ns TX delay on these boards. -This fixes the Ethernet performance on Odroid-C1 where there was a huge -amount of packet loss when transmitting data due to the incorrect TX -delay. - -Signed-off-by: Martin Blumenstingl -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20200512215148.540322-3-martin.blumenstingl@googlemail.com -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/meson8b-odroidc1.dts | 3 +-- - arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts -index 8fdeeffecbdbc..368b1dd57aec1 100644 ---- a/arch/arm/boot/dts/meson8b-odroidc1.dts -+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts -@@ -113,9 +113,8 @@ - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - -- phy-mode = "rgmii"; - phy-handle = <ð_phy>; -- amlogic,tx-delay-ns = <4>; -+ phy-mode = "rgmii-id"; - - mdio { - compatible = "snps,dwmac-mdio"; -diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -index 6ac02beb5fa72..feac69264ba3b 100644 ---- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -+++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -@@ -63,9 +63,7 @@ - pinctrl-names = "default"; - - phy-handle = <ð_phy0>; -- phy-mode = "rgmii"; -- -- amlogic,tx-delay-ns = <4>; -+ phy-mode = "rgmii-id"; - - snps,reset-gpio = <&gpio GPIOH_4 0>; - snps,reset-delays-us = <0 10000 1000000>; --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 2b12fd0991c..fccf15e1fea 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -95,7 +95,6 @@ usb-host-ehci-mxc-add-error-handling-in-ehci_mxc_drv.patch tty-n_gsm-fix-bogus-i-in-gsm_data_kick.patch fpga-dfl-afu-corrected-error-handling-levels.patch clk-samsung-exynos5433-add-ignore_unused-flag-to-scl.patch -arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch scsi-target-tcmu-userspace-must-not-complete-queued-.patch arm64-tegra-fix-ethernet-phy-mode-for-jetson-xavier.patch powerpc-64s-pgtable-fix-an-undefined-behaviour.patch diff --git a/queue-5.4/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch b/queue-5.4/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch deleted file mode 100644 index 62a01ef9f75..00000000000 --- a/queue-5.4/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 048abb09d16bddb1e4770633a2a1b4adb0029243 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 12 May 2020 23:51:48 +0200 -Subject: ARM: dts: meson: Switch existing boards with RGMII PHY to "rgmii-id" - -From: Martin Blumenstingl - -[ Upstream commit 005231128e9e97461e81fa32421957a7664317ca ] - -Let the PHY generate the RX and TX delay on the Odroid-C1 and MXIII -Plus. - -Previously we did not know that these boards used an RX delay. We -assumed that setting the TX delay on the MAC side It turns out that -these boards also require an RX delay of 2ns (verified on Odroid-C1, -but the u-boot code uses the same setup on both boards). Ethernet only -worked because u-boot added this RX delay on the MAC side. - -The 4ns TX delay was also wrong and the result of using an unsupported -RGMII TX clock divider setting. This has been fixed in the driver with -commit bd6f48546b9cb7 ("net: stmmac: dwmac-meson8b: Fix the RGMII TX -delay on Meson8b/8m2 SoCs"). - -Switch to phy-mode "rgmii-id" to let the PHY side handle all the delays, -(as recommended by the Ethernet maintainers anyways) to correctly -describe the need for a 2ns RX as well as 2ns TX delay on these boards. -This fixes the Ethernet performance on Odroid-C1 where there was a huge -amount of packet loss when transmitting data due to the incorrect TX -delay. - -Signed-off-by: Martin Blumenstingl -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20200512215148.540322-3-martin.blumenstingl@googlemail.com -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/meson8b-odroidc1.dts | 3 +-- - arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts -index a24eccc354b95..10f6d601eadb2 100644 ---- a/arch/arm/boot/dts/meson8b-odroidc1.dts -+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts -@@ -202,9 +202,8 @@ - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - -- phy-mode = "rgmii"; - phy-handle = <ð_phy>; -- amlogic,tx-delay-ns = <4>; -+ phy-mode = "rgmii-id"; - - nvmem-cells = <ðernet_mac_address>; - nvmem-cell-names = "mac-address"; -diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -index d54477b1001ca..cc498191ddd1d 100644 ---- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -+++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -@@ -69,9 +69,7 @@ - pinctrl-names = "default"; - - phy-handle = <ð_phy0>; -- phy-mode = "rgmii"; -- -- amlogic,tx-delay-ns = <4>; -+ phy-mode = "rgmii-id"; - - mdio { - compatible = "snps,dwmac-mdio"; --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index b73c3429f0b..01d6ce63699 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -157,7 +157,6 @@ usb-host-ehci-mxc-add-error-handling-in-ehci_mxc_drv.patch tty-n_gsm-fix-bogus-i-in-gsm_data_kick.patch fpga-dfl-afu-corrected-error-handling-levels.patch clk-samsung-exynos5433-add-ignore_unused-flag-to-scl.patch -arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch rdma-hns-bugfix-for-querying-qkey.patch rdma-hns-fix-cmdq-parameter-of-querying-pf-timer-res.patch scsi-target-tcmu-userspace-must-not-complete-queued-.patch diff --git a/queue-5.7/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch b/queue-5.7/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch deleted file mode 100644 index fb623872133..00000000000 --- a/queue-5.7/arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f70cd33d4d9e3b6cd379fbbe0ccee7b03343dc24 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 12 May 2020 23:51:48 +0200 -Subject: ARM: dts: meson: Switch existing boards with RGMII PHY to "rgmii-id" - -From: Martin Blumenstingl - -[ Upstream commit 005231128e9e97461e81fa32421957a7664317ca ] - -Let the PHY generate the RX and TX delay on the Odroid-C1 and MXIII -Plus. - -Previously we did not know that these boards used an RX delay. We -assumed that setting the TX delay on the MAC side It turns out that -these boards also require an RX delay of 2ns (verified on Odroid-C1, -but the u-boot code uses the same setup on both boards). Ethernet only -worked because u-boot added this RX delay on the MAC side. - -The 4ns TX delay was also wrong and the result of using an unsupported -RGMII TX clock divider setting. This has been fixed in the driver with -commit bd6f48546b9cb7 ("net: stmmac: dwmac-meson8b: Fix the RGMII TX -delay on Meson8b/8m2 SoCs"). - -Switch to phy-mode "rgmii-id" to let the PHY side handle all the delays, -(as recommended by the Ethernet maintainers anyways) to correctly -describe the need for a 2ns RX as well as 2ns TX delay on these boards. -This fixes the Ethernet performance on Odroid-C1 where there was a huge -amount of packet loss when transmitting data due to the incorrect TX -delay. - -Signed-off-by: Martin Blumenstingl -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20200512215148.540322-3-martin.blumenstingl@googlemail.com -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/meson8b-odroidc1.dts | 3 +-- - arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts -index a2a47804fc4a8..cb21ac9f517c1 100644 ---- a/arch/arm/boot/dts/meson8b-odroidc1.dts -+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts -@@ -202,9 +202,8 @@ - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - -- phy-mode = "rgmii"; - phy-handle = <ð_phy>; -- amlogic,tx-delay-ns = <4>; -+ phy-mode = "rgmii-id"; - - nvmem-cells = <ðernet_mac_address>; - nvmem-cell-names = "mac-address"; -diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -index d54477b1001ca..cc498191ddd1d 100644 ---- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -+++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -@@ -69,9 +69,7 @@ - pinctrl-names = "default"; - - phy-handle = <ð_phy0>; -- phy-mode = "rgmii"; -- -- amlogic,tx-delay-ns = <4>; -+ phy-mode = "rgmii-id"; - - mdio { - compatible = "snps,dwmac-mdio"; --- -2.25.1 - diff --git a/queue-5.7/series b/queue-5.7/series index 6405825ac83..7628161c852 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -233,7 +233,6 @@ coresight-fix-support-for-sparsely-populated-ports.patch coresight-etm4x-fix-use-after-free-of-per-cpu-etm-dr.patch fpga-dfl-afu-corrected-error-handling-levels.patch clk-samsung-exynos5433-add-ignore_unused-flag-to-scl.patch -arm-dts-meson-switch-existing-boards-with-rgmii-phy-.patch rdma-hns-bugfix-for-querying-qkey.patch rdma-hns-fix-cmdq-parameter-of-querying-pf-timer-res.patch scsi-target-tcmu-userspace-must-not-complete-queued-.patch -- 2.47.3