net: dsa: mv88e6xxx: rename the port vector member

Not all Marvell switch chips support port trunking, which is embedded in
the port vector data for ATU operations.

Rename the portv_trunkid member of the mv88e6xxx_atu_entry structure to
portvec to be more concise and consistent with the different chips.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index df31c2c57e0928f4f26bd8773ae35bbc4c51a0a6..e9533d4919bc8a79c228055296e5429953701b07 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1928,11 +1928,11 @@ static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port,
 
        /* Purge the ATU entry only if no port is using it anymore */
        if (state == GLOBAL_ATU_DATA_STATE_UNUSED) {
-               entry.portv_trunkid &= ~BIT(port);
-               if (!entry.portv_trunkid)
+               entry.portvec &= ~BIT(port);
+               if (!entry.portvec)
                        entry.state = GLOBAL_ATU_DATA_STATE_UNUSED;
        } else {
-               entry.portv_trunkid |= BIT(port);
+               entry.portvec |= BIT(port);
                entry.state = state;
        }
 
@@ -1995,7 +1995,7 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,
                if (addr.state == GLOBAL_ATU_DATA_STATE_UNUSED)
                        break;
 
-               if (addr.trunk || (addr.portv_trunkid & BIT(port)) == 0)
+               if (addr.trunk || (addr.portvec & BIT(port)) == 0)
                        continue;
 
                if (obj->id == SWITCHDEV_OBJ_ID_PORT_FDB) {

diff --git a/drivers/net/dsa/mv88e6xxx/global1_atu.c b/drivers/net/dsa/mv88e6xxx/global1_atu.c
index d753e3eb1359e868d4fc65016eb2ae2dfb569b49..120b7f41a73594d0b5ea8a02ba2c61c93e4d247b 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1_atu.c
+++ b/drivers/net/dsa/mv88e6xxx/global1_atu.c
@@ -124,7 +124,7 @@ static int mv88e6xxx_g1_atu_data_read(struct mv88e6xxx_chip *chip,
                if (val & GLOBAL_ATU_DATA_TRUNK)
                        entry->trunk = true;
 
-               entry->portv_trunkid = (val >> 4) & mv88e6xxx_port_mask(chip);
+               entry->portvec = (val >> 4) & mv88e6xxx_port_mask(chip);
        }
 
        return 0;
@@ -139,7 +139,7 @@ static int mv88e6xxx_g1_atu_data_write(struct mv88e6xxx_chip *chip,
                if (entry->trunk)
                        data |= GLOBAL_ATU_DATA_TRUNK;
 
-               data |= (entry->portv_trunkid & mv88e6xxx_port_mask(chip)) << 4;
+               data |= (entry->portvec & mv88e6xxx_port_mask(chip)) << 4;
        }
 
        return mv88e6xxx_g1_write(chip, GLOBAL_ATU_DATA, data);
@@ -284,8 +284,8 @@ static int mv88e6xxx_g1_atu_move(struct mv88e6xxx_chip *chip, u16 fid,
        shift = bitmap_weight(&mask, 16);
 
        entry.state = 0xf, /* Full EntryState means Move */
-       entry.portv_trunkid = from_port & mask;
-       entry.portv_trunkid |= (to_port & mask) << shift;
+       entry.portvec = from_port & mask;
+       entry.portvec |= (to_port & mask) << shift;
 
        return mv88e6xxx_g1_atu_flushmove(chip, fid, &entry, all);
 }

diff --git a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
index 1fca6fae2f837224eedd7fd79330414e73dbdb32..69acb4c40fdc9bf015d0702a5368236ecd3acbea 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
@@ -713,7 +713,7 @@ struct mv88e6xxx_info {
 struct mv88e6xxx_atu_entry {
        u8      state;
        bool    trunk;
-       u16     portv_trunkid;
+       u16     portvec;
        u8      mac[ETH_ALEN];
 };