diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2020-02-15 01:32:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-17 04:27:51 +0100 |
| commit | 7458bd540fa0a90220b9e8c349d910d9dde9caf8 (patch) | |
| tree | a6ac7a6281ab2234ca33f34655f9b1dd91cc59b0 | |
| parent | tcp-zerocopy: Return sk_err (if set) along with tcp receive zerocopy. (diff) | |
| download | linux-7458bd540fa0a90220b9e8c349d910d9dde9caf8.tar.xz linux-7458bd540fa0a90220b9e8c349d910d9dde9caf8.zip | |
net: dsa: bcm_sf2: Also configure Port 5 for 2Gb/sec on 7278
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>
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 3 | ||||
| -rw-r--r-- | drivers/net/dsa/bcm_sf2_regs.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index d1955543acd1..6feaf8cb0809 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -616,6 +616,9 @@ force_link: 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 d8a5e6269c0e..784478176335 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) |