diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2018-03-01 02:02:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-04 13:34:18 -0500 |
| commit | c6c8cd5e3ce494419d8894d6a96aa17375b83ca2 (patch) | |
| tree | 4f504c92a08a331fbb1908c47fb0e3bcdf3b2ed6 /drivers/net/dsa | |
| parent | 88c060549a4c555d59965801d1e811b71614c2b7 (diff) | |
net: dsa: mv88e6xxx: Hold mutex while doing stats operations
Until now, there has been no need to hold the reg mutex while getting
the count of statistics, or the strings, because the hardware was not
accessed. When adding support for SERDES statistics, it is necessary
to access the hardware, to determine if a port is using the SERDES
interface. So add mutex lock/unlocks.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 8c9a30d1b06f..27ca0fcb1040 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -724,8 +724,12 @@ static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port, { struct mv88e6xxx_chip *chip = ds->priv; + mutex_lock(&chip->reg_lock); + if (chip->info->ops->stats_get_strings) chip->info->ops->stats_get_strings(chip, data); + + mutex_unlock(&chip->reg_lock); } static int mv88e6xxx_stats_get_sset_count(struct mv88e6xxx_chip *chip, @@ -757,11 +761,14 @@ static int mv88e6320_stats_get_sset_count(struct mv88e6xxx_chip *chip) static int mv88e6xxx_get_sset_count(struct dsa_switch *ds, int port) { struct mv88e6xxx_chip *chip = ds->priv; + int ret = 0; + mutex_lock(&chip->reg_lock); if (chip->info->ops->stats_get_sset_count) - return chip->info->ops->stats_get_sset_count(chip); + ret = chip->info->ops->stats_get_sset_count(chip); + mutex_unlock(&chip->reg_lock); - return 0; + return ret; } static void mv88e6xxx_stats_get_stats(struct mv88e6xxx_chip *chip, int port, |