diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2015-02-19 11:09:27 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-20 17:52:46 -0500 |
commit | ddede6d536d70c4ef2193ca14208db90740fcd22 (patch) | |
tree | 1a019786f29a1abc9105aae80cc8ffaf0375683a /drivers | |
parent | 6dd0c1655be26345960a6bae574c7dc4648611d3 (diff) | |
download | linux-stable-ddede6d536d70c4ef2193ca14208db90740fcd22.tar.gz linux-stable-ddede6d536d70c4ef2193ca14208db90740fcd22.tar.bz2 linux-stable-ddede6d536d70c4ef2193ca14208db90740fcd22.zip |
net: dsa: bcm_sf2: fix 64-bits register reads
Reading 64-bits register was not working because we inverted the steps
between reading the lower 32-bits of the register and reading the upper
32-bits. Swapping these operations is how the HW guarantees that 64-bits
reads are latched correctly. We only have a handful of 64-bits registers
for now, mostly MIB counters, so the imapct is low.
Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/dsa/bcm_sf2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h index ee9f650d5026..7b7053d3c5fa 100644 --- a/drivers/net/dsa/bcm_sf2.h +++ b/drivers/net/dsa/bcm_sf2.h @@ -105,8 +105,8 @@ static inline u64 name##_readq(struct bcm_sf2_priv *priv, u32 off) \ { \ u32 indir, dir; \ spin_lock(&priv->indir_lock); \ - indir = reg_readl(priv, REG_DIR_DATA_READ); \ dir = __raw_readl(priv->name + off); \ + indir = reg_readl(priv, REG_DIR_DATA_READ); \ spin_unlock(&priv->indir_lock); \ return (u64)indir << 32 | dir; \ } \ |