[armhf] dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode

Closes: #988574

3 files changed, 45 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 94eda8a3d66b..762fe260af4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ linux (5.10.38-2) UNRELEASED; urgency=medium
   * bpf: Wrap aux data inside bpf_sanitize_info container (CVE-2021-33200)
   * bpf: Fix mask direction swap upon off reg sign change (CVE-2021-33200)
   * bpf: No need to simulate speculative domain for immediates (CVE-2021-33200)
+  * [armhf] dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode
+    (Closes: #988574)
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Thu, 27 May 2021 14:24:21 +0200
 
diff --git a/debian/patches/bugfix/arm/ARM-dts-sun8i-h3-orangepi-plus-Fix-ethernet-phy-mode.patch b/debian/patches/bugfix/arm/ARM-dts-sun8i-h3-orangepi-plus-Fix-ethernet-phy-mode.patch
new file mode 100644
index 000000000000..11daff1248c0
--- /dev/null
+++ b/debian/patches/bugfix/arm/ARM-dts-sun8i-h3-orangepi-plus-Fix-ethernet-phy-mode.patch
@@ -0,0 +1,42 @@
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Tue, 18 May 2021 22:33:49 +0200
+Subject: ARM: dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode
+Origin: https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/patch/?id=b19d3479f25e8a0ff24df0b46c82e50ef0f900dd
+Bug-Debian: https://bugs.debian.org/988574
+
+Commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay
+config") sets the RX/TX delay according to the phy-mode property in the
+device tree. For the Orange Pi Plus board this is "rgmii", which is the
+wrong setting.
+
+Following the example of a900cac3750b ("ARM: dts: sun7i: a20: bananapro:
+Fix ethernet phy-mode") the phy-mode is changed to "rgmii-id" which gets
+the Ethernet working again on this board.
+
+Fixes: bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay config")
+Reported-by: "B.R. Oake" <broake@mailfence.com>
+Reported-by: Vagrant Cascadian <vagrant@reproducible-builds.org>
+Link: https://bugs.debian.org/988574
+Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://lore.kernel.org/r/20210524122111.416885-1-carnil@debian.org
+---
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+index 97f497854e05d..d05fa679dcd30 100644
+--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
++++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+@@ -85,7 +85,7 @@
+ 	pinctrl-0 = <&emac_rgmii_pins>;
+ 	phy-supply = <&reg_gmac_3v3>;
+ 	phy-handle = <&ext_rgmii_phy>;
+-	phy-mode = "rgmii";
++	phy-mode = "rgmii-id";
+ 
+ 	status = "okay";
+ };
+-- 
+2.32.0.rc0
+
diff --git a/debian/patches/series b/debian/patches/series
index 5e6ffa6b0856..e8834a3c94fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -76,6 +76,7 @@ bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch
 bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch
 bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
 bugfix/x86/x86-32-disable-3dnow-in-generic-config.patch
+bugfix/arm/ARM-dts-sun8i-h3-orangepi-plus-Fix-ethernet-phy-mode.patch
 
 # Arch features
 features/arm64/arm64-dts-rockchip-Add-basic-support-for-Kobol-s-Hel.patch