Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: dsa: mv88e6xxx: rename the port vector member

Browse source 
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>
This commit is contained in:
Vivien Didelot 2017-03-11 16:12:57 -05:00 committed by David S. Miller
parent d7f435f967
commit 01bd96c883
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/dsa/mv88e6xxx/chip.c
View file

@ -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) {

8
drivers/net/dsa/mv88e6xxx/global1_atu.c
View file

@ -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);
}

2
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
View file

@ -713,7 +713,7 @@ struct mv88e6xxx_info {
struct mv88e6xxx_atu_entry {
u8 state;
bool trunk;
u16 portv_trunkid;
u16 portvec;
u8 mac[ETH_ALEN];
};