mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
d7a6e171c0
Move sfp HALNy patch from pending to backport as they got merged upstream. The patch was reordered and one was squashed in the upstream variant. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 5029be761161374a3624aa7b4670174c35449bf5 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 13 Sep 2022 20:06:42 +0100
|
|
Subject: [PATCH 1/1] net: sfp: move Huawei MA5671A fixup
|
|
|
|
Move this module over to the new fixup mechanism.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/sfp.c | 12 +++++++-----
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/phy/sfp.c
|
|
+++ b/drivers/net/phy/sfp.c
|
|
@@ -316,6 +316,11 @@ static void sfp_fixup_long_startup(struc
|
|
sfp->module_t_start_up = T_START_UP_BAD_GPON;
|
|
}
|
|
|
|
+static void sfp_fixup_ignore_tx_fault(struct sfp *sfp)
|
|
+{
|
|
+ sfp->tx_fault_ignore = true;
|
|
+}
|
|
+
|
|
static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
|
|
unsigned long *modes)
|
|
{
|
|
@@ -353,6 +358,7 @@ static const struct sfp_quirk sfp_quirks
|
|
.vendor = "HUAWEI",
|
|
.part = "MA5671A",
|
|
.modes = sfp_quirk_2500basex,
|
|
+ .fixup = sfp_fixup_ignore_tx_fault,
|
|
}, {
|
|
// Lantech 8330-262D-E can operate at 2500base-X, but
|
|
// incorrectly report 2500MBd NRZ in their EEPROM
|
|
@@ -2049,11 +2055,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
|
|
|
sfp->module_t_start_up = T_START_UP;
|
|
|
|
- if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) &&
|
|
- !memcmp(id.base.vendor_pn, "MA5671A ", 16))
|
|
- sfp->tx_fault_ignore = true;
|
|
- else
|
|
- sfp->tx_fault_ignore = false;
|
|
+ sfp->tx_fault_ignore = false;
|
|
|
|
sfp->quirk = sfp_lookup_quirk(&id);
|
|
if (sfp->quirk && sfp->quirk->fixup)
|