net: dsa: bcm_sf2: Also configure Port 5 for 2Gb/sec on 7278

ffainelli · davem330 · commit 7458bd540fa0 · 2020-02-16T19:27:51.000-08:00
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 &lt;f.fainelli@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
@@ -616,6 +616,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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -616,6 +616,9 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,`
`616`	`616`	`if (state->duplex == DUPLEX_FULL)`
`617`	`617`	`reg \|= DUPLX_MODE;`
`618`	`618`
	`619`	`+ if (priv->type == BCM7278_DEVICE_ID && dsa_is_cpu_port(ds, port))`
	`620`	`+ reg \|= GMIIP_SPEED_UP_2G;`
	`621`	`+`
`619`	`622`	`core_writel(priv, reg, offset);`
`620`	`623`	`}`
`621`	`624`