Skip to content

Commit

Permalink
net: mscc: ocelot: make entry_type a member of struct ocelot_multicast
Browse files Browse the repository at this point in the history 
This saves a re-classification of the MDB address on deletion.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Vladimir Oltean authored and Jakub Kicinski committed Oct 31, 2020
1 parent 728e69a commit bb8d53f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
51 changes: 25 additions & 26 deletions drivers/net/ethernet/mscc/ocelot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ static enum macaccess_entry_type ocelot_classify_mdb(const unsigned char *addr)
}

static int ocelot_mdb_get_pgid(struct ocelot *ocelot,
enum macaccess_entry_type entry_type)
const struct ocelot_multicast *mc)
{
int pgid;

Expand All @@ -971,8 +971,8 @@ static int ocelot_mdb_get_pgid(struct ocelot *ocelot,
* destination mask table (PGID), the destination set is programmed as
* part of the entry MAC address.", and the DEST_IDX is set to 0.
*/
if (entry_type == ENTRYTYPE_MACv4 ||
entry_type == ENTRYTYPE_MACv6)
if (mc->entry_type == ENTRYTYPE_MACv4 ||
mc->entry_type == ENTRYTYPE_MACv6)
return 0;

for_each_nonreserved_multicast_dest_pgid(ocelot, pgid) {
Expand All @@ -994,16 +994,15 @@ static int ocelot_mdb_get_pgid(struct ocelot *ocelot,
}

static void ocelot_encode_ports_to_mdb(unsigned char *addr,
struct ocelot_multicast *mc,
enum macaccess_entry_type entry_type)
struct ocelot_multicast *mc)
{
ether_addr_copy(addr, mc->addr);

if (entry_type == ENTRYTYPE_MACv4) {
if (mc->entry_type == ENTRYTYPE_MACv4) {
addr[0] = 0;
addr[1] = mc->ports >> 8;
addr[2] = mc->ports & 0xff;
} else if (entry_type == ENTRYTYPE_MACv6) {
} else if (mc->entry_type == ENTRYTYPE_MACv6) {
addr[0] = mc->ports >> 8;
addr[1] = mc->ports & 0xff;
}
Expand All @@ -1013,7 +1012,6 @@ int ocelot_port_mdb_add(struct ocelot *ocelot, int port,
const struct switchdev_obj_port_mdb *mdb)
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
enum macaccess_entry_type entry_type;
unsigned char addr[ETH_ALEN];
struct ocelot_multicast *mc;
u16 vid = mdb->vid;
Expand All @@ -1024,12 +1022,20 @@ int ocelot_port_mdb_add(struct ocelot *ocelot, int port,
if (!vid)
vid = ocelot_port->pvid;

entry_type = ocelot_classify_mdb(mdb->addr);

mc = ocelot_multicast_get(ocelot, mdb->addr, vid);
if (!mc) {
/* New entry */
int pgid = ocelot_mdb_get_pgid(ocelot, entry_type);
int pgid;

mc = devm_kzalloc(ocelot->dev, sizeof(*mc), GFP_KERNEL);
if (!mc)
return -ENOMEM;

mc->entry_type = ocelot_classify_mdb(mdb->addr);
ether_addr_copy(mc->addr, mdb->addr);
mc->vid = vid;

pgid = ocelot_mdb_get_pgid(ocelot, mc);

if (pgid < 0) {
dev_err(ocelot->dev,
Expand All @@ -1038,32 +1044,26 @@ int ocelot_port_mdb_add(struct ocelot *ocelot, int port,
return -ENOSPC;
}

mc = devm_kzalloc(ocelot->dev, sizeof(*mc), GFP_KERNEL);
if (!mc)
return -ENOMEM;

ether_addr_copy(mc->addr, mdb->addr);
mc->vid = vid;
mc->pgid = pgid;

list_add_tail(&mc->list, &ocelot->multicast);
} else {
ocelot_encode_ports_to_mdb(addr, mc, entry_type);
ocelot_encode_ports_to_mdb(addr, mc);
ocelot_mact_forget(ocelot, addr, vid);
}

mc->ports |= BIT(port);
ocelot_encode_ports_to_mdb(addr, mc, entry_type);
ocelot_encode_ports_to_mdb(addr, mc);

return ocelot_mact_learn(ocelot, mc->pgid, addr, vid, entry_type);
return ocelot_mact_learn(ocelot, mc->pgid, addr, vid,
mc->entry_type);
}
EXPORT_SYMBOL(ocelot_port_mdb_add);

int ocelot_port_mdb_del(struct ocelot *ocelot, int port,
const struct switchdev_obj_port_mdb *mdb)
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
enum macaccess_entry_type entry_type;
unsigned char addr[ETH_ALEN];
struct ocelot_multicast *mc;
u16 vid = mdb->vid;
Expand All @@ -1078,9 +1078,7 @@ int ocelot_port_mdb_del(struct ocelot *ocelot, int port,
if (!mc)
return -ENOENT;

entry_type = ocelot_classify_mdb(mdb->addr);

ocelot_encode_ports_to_mdb(addr, mc, entry_type);
ocelot_encode_ports_to_mdb(addr, mc);
ocelot_mact_forget(ocelot, addr, vid);

mc->ports &= ~BIT(port);
Expand All @@ -1090,9 +1088,10 @@ int ocelot_port_mdb_del(struct ocelot *ocelot, int port,
return 0;
}

ocelot_encode_ports_to_mdb(addr, mc, entry_type);
ocelot_encode_ports_to_mdb(addr, mc);

return ocelot_mact_learn(ocelot, mc->pgid, addr, vid, entry_type);
return ocelot_mact_learn(ocelot, mc->pgid, addr, vid,
mc->entry_type);
}
EXPORT_SYMBOL(ocelot_port_mdb_del);

Expand Down
17 changes: 9 additions & 8 deletions drivers/net/ethernet/mscc/ocelot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ struct frame_info {
u32 timestamp; /* rew_val */
};

struct ocelot_multicast {
struct list_head list;
unsigned char addr[ETH_ALEN];
u16 vid;
u16 ports;
int pgid;
};

struct ocelot_port_tc {
bool block_shared;
unsigned long offload_cnt;
Expand Down Expand Up @@ -87,6 +79,15 @@ enum macaccess_entry_type {
ENTRYTYPE_MACv6,
};

struct ocelot_multicast {
struct list_head list;
enum macaccess_entry_type entry_type;
unsigned char addr[ETH_ALEN];
u16 vid;
u16 ports;
int pgid;
};

int ocelot_port_fdb_do_dump(const unsigned char *addr, u16 vid,
bool is_static, void *data);
int ocelot_mact_learn(struct ocelot *ocelot, int port,
Expand Down

0 comments on commit bb8d53f

Please sign in to comment.