Nanako/xx_vv_immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generic: drop redundant ATS SFP GT-T quirk patch

Browse Source 
The ATS SFP GT-T quirk patch was backported to stable kernel 6.6 but
was not notice while bumping the kernel version as they listed the quirk
at the bottom of the SFP quirk table while our hack patch put it at the
top.

With migrating to the upstream version, the duplication was made more
apparent.

Drop the double entry for the SFP module as it's already there and not
needed and refresh patches.

Link: https://github.com/openwrt/openwrt/pull/18484
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2025-04-14 15:30:05 +02:00
parent e17cbd0488
commit f98ee3bbab
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
5 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
target/linux/generic/backport-6.6/731-v6.10-net-sfp-add-quirk-for-ATS-SFP-GE-T-1000Base-TX-modul.patch
View File

@ -1,35 +0,0 @@
From 0805d67bc0ef95411228e802f31975cfb7555056 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 23 Apr 2024 11:00:25 +0200
Subject: [PATCH] net: sfp: add quirk for ATS SFP-GE-T 1000Base-TX module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add quirk for ATS SFP-GE-T 1000Base-TX module.
This copper module comes with broken TX_FAULT indicator which must be
ignored for it to work.
Co-authored-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[ rebased on top of net-next ]
Signed-off-by: Marek Behún <kabel@kernel.org>
Link: https://lore.kernel.org/r/20240423090025.29231-1-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/phy/sfp.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -486,6 +486,9 @@ static const struct sfp_quirk sfp_quirks
// OEM SFP-GE-T is a 1000Base-T module with broken TX_FAULT indicator
SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault),
+ // OEM SFP-GE-T is a 1000Base-T module with broken TX_FAULT indicator
+ SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault),
+
SFP_QUIRK_F("OEM", "SFP-10G-T", sfp_fixup_rollball_cc),
SFP_QUIRK_M("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
SFP_QUIRK_F("OEM", "RTSFP-10", sfp_fixup_rollball_cc),

8
target/linux/generic/backport-6.6/785-01-v6.8-net-sfp-rework-the-RollBall-PHY-waiting-code.patch
View File

@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void sfp_fixup_rollball_cc(struct sfp *sfp)
{
sfp_fixup_rollball(sfp);
@@ -2323,7 +2321,7 @@ static int sfp_sm_mod_probe(struct sfp *
@@ -2320,7 +2318,7 @@ static int sfp_sm_mod_probe(struct sfp *
mask |= SFP_F_RS1;
sfp->module_t_start_up = T_START_UP;
@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
sfp->state_ignore_mask = 0;
@@ -2559,10 +2557,9 @@ static void sfp_sm_main(struct sfp *sfp,
@@ -2556,10 +2554,9 @@ static void sfp_sm_main(struct sfp *sfp,
/* We need to check the TX_FAULT state, which is not defined
* while TX_DISABLE is asserted. The earliest we want to do
@ -108,7 +108,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
case SFP_S_WAIT:
@@ -2576,8 +2573,8 @@ static void sfp_sm_main(struct sfp *sfp,
@@ -2573,8 +2570,8 @@ static void sfp_sm_main(struct sfp *sfp,
* deasserting.
*/
timeout = sfp->module_t_start_up;
@ -119,7 +119,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
else
timeout = 1;
@@ -2620,7 +2617,11 @@ static void sfp_sm_main(struct sfp *sfp,
@@ -2617,7 +2614,11 @@ static void sfp_sm_main(struct sfp *sfp,
ret = sfp_sm_probe_for_phy(sfp);
if (ret == -ENODEV) {
if (--sfp->sm_phy_retries) {

6
target/linux/generic/backport-6.6/785-02-v6.8-net-sfp-fix-PHY-discovery-for-FS-SFP-10G-T-module.patch
View File

@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
static void sfp_fixup_halny_gsfp(struct sfp *sfp)
@@ -2321,6 +2328,7 @@ static int sfp_sm_mod_probe(struct sfp *
@@ -2318,6 +2325,7 @@ static int sfp_sm_mod_probe(struct sfp *
mask |= SFP_F_RS1;
sfp->module_t_start_up = T_START_UP;
@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
sfp->phy_t_retry = T_PHY_RETRY;
sfp->state_ignore_mask = 0;
@@ -2557,9 +2565,10 @@ static void sfp_sm_main(struct sfp *sfp,
@@ -2554,9 +2562,10 @@ static void sfp_sm_main(struct sfp *sfp,
/* We need to check the TX_FAULT state, which is not defined
* while TX_DISABLE is asserted. The earliest we want to do
@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
case SFP_S_WAIT:
@@ -2573,8 +2582,8 @@ static void sfp_sm_main(struct sfp *sfp,
@@ -2570,8 +2579,8 @@ static void sfp_sm_main(struct sfp *sfp,
* deasserting.
*/
timeout = sfp->module_t_start_up;

4
target/linux/realtek/patches-6.6/710-net-phy-sfp-re-probe-modules-on-DEV_UP-event.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1571,6 +1571,10 @@ static void sfp_hwmon_probe(struct work_
@@ -1568,6 +1568,10 @@ static void sfp_hwmon_probe(struct work_
struct sfp *sfp = container_of(work, struct sfp, hwmon_probe.work);
int err;
@ -21,7 +21,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
/* hwmon interface needs to access 16bit registers in atomic way to
* guarantee coherency of the diagnostic monitoring data. If it is not
* possible to guarantee coherency because EEPROM is broken in such way
@@ -2433,6 +2437,13 @@ static void sfp_sm_module(struct sfp *sf
@@ -2430,6 +2434,13 @@ static void sfp_sm_module(struct sfp *sf
return;
}

6
target/linux/realtek/patches-6.6/714-net-phy-sfp-add-support-for-SMBus.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -676,10 +676,64 @@ static int sfp_i2c_write(struct sfp *sfp
@@ -673,10 +673,64 @@ static int sfp_i2c_write(struct sfp *sfp
return ret == ARRAY_SIZE(msgs) ? len : 0;
}
@ -77,7 +77,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
sfp->i2c = i2c;
sfp->read = sfp_i2c_read;
@@ -711,6 +765,29 @@ static int sfp_i2c_mdiobus_create(struct
@@ -708,6 +762,29 @@ static int sfp_i2c_mdiobus_create(struct
return 0;
}
@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
{
mdiobus_unregister(sfp->i2c_mii);
@@ -1889,9 +1966,15 @@ static void sfp_sm_fault(struct sfp *sfp
@@ -1886,9 +1963,15 @@ static void sfp_sm_fault(struct sfp *sfp
static int sfp_sm_add_mdio_bus(struct sfp *sfp)
{