leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: mv88e6xxx: read switch ID in probe

Browse Source 
Read the switch ID only once, at probe time, to avoid multiple read
accesses and MII bus checking.

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 2016-04-17 13:23:58 -04:00 committed by David S. Miller
parent 54c6f4bda7
commit a439c0612d
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/net/dsa/mv88e6xxx.c
View File

@ -2700,10 +2700,6 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds)
ps->ds = ds; ps->ds = ds;
mutex_init(&ps->smi_mutex); mutex_init(&ps->smi_mutex);
ps->id = mv88e6xxx_reg_read(ds, REG_PORT(0), PORT_SWITCH_ID) & 0xfff0;
if (ps->id < 0)
return ps->id;
INIT_WORK(&ps->bridge_work, mv88e6xxx_bridge_work); INIT_WORK(&ps->bridge_work, mv88e6xxx_bridge_work);
return 0; return 0;
@ -3174,21 +3170,13 @@ int mv88e6xxx_get_temp_alarm(struct dsa_switch *ds, bool *alarm)
#endif /* CONFIG_NET_DSA_HWMON */ #endif /* CONFIG_NET_DSA_HWMON */
static const char * static const char *
mv88e6xxx_lookup_name(struct mii_bus *bus, int sw_addr, mv88e6xxx_lookup_name(unsigned int id, const struct mv88e6xxx_switch_id *table,
const struct mv88e6xxx_switch_id *table,
unsigned int num) unsigned int num)
{ {
int i, ret; int i;
if (!bus)
return NULL;
ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), PORT_SWITCH_ID);
if (ret < 0)
return NULL;
for (i = 0; i < num; ++i) for (i = 0; i < num; ++i)
if (table[i].id == (ret & 0xfff0)) if (table[i].id == (id & 0xfff0))
return table[i].name; return table[i].name;
return NULL; return NULL;
@ -3200,23 +3188,38 @@ const char *mv88e6xxx_drv_probe(struct device *dsa_dev, struct device *host_dev,
unsigned int num) unsigned int num)
{ {
struct mv88e6xxx_priv_state *ps; struct mv88e6xxx_priv_state *ps;
struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev); struct mii_bus *bus;
const char *name; const char *name;
int id, prod_num, rev;
bus = dsa_host_dev_to_mii_bus(host_dev);
if (!bus) if (!bus)
return NULL; return NULL;
name = mv88e6xxx_lookup_name(bus, sw_addr, table, num); id = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), PORT_SWITCH_ID);
if (name) { if (id < 0)
ps = devm_kzalloc(dsa_dev, sizeof(*ps), GFP_KERNEL); return NULL;
if (!ps)
return NULL; prod_num = (id & 0xfff0) >> 4;
*priv = ps; rev = id & 0x000f;
ps->bus = dsa_host_dev_to_mii_bus(host_dev);
if (!ps->bus) name = mv88e6xxx_lookup_name(id, table, num);
return NULL; if (!name)
ps->sw_addr = sw_addr; return NULL;
}
ps = devm_kzalloc(dsa_dev, sizeof(*ps), GFP_KERNEL);
if (!ps)
return NULL;
ps->bus = bus;
ps->sw_addr = sw_addr;
ps->id = id & 0xfff0;
*priv = ps;
dev_info(&ps->bus->dev, "switch 0x%x probed: %s, revision %u\n",
prod_num, name, rev);
return name; return name;
} }