projects / openwrt / staging / ynezz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3cee66c)
kernel: 5.10: backport at803x QCA83xx phy support improvements
authorMatthew Hagan <mnhagan88@gmail.com>
Mon, 20 Sep 2021 12:37:53 +0000 (12:37 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 24 Oct 2021 14:56:17 +0000 (16:56 +0200)
This commit add accepted upstream patches that improve & tidy qca83xx support.
1 - Split qca8327 to A & B variants, identifiable by phy_id
2 - Add suspend/resume support to qca8xx phys
3 - Tidy spacing and phy naming.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
target/linux/generic/backport-5.10/795-v5.16-01-net-phy-at803x-add-support-for-qca-8327-A-variant.patch [new file with mode: 0644] patch | blob
target/linux/generic/backport-5.10/795-v5.16-02-net-phy-at803x-add-resume-suspend-function-to-qca83x.patch [new file with mode: 0644] patch | blob
target/linux/generic/backport-5.10/795-v5.16-03-net-phy-at803x-fix-spacing-and-improve-name-for-83xx.patch [new file with mode: 0644] patch | blob
target/linux/generic/pending-5.10/730-net-phy-at803x-fix-feature-detection.patch patch | blob | history

diff --git a/target/linux/generic/backport-5.10/795-v5.16-01-net-phy-at803x-add-support-for-qca-8327-A-variant.patch b/target/linux/generic/backport-5.10/795-v5.16-01-net-phy-at803x-add-support-for-qca-8327-A-variant.patch
new file mode 100644 (file)
index 0000000..c82bf91
--- /dev/null
+++ b/target/linux/generic/backport-5.10/795-v5.16-01-net-phy-at803x-add-support-for-qca-8327-A-variant.patch
@@ -0,0 +1,65 @@
+From b4df02b562f4aa14ff6811f30e1b4d2159585c59 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Sun, 19 Sep 2021 18:28:15 +0200
+Subject: net: phy: at803x: add support for qca 8327 A variant internal phy
+
+For qca8327 internal phy there are 2 different switch variant with 2
+different phy id. Add this missing variant so the internal phy can be
+correctly identified and fixed.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/at803x.c | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+--- a/drivers/net/phy/at803x.c
++++ b/drivers/net/phy/at803x.c
+@@ -148,7 +148,8 @@
+ #define AT803X_PAGE_FIBER             0
+ #define AT803X_PAGE_COPPER            1
+ 
+-#define QCA8327_PHY_ID                                0x004dd034
++#define QCA8327_A_PHY_ID                      0x004dd033
++#define QCA8327_B_PHY_ID                      0x004dd034
+ #define QCA8337_PHY_ID                                0x004dd036
+ #define QCA8K_PHY_ID_MASK                     0xffffffff
+ 
+@@ -1329,10 +1330,23 @@ static struct phy_driver at803x_driver[]
+       .get_strings = at803x_get_strings,
+       .get_stats = at803x_get_stats,
+ }, {
+-      /* QCA8327 */
+-      .phy_id = QCA8327_PHY_ID,
++      /* QCA8327-A from switch QCA8327-AL1A */
++      .phy_id = QCA8327_A_PHY_ID,
+       .phy_id_mask = QCA8K_PHY_ID_MASK,
+-      .name = "QCA PHY 8327",
++      .name = "QCA PHY 8327-A",
++      /* PHY_GBIT_FEATURES */
++      .probe = at803x_probe,
++      .flags = PHY_IS_INTERNAL,
++      .config_init = qca83xx_config_init,
++      .soft_reset = genphy_soft_reset,
++      .get_sset_count = at803x_get_sset_count,
++      .get_strings = at803x_get_strings,
++      .get_stats = at803x_get_stats,
++}, {
++      /* QCA8327-B from switch QCA8327-BL1A */
++      .phy_id = QCA8327_B_PHY_ID,
++      .phy_id_mask = QCA8K_PHY_ID_MASK,
++      .name = "QCA PHY 8327-B",
+       /* PHY_GBIT_FEATURES */
+       .probe = at803x_probe,
+       .flags = PHY_IS_INTERNAL,
+@@ -1352,7 +1366,8 @@ static struct mdio_device_id __maybe_unu
+       { PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
+       { PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
+       { PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
+-      { PHY_ID_MATCH_EXACT(QCA8327_PHY_ID) },
++      { PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
++      { PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
+       { }
+ };
+ 
diff --git a/target/linux/generic/backport-5.10/795-v5.16-02-net-phy-at803x-add-resume-suspend-function-to-qca83x.patch b/target/linux/generic/backport-5.10/795-v5.16-02-net-phy-at803x-add-resume-suspend-function-to-qca83x.patch
new file mode 100644 (file)
index 0000000..be24fd5
--- /dev/null
+++ b/target/linux/generic/backport-5.10/795-v5.16-02-net-phy-at803x-add-resume-suspend-function-to-qca83x.patch
@@ -0,0 +1,45 @@
+From 15b9df4ece17d084f14eb0ca1cf05f2ad497e425 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Sun, 19 Sep 2021 18:28:16 +0200
+Subject: net: phy: at803x: add resume/suspend function to qca83xx phy
+
+Add resume/suspend function to qca83xx internal phy.
+We can't use the at803x generic function as the documentation lacks of
+any support for WoL regs.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/at803x.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/net/phy/at803x.c
++++ b/drivers/net/phy/at803x.c
+@@ -1329,6 +1329,8 @@ static struct phy_driver at803x_driver[]
+       .get_sset_count = at803x_get_sset_count,
+       .get_strings = at803x_get_strings,
+       .get_stats = at803x_get_stats,
++      .suspend                = genphy_suspend,
++      .resume                 = genphy_resume,
+ }, {
+       /* QCA8327-A from switch QCA8327-AL1A */
+       .phy_id = QCA8327_A_PHY_ID,
+@@ -1342,6 +1344,8 @@ static struct phy_driver at803x_driver[]
+       .get_sset_count = at803x_get_sset_count,
+       .get_strings = at803x_get_strings,
+       .get_stats = at803x_get_stats,
++      .suspend                = genphy_suspend,
++      .resume                 = genphy_resume,
+ }, {
+       /* QCA8327-B from switch QCA8327-BL1A */
+       .phy_id = QCA8327_B_PHY_ID,
+@@ -1355,6 +1359,8 @@ static struct phy_driver at803x_driver[]
+       .get_sset_count = at803x_get_sset_count,
+       .get_strings = at803x_get_strings,
+       .get_stats = at803x_get_stats,
++      .suspend                = genphy_suspend,
++      .resume                 = genphy_resume,
+ }, };
+ 
+ module_phy_driver(at803x_driver);
diff --git a/target/linux/generic/backport-5.10/795-v5.16-03-net-phy-at803x-fix-spacing-and-improve-name-for-83xx.patch b/target/linux/generic/backport-5.10/795-v5.16-03-net-phy-at803x-fix-spacing-and-improve-name-for-83xx.patch
new file mode 100644 (file)
index 0000000..23f574c
--- /dev/null
+++ b/target/linux/generic/backport-5.10/795-v5.16-03-net-phy-at803x-fix-spacing-and-improve-name-for-83xx.patch
@@ -0,0 +1,95 @@
+From d44fd8604a4ab92119adb35f05fd87612af722b5 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Sun, 19 Sep 2021 18:28:17 +0200
+Subject: net: phy: at803x: fix spacing and improve name for 83xx phy
+
+Fix spacing and improve name for 83xx phy following other phy in the
+same driver.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/at803x.c | 60 ++++++++++++++++++++++++------------------------
+ 1 file changed, 30 insertions(+), 30 deletions(-)
+
+--- a/drivers/net/phy/at803x.c
++++ b/drivers/net/phy/at803x.c
+@@ -1318,47 +1318,47 @@ static struct phy_driver at803x_driver[]
+       .config_aneg            = at803x_config_aneg,
+ }, {
+       /* QCA8337 */
+-      .phy_id = QCA8337_PHY_ID,
+-      .phy_id_mask = QCA8K_PHY_ID_MASK,
+-      .name = "QCA PHY 8337",
++      .phy_id                 = QCA8337_PHY_ID,
++      .phy_id_mask            = QCA8K_PHY_ID_MASK,
++      .name                   = "Qualcomm Atheros 8337 internal PHY",
+       /* PHY_GBIT_FEATURES */
+-      .probe = at803x_probe,
+-      .flags = PHY_IS_INTERNAL,
+-      .config_init = qca83xx_config_init,
+-      .soft_reset = genphy_soft_reset,
+-      .get_sset_count = at803x_get_sset_count,
+-      .get_strings = at803x_get_strings,
+-      .get_stats = at803x_get_stats,
++      .probe                  = at803x_probe,
++      .flags                  = PHY_IS_INTERNAL,
++      .config_init            = qca83xx_config_init,
++      .soft_reset             = genphy_soft_reset,
++      .get_sset_count         = at803x_get_sset_count,
++      .get_strings            = at803x_get_strings,
++      .get_stats              = at803x_get_stats,
+       .suspend                = genphy_suspend,
+       .resume                 = genphy_resume,
+ }, {
+       /* QCA8327-A from switch QCA8327-AL1A */
+-      .phy_id = QCA8327_A_PHY_ID,
+-      .phy_id_mask = QCA8K_PHY_ID_MASK,
+-      .name = "QCA PHY 8327-A",
++      .phy_id                 = QCA8327_A_PHY_ID,
++      .phy_id_mask            = QCA8K_PHY_ID_MASK,
++      .name                   = "Qualcomm Atheros 8327-A internal PHY",
+       /* PHY_GBIT_FEATURES */
+-      .probe = at803x_probe,
+-      .flags = PHY_IS_INTERNAL,
+-      .config_init = qca83xx_config_init,
+-      .soft_reset = genphy_soft_reset,
+-      .get_sset_count = at803x_get_sset_count,
+-      .get_strings = at803x_get_strings,
+-      .get_stats = at803x_get_stats,
++      .probe                  = at803x_probe,
++      .flags                  = PHY_IS_INTERNAL,
++      .config_init            = qca83xx_config_init,
++      .soft_reset             = genphy_soft_reset,
++      .get_sset_count         = at803x_get_sset_count,
++      .get_strings            = at803x_get_strings,
++      .get_stats              = at803x_get_stats,
+       .suspend                = genphy_suspend,
+       .resume                 = genphy_resume,
+ }, {
+       /* QCA8327-B from switch QCA8327-BL1A */
+-      .phy_id = QCA8327_B_PHY_ID,
+-      .phy_id_mask = QCA8K_PHY_ID_MASK,
+-      .name = "QCA PHY 8327-B",
++      .phy_id                 = QCA8327_B_PHY_ID,
++      .phy_id_mask            = QCA8K_PHY_ID_MASK,
++      .name                   = "Qualcomm Atheros 8327-B internal PHY",
+       /* PHY_GBIT_FEATURES */
+-      .probe = at803x_probe,
+-      .flags = PHY_IS_INTERNAL,
+-      .config_init = qca83xx_config_init,
+-      .soft_reset = genphy_soft_reset,
+-      .get_sset_count = at803x_get_sset_count,
+-      .get_strings = at803x_get_strings,
+-      .get_stats = at803x_get_stats,
++      .probe                  = at803x_probe,
++      .flags                  = PHY_IS_INTERNAL,
++      .config_init            = qca83xx_config_init,
++      .soft_reset             = genphy_soft_reset,
++      .get_sset_count         = at803x_get_sset_count,
++      .get_strings            = at803x_get_strings,
++      .get_stats              = at803x_get_stats,
+       .suspend                = genphy_suspend,
+       .resume                 = genphy_resume,
+ }, };
diff --git a/target/linux/generic/pending-5.10/730-net-phy-at803x-fix-feature-detection.patch b/target/linux/generic/pending-5.10/730-net-phy-at803x-fix-feature-detection.patch
index a00416ec3e1d227d4610ec5fb7c194623b3e2c71..5caed733722ef98adca678c547564771b580a1ba 100644 (file)
--- a/target/linux/generic/pending-5.10/730-net-phy-at803x-fix-feature-detection.patch
+++ b/target/linux/generic/pending-5.10/730-net-phy-at803x-fix-feature-detection.patch
@@ -20,7 +20,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
-@@ -1024,6 +1024,34 @@ static int at803x_set_tunable(struct phy
+@@ -1025,6 +1025,34 @@ static int at803x_set_tunable(struct phy
        }
  }
  
@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  static int at803x_cable_test_result_trans(u16 status)
  {
        switch (FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status)) {
-@@ -1273,7 +1301,7 @@ static struct phy_driver at803x_driver[]
+@@ -1274,7 +1302,7 @@ static struct phy_driver at803x_driver[]
        .resume                 = at803x_resume,
        .read_page              = at803x_read_page,
        .write_page             = at803x_write_page,
Staging tree of Petr Stetiar