You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From acc105226493e7cfdb6e72d130c36f21e951fc1f Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Sat, 9 Nov 2019 15:02:55 +0200
|
|
Subject: [PATCH] net: mscc: ocelot: limit vlan ingress filtering to actual
|
|
number of ports
|
|
|
|
The VSC7514 switch (Ocelot) is a 10-port device, while VSC9959 (Felix)
|
|
is 6-port. Therefore the VLAN filtering mask would be out of bounds when
|
|
calling for this new switch. Fix that.
|
|
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mscc/ocelot.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/mscc/ocelot.c
|
|
+++ b/drivers/net/ethernet/mscc/ocelot.c
|
|
@@ -389,7 +389,8 @@ static void ocelot_vlan_init(struct ocel
|
|
/* Set vlan ingress filter mask to all ports but the CPU port by
|
|
* default.
|
|
*/
|
|
- ocelot_write(ocelot, GENMASK(9, 0), ANA_VLANMASK);
|
|
+ ocelot_write(ocelot, GENMASK(ocelot->num_phys_ports - 1, 0),
|
|
+ ANA_VLANMASK);
|
|
|
|
for (port = 0; port < ocelot->num_phys_ports; port++) {
|
|
ocelot_write_gix(ocelot, 0, REW_PORT_VLAN_CFG, port);
|