mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
generic: phy: aquantia: move accepted patches to backport-6.6
Move patches accepted upstream from pending-6.6 to backport-6.6. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
parent
ee03a2742b
commit
8cc049cec2
@ -1,6 +1,6 @@
|
||||
From 49d46df79404a37685e0f32deb36506f5723e3a0 Mon Sep 17 00:00:00 2001
|
||||
From a2e1ba275eae96a8171deb19e9c7c2f5978fee7b Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Wed, 28 Aug 2024 23:52:09 +0100
|
||||
Date: Fri, 4 Oct 2024 17:18:16 +0100
|
||||
Subject: [PATCH] net: phy: aquantia: allow forcing order of MDI pairs
|
||||
|
||||
Despite supporting Auto MDI-X, it looks like Aquantia only supports
|
||||
@ -35,6 +35,9 @@ Forcing normal pair order is required on the Adtran SDG-8733A Wi-Fi 7
|
||||
residential gateway.
|
||||
|
||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||
Link: https://patch.msgid.link/9ed760ff87d5fc456f31e407ead548bbb754497d.1728058550.git.daniel@makrotopia.org
|
||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
---
|
||||
drivers/net/phy/aquantia/aquantia_main.c | 33 ++++++++++++++++++++++++
|
||||
1 file changed, 33 insertions(+)
|
||||
@ -74,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
+ ret = of_property_read_u32(np, "marvell,mdi-cfg-order", &mdi_conf);
|
||||
+
|
||||
+ /* Do nothing in case property "marvell,mdi-cfg-order" is not present */
|
||||
+ if (ret == -EINVAL)
|
||||
+ if (ret == -ENOENT)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (ret)
|
||||
@ -101,4 +104,4 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
+
|
||||
/* Restore LED polarity state after reset */
|
||||
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {
|
||||
ret = aqr_phy_led_active_low_set(phydev, led_active_low, true);
|
||||
ret = aqr_phy_led_active_low_set(phydev, index, led_active_low);
|
@ -0,0 +1,31 @@
|
||||
From ce21b8fb255ebf0b49913fb4c62741d7eb05c6f6 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Fri, 11 Oct 2024 22:28:43 +0100
|
||||
Subject: [PATCH] net: phy: aquantia: fix return value check in
|
||||
aqr107_config_mdi()
|
||||
|
||||
of_property_read_u32() returns -EINVAL in case the property cannot be
|
||||
found rather than -ENOENT. Fix the check to not abort probing in case
|
||||
of the property being missing, and also in case CONFIG_OF is not set
|
||||
which will result in -ENOSYS.
|
||||
|
||||
Fixes: a2e1ba275eae ("net: phy: aquantia: allow forcing order of MDI pairs")
|
||||
Reported-by: Jon Hunter <jonathanh@nvidia.com>
|
||||
Closes: https://lore.kernel.org/all/114b4c03-5d16-42ed-945d-cf78eabea12b@nvidia.com/
|
||||
Suggested-by: Hans-Frieder Vogt <hfdevel@gmx.net>
|
||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
---
|
||||
drivers/net/phy/aquantia/aquantia_main.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/phy/aquantia/aquantia_main.c
|
||||
+++ b/drivers/net/phy/aquantia/aquantia_main.c
|
||||
@@ -512,7 +512,7 @@ static int aqr107_config_mdi(struct phy_
|
||||
ret = of_property_read_u32(np, "marvell,mdi-cfg-order", &mdi_conf);
|
||||
|
||||
/* Do nothing in case property "marvell,mdi-cfg-order" is not present */
|
||||
- if (ret == -ENOENT)
|
||||
+ if (ret == -EINVAL || ret == -ENOSYS)
|
||||
return 0;
|
||||
|
||||
if (ret)
|
@ -49,7 +49,7 @@ Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
||||
|
||||
--- a/drivers/net/phy/aquantia/aquantia_main.c
|
||||
+++ b/drivers/net/phy/aquantia/aquantia_main.c
|
||||
@@ -501,7 +501,7 @@ static int aqr107_config_init(struct phy
|
||||
@@ -530,7 +530,7 @@ static int aqr107_config_init(struct phy
|
||||
{
|
||||
struct aqr107_priv *priv = phydev->priv;
|
||||
u32 led_active_low;
|
||||
@ -58,7 +58,7 @@ Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
||||
|
||||
/* Check that the PHY interface type is compatible */
|
||||
if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
|
||||
@@ -537,10 +537,9 @@ static int aqr107_config_init(struct phy
|
||||
@@ -570,10 +570,9 @@ static int aqr107_config_init(struct phy
|
||||
|
||||
/* Restore LED polarity state after reset */
|
||||
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {
|
||||
|
Loading…
Reference in New Issue
Block a user