net: dsa: bcm_sf2: Use correct I/O accessors
authorFlorian Fainelli <f.fainelli@gmail.com>
Tue, 29 Aug 2017 20:35:16 +0000 (13:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Aug 2017 21:42:17 +0000 (14:42 -0700)
The Starfigther 2 driver currently uses __raw_{read,write}l which means
native I/O endian. This works correctly for an ARM LE kernel (default)
but fails miserably on an ARM BE (BE8) kernel where registers are kept
little endian, so replace uses with {read,write}l_relaxed here which is
what we want because this is all performance sensitive code.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/bcm_sf2.h

index 7d3030e..d9c96b2 100644 (file)
@@ -130,12 +130,12 @@ static inline u32 bcm_sf2_mangle_addr(struct bcm_sf2_priv *priv, u32 off)
 #define SF2_IO_MACRO(name) \
 static inline u32 name##_readl(struct bcm_sf2_priv *priv, u32 off)     \
 {                                                                      \
-       return __raw_readl(priv->name + off);                           \
+       return readl_relaxed(priv->name + off);                         \
 }                                                                      \
 static inline void name##_writel(struct bcm_sf2_priv *priv,            \
                                  u32 val, u32 off)                     \
 {                                                                      \
-       __raw_writel(val, priv->name + off);                            \
+       writel_relaxed(val, priv->name + off);                          \
 }                                                                      \
 
 /* Accesses to 64-bits register requires us to latch the hi/lo pairs
@@ -179,23 +179,23 @@ static inline void intrl2_##which##_mask_set(struct bcm_sf2_priv *priv, \
 static inline u32 core_readl(struct bcm_sf2_priv *priv, u32 off)
 {
        u32 tmp = bcm_sf2_mangle_addr(priv, off);
-       return __raw_readl(priv->core + tmp);
+       return readl_relaxed(priv->core + tmp);
 }
 
 static inline void core_writel(struct bcm_sf2_priv *priv, u32 val, u32 off)
 {
        u32 tmp = bcm_sf2_mangle_addr(priv, off);
-       __raw_writel(val, priv->core + tmp);
+       writel_relaxed(val, priv->core + tmp);
 }
 
 static inline u32 reg_readl(struct bcm_sf2_priv *priv, u16 off)
 {
-       return __raw_readl(priv->reg + priv->reg_offsets[off]);
+       return readl_relaxed(priv->reg + priv->reg_offsets[off]);
 }
 
 static inline void reg_writel(struct bcm_sf2_priv *priv, u32 val, u16 off)
 {
-       __raw_writel(val, priv->reg + priv->reg_offsets[off]);
+       writel_relaxed(val, priv->reg + priv->reg_offsets[off]);
 }
 
 SF2_IO64_MACRO(core);