lkml.org 
[lkml]   [2020]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 037/108] net: dsa: bcm_sf2: Also configure Port 5 for 2Gb/sec on 7278
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    [ Upstream commit 7458bd540fa0a90220b9e8c349d910d9dde9caf8 ]

    Either port 5 or port 8 can be used on a 7278 device, make sure that
    port 5 also gets configured properly for 2Gb/sec in that case.

    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/dsa/bcm_sf2.c | 3 +++
    drivers/net/dsa/bcm_sf2_regs.h | 1 +
    2 files changed, 4 insertions(+)

    diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
    index 46dc913da852d..d4e804184c545 100644
    --- a/drivers/net/dsa/bcm_sf2.c
    +++ b/drivers/net/dsa/bcm_sf2.c
    @@ -602,6 +602,9 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
    if (state->duplex == DUPLEX_FULL)
    reg |= DUPLX_MODE;

    + if (priv->type == BCM7278_DEVICE_ID && dsa_is_cpu_port(ds, port))
    + reg |= GMIIP_SPEED_UP_2G;
    +
    core_writel(priv, reg, offset);
    }

    diff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h
    index d8a5e6269c0ef..7844781763359 100644
    --- a/drivers/net/dsa/bcm_sf2_regs.h
    +++ b/drivers/net/dsa/bcm_sf2_regs.h
    @@ -178,6 +178,7 @@ enum bcm_sf2_reg_offs {
    #define RXFLOW_CNTL (1 << 4)
    #define TXFLOW_CNTL (1 << 5)
    #define SW_OVERRIDE (1 << 6)
    +#define GMIIP_SPEED_UP_2G (1 << 7)

    #define CORE_WATCHDOG_CTRL 0x001e4
    #define SOFTWARE_RESET (1 << 7)
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-12 01:31    [W:6.172 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site