From 81e46d2a2330b695b48296e6876796a755dcfd54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 5 May 2025 13:01:55 +0200 Subject: [PATCH] generic: 6.12: sync Realtek PHY patches with upstream MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Fix order of patches (3d483a10327f was merged before 34d5a86ff7bb). - Reorganize patch numbers now that < 6.12 patches are no longer needed. Signed-off-by: Álvaro Fernández Rojas --- ...ealtek-read-duplex-and-gbit-master-from-PHY.patch} | 2 +- ...ealtek-change-order-of-calls-in-C22-read_st.patch} | 3 +-- ...ealtek-clear-1000Base-T-link-partner-advert.patch} | 2 +- ...ealtek-merge-the-drivers-for-internal-NBase.patch} | 0 ...3-net-phy-realtek-add-RTL8125D-internal-PHY.patch} | 0 ...ealtek-add-support-for-reading-MDIO_MMD_VEN.patch} | 0 ...ealtek-clear-1000Base-T-lpa-if-link-is-down.patch} | 2 +- ...ealtek-clear-master_slave_state-if-link-is-.patch} | 2 +- ...14-net-phy-realtek-always-clear-NBase-T-lpa.patch} | 2 +- ...ove-realtek-PHY-driver-to-its-own-subdirect.patch} | 0 ...ealtek-add-hwmon-support-for-temp-sensor-on.patch} | 11 ++--------- ...ealtek-HWMON-support-for-standalone-version.patch} | 0 ...ealtek-make-HWMON-support-a-user-visible-Kc.patch} | 0 ...-net-phy-realtek-use-string-choices-helpers.patch} | 0 ...ealtek-improve-mmd-register-access-for-inte.patch} | 0 ...ealtek-switch-from-paged-to-MMD-ops-in-rtl8.patch} | 0 ...phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch} | 0 ...ealtek-add-defines-for-shadowed-c45-standar.patch} | 0 ...-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch} | 0 19 files changed, 8 insertions(+), 16 deletions(-) rename target/linux/generic/backport-6.12/{781-15-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch => 781-01-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch} (97%) rename target/linux/generic/backport-6.12/{781-16-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch => 781-02-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch} (96%) rename target/linux/generic/backport-6.12/{781-17-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch => 781-03-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch} (93%) rename target/linux/generic/backport-6.12/{781-18-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch => 781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch} (100%) rename target/linux/generic/backport-6.12/{781-19-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch => 781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch} (100%) rename target/linux/generic/backport-6.12/{781-23-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch => 781-06-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch} (100%) rename target/linux/generic/backport-6.12/{781-20-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch => 781-07-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch} (96%) rename target/linux/generic/backport-6.12/{781-21-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch => 781-08-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch} (95%) rename target/linux/generic/backport-6.12/{781-22-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch => 781-09-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch} (95%) rename target/linux/generic/backport-6.12/{781-24-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch => 781-10-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch} (100%) rename target/linux/generic/backport-6.12/{781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch => 781-11-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch} (95%) rename target/linux/generic/backport-6.12/{781-26-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch => 781-12-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch} (100%) rename target/linux/generic/backport-6.12/{781-27-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch => 781-13-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch} (100%) rename target/linux/generic/backport-6.12/{781-28-v6.15-net-phy-realtek-use-string-choices-helpers.patch => 781-14-v6.15-net-phy-realtek-use-string-choices-helpers.patch} (100%) rename target/linux/generic/backport-6.12/{781-29-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch => 781-15-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch} (100%) rename target/linux/generic/backport-6.12/{781-30-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch => 781-16-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch} (100%) rename target/linux/generic/backport-6.12/{781-31-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch => 781-17-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch} (100%) rename target/linux/generic/backport-6.12/{781-32-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch => 781-18-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch} (100%) rename target/linux/generic/backport-6.12/{781-33-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch => 781-19-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch} (100%) diff --git a/target/linux/generic/backport-6.12/781-15-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch b/target/linux/generic/backport-6.12/781-01-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch similarity index 97% rename from target/linux/generic/backport-6.12/781-15-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch rename to target/linux/generic/backport-6.12/781-01-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch index e15218b169e..2a1726ac80d 100644 --- a/target/linux/generic/backport-6.12/781-15-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch +++ b/target/linux/generic/backport-6.12/781-01-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch @@ -1,7 +1,7 @@ From 081c9c0265c91b8333165aa6230c20bcbc6f7cbf Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 10 Oct 2024 14:07:16 +0100 -Subject: [PATCH 3/5] net: phy: realtek: read duplex and gbit master from PHYSR +Subject: [PATCH] net: phy: realtek: read duplex and gbit master from PHYSR register The PHYSR MMD register is present and defined equally for all RTL82xx diff --git a/target/linux/generic/backport-6.12/781-16-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch b/target/linux/generic/backport-6.12/781-02-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch similarity index 96% rename from target/linux/generic/backport-6.12/781-16-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch rename to target/linux/generic/backport-6.12/781-02-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch index be7136b3751..4341adb8787 100644 --- a/target/linux/generic/backport-6.12/781-16-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch +++ b/target/linux/generic/backport-6.12/781-02-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch @@ -1,8 +1,7 @@ From 68d5cd09e8919679ce13b85950debea4b2e98e04 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 10 Oct 2024 14:07:26 +0100 -Subject: [PATCH 4/5] net: phy: realtek: change order of calls in C22 - read_status() +Subject: [PATCH] net: phy: realtek: change order of calls in C22 read_status() Always call rtlgen_read_status() first, so genphy_read_status() which is called by it clears bits in case auto-negotiation has not completed. diff --git a/target/linux/generic/backport-6.12/781-17-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch b/target/linux/generic/backport-6.12/781-03-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch similarity index 93% rename from target/linux/generic/backport-6.12/781-17-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch rename to target/linux/generic/backport-6.12/781-03-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch index 3847d5803a0..60cd125a22c 100644 --- a/target/linux/generic/backport-6.12/781-17-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch +++ b/target/linux/generic/backport-6.12/781-03-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch @@ -1,7 +1,7 @@ From 5cb409b3960e75467cbb0a8e1e5596b4490570e3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 10 Oct 2024 14:07:39 +0100 -Subject: [PATCH 5/5] net: phy: realtek: clear 1000Base-T link partner +Subject: [PATCH] net: phy: realtek: clear 1000Base-T link partner advertisement Clear 1000Base-T link partner advertisement bits in Clause-45 diff --git a/target/linux/generic/backport-6.12/781-18-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch b/target/linux/generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-18-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch rename to target/linux/generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch diff --git a/target/linux/generic/backport-6.12/781-19-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch b/target/linux/generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-19-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch rename to target/linux/generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch diff --git a/target/linux/generic/backport-6.12/781-23-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch b/target/linux/generic/backport-6.12/781-06-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-23-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch rename to target/linux/generic/backport-6.12/781-06-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch diff --git a/target/linux/generic/backport-6.12/781-20-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch b/target/linux/generic/backport-6.12/781-07-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch similarity index 96% rename from target/linux/generic/backport-6.12/781-20-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch rename to target/linux/generic/backport-6.12/781-07-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch index 3e9631e4a31..002b99e4d5c 100644 --- a/target/linux/generic/backport-6.12/781-20-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch +++ b/target/linux/generic/backport-6.12/781-07-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1023,23 +1023,20 @@ static int rtl822x_c45_read_status(struc +@@ -1031,23 +1031,20 @@ static int rtl822x_c45_read_status(struc { int ret, val; diff --git a/target/linux/generic/backport-6.12/781-21-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch b/target/linux/generic/backport-6.12/781-08-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch similarity index 95% rename from target/linux/generic/backport-6.12/781-21-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch rename to target/linux/generic/backport-6.12/781-08-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch index 778602d3e5b..f8cfc4d1316 100644 --- a/target/linux/generic/backport-6.12/781-21-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch +++ b/target/linux/generic/backport-6.12/781-08-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1038,8 +1038,10 @@ static int rtl822x_c45_read_status(struc +@@ -1046,8 +1046,10 @@ static int rtl822x_c45_read_status(struc if (ret < 0) return ret; diff --git a/target/linux/generic/backport-6.12/781-22-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch b/target/linux/generic/backport-6.12/781-09-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch similarity index 95% rename from target/linux/generic/backport-6.12/781-22-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch rename to target/linux/generic/backport-6.12/781-09-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch index d365ed0ad24..e628bed6b4c 100644 --- a/target/linux/generic/backport-6.12/781-22-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch +++ b/target/linux/generic/backport-6.12/781-09-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -952,15 +952,15 @@ static int rtl822x_read_status(struct ph +@@ -960,15 +960,15 @@ static int rtl822x_read_status(struct ph { int lpadv, ret; diff --git a/target/linux/generic/backport-6.12/781-24-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch b/target/linux/generic/backport-6.12/781-10-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-24-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch rename to target/linux/generic/backport-6.12/781-10-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch diff --git a/target/linux/generic/backport-6.12/781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch b/target/linux/generic/backport-6.12/781-11-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch similarity index 95% rename from target/linux/generic/backport-6.12/781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch rename to target/linux/generic/backport-6.12/781-11-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch index 7c1fe542672..2dec7010282 100644 --- a/target/linux/generic/backport-6.12/781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch +++ b/target/linux/generic/backport-6.12/781-11-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch @@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski +#endif /* REALTEK_H */ --- /dev/null +++ b/drivers/net/phy/realtek/realtek_hwmon.c -@@ -0,0 +1,86 @@ +@@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * HWMON support for Realtek PHY's @@ -73,13 +73,6 @@ Signed-off-by: Jakub Kicinski +#define RTL822X_VND2_TSRR 0xbd84 +#define RTL822X_VND2_TSSR 0xb54c + -+static umode_t rtl822x_hwmon_is_visible(const void *drvdata, -+ enum hwmon_sensor_types type, -+ u32 attr, int channel) -+{ -+ return 0444; -+} -+ +static int rtl822x_hwmon_get_temp(int raw) +{ + if (raw >= 512) @@ -112,7 +105,7 @@ Signed-off-by: Jakub Kicinski +} + +static const struct hwmon_ops rtl822x_hwmon_ops = { -+ .is_visible = rtl822x_hwmon_is_visible, ++ .visible = 0444, + .read = rtl822x_hwmon_read, +}; + diff --git a/target/linux/generic/backport-6.12/781-26-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch b/target/linux/generic/backport-6.12/781-12-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-26-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch rename to target/linux/generic/backport-6.12/781-12-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch diff --git a/target/linux/generic/backport-6.12/781-27-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch b/target/linux/generic/backport-6.12/781-13-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-27-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch rename to target/linux/generic/backport-6.12/781-13-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch diff --git a/target/linux/generic/backport-6.12/781-28-v6.15-net-phy-realtek-use-string-choices-helpers.patch b/target/linux/generic/backport-6.12/781-14-v6.15-net-phy-realtek-use-string-choices-helpers.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-28-v6.15-net-phy-realtek-use-string-choices-helpers.patch rename to target/linux/generic/backport-6.12/781-14-v6.15-net-phy-realtek-use-string-choices-helpers.patch diff --git a/target/linux/generic/backport-6.12/781-29-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch b/target/linux/generic/backport-6.12/781-15-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-29-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch rename to target/linux/generic/backport-6.12/781-15-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch diff --git a/target/linux/generic/backport-6.12/781-30-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch b/target/linux/generic/backport-6.12/781-16-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-30-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch rename to target/linux/generic/backport-6.12/781-16-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch diff --git a/target/linux/generic/backport-6.12/781-31-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch b/target/linux/generic/backport-6.12/781-17-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-31-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch rename to target/linux/generic/backport-6.12/781-17-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch diff --git a/target/linux/generic/backport-6.12/781-32-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch b/target/linux/generic/backport-6.12/781-18-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-32-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch rename to target/linux/generic/backport-6.12/781-18-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch diff --git a/target/linux/generic/backport-6.12/781-33-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch b/target/linux/generic/backport-6.12/781-19-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch similarity index 100% rename from target/linux/generic/backport-6.12/781-33-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch rename to target/linux/generic/backport-6.12/781-19-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch -- 2.47.2