lkml.org 
[lkml]   [2022]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.19 51/73] net: sfp: move Alcatel Lucent 3FE46541AA fixup
    Date
    From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>

    [ Upstream commit 275416754e9a262c97a1ad6f806a4bc6e0464aa2 ]

    Add a new fixup mechanism to the SFP quirks, and use it for this
    module.

    Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/phy/sfp.c | 14 +++++++++-----
    drivers/net/phy/sfp.h | 1 +
    2 files changed, 10 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
    index 1b35cf0ac02a..38ce6c579ee3 100644
    --- a/drivers/net/phy/sfp.c
    +++ b/drivers/net/phy/sfp.c
    @@ -311,6 +311,11 @@ static const struct of_device_id sfp_of_match[] = {
    };
    MODULE_DEVICE_TABLE(of, sfp_of_match);

    +static void sfp_fixup_long_startup(struct sfp *sfp)
    +{
    + sfp->module_t_start_up = T_START_UP_BAD_GPON;
    +}
    +
    static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
    unsigned long *modes)
    {
    @@ -341,6 +346,7 @@ static const struct sfp_quirk sfp_quirks[] = {
    .vendor = "ALCATELLUCENT",
    .part = "3FE46541AA",
    .modes = sfp_quirk_2500basex,
    + .fixup = sfp_fixup_long_startup,
    }, {
    // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
    // NRZ in their EEPROM
    @@ -2052,11 +2058,7 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
    if (sfp->gpio[GPIO_LOS])
    sfp->state_hw_mask |= SFP_F_LOS;

    - if (!memcmp(id.base.vendor_name, "ALCATELLUCENT ", 16) &&
    - !memcmp(id.base.vendor_pn, "3FE46541AA ", 16))
    - sfp->module_t_start_up = T_START_UP_BAD_GPON;
    - else
    - sfp->module_t_start_up = T_START_UP;
    + sfp->module_t_start_up = T_START_UP;

    if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) &&
    !memcmp(id.base.vendor_pn, "MA5671A ", 16))
    @@ -2065,6 +2067,8 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
    sfp->tx_fault_ignore = false;

    sfp->quirk = sfp_lookup_quirk(&id);
    + if (sfp->quirk && sfp->quirk->fixup)
    + sfp->quirk->fixup(sfp);

    return 0;
    }
    diff --git a/drivers/net/phy/sfp.h b/drivers/net/phy/sfp.h
    index 03f1d47fe6ca..7ad06deae76c 100644
    --- a/drivers/net/phy/sfp.h
    +++ b/drivers/net/phy/sfp.h
    @@ -10,6 +10,7 @@ struct sfp_quirk {
    const char *vendor;
    const char *part;
    void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);
    + void (*fixup)(struct sfp *sfp);
    };

    struct sfp_socket_ops {
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-10-10 00:26    [W:4.296 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site