net: dsa: mv88e6xxx: Support policy entries in the VTU

A VTU entry with policy enabled is used in combination with a port's
VTU policy setting to override normal switching behavior for frames
assigned to the entry's VID.

A typical example is to Treat all frames in a particular VLAN as
control traffic, and trap them to the CPU. In which case the relevant
user port's VTU policy would be set to TRAP.

Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index 438cee853d07e4b044f36d5dc54b5303d12e60e4..80dc7b549e81c49be03b7dcad141fea21f3495a6 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -179,6 +179,7 @@ struct mv88e6xxx_vtu_entry {
        u16     fid;
        u8      sid;
        bool    valid;
+       bool    policy;
        u8      member[DSA_MAX_PORTS];
        u8      state[DSA_MAX_PORTS];
 };

diff --git a/drivers/net/dsa/mv88e6xxx/global1.h b/drivers/net/dsa/mv88e6xxx/global1.h
index 4f3dbb015f77b71ca88a5556f95e8456b56b52b7..2c1607c858a1bc562c137e59668c2b6e43402848 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1.h
+++ b/drivers/net/dsa/mv88e6xxx/global1.h
@@ -46,6 +46,7 @@
 
 /* Offset 0x02: VTU FID Register */
 #define MV88E6352_G1_VTU_FID           0x02
+#define MV88E6352_G1_VTU_FID_VID_POLICY        0x1000
 #define MV88E6352_G1_VTU_FID_MASK      0x0fff
 
 /* Offset 0x03: VTU SID Register */

diff --git a/drivers/net/dsa/mv88e6xxx/global1_vtu.c b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
index ae12c981923e815572bbddc396adb882f29027e2..b1bd9274a562f766f28810899f80c30dd731224b 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
+++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
@@ -27,7 +27,7 @@ static int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,
                return err;
 
        entry->fid = val & MV88E6352_G1_VTU_FID_MASK;
-
+       entry->policy = !!(val & MV88E6352_G1_VTU_FID_VID_POLICY);
        return 0;
 }
 
@@ -36,6 +36,9 @@ static int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,
 {
        u16 val = entry->fid & MV88E6352_G1_VTU_FID_MASK;
 
+       if (entry->policy)
+               val |= MV88E6352_G1_VTU_FID_VID_POLICY;
+
        return mv88e6xxx_g1_write(chip, MV88E6352_G1_VTU_FID, val);
 }