| From foo@baz Wed Sep 30 05:25:07 CEST 2015 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Tue, 8 Sep 2015 20:06:41 -0700 |
| Subject: net: dsa: bcm_sf2: Fix 64-bits register writes |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 03679a14739a0d4c14b52ba65a69ff553bfba73b ] |
| |
| The macro to write 64-bits quantities to the 32-bits register swapped |
| the value and offsets arguments, we want to preserve the ordering of the |
| arguments with respect to how writel() is implemented for instance: |
| value first, offset/base second. |
| |
| Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/dsa/bcm_sf2.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/dsa/bcm_sf2.h |
| +++ b/drivers/net/dsa/bcm_sf2.h |
| @@ -112,8 +112,8 @@ static inline u64 name##_readq(struct bc |
| spin_unlock(&priv->indir_lock); \ |
| return (u64)indir << 32 | dir; \ |
| } \ |
| -static inline void name##_writeq(struct bcm_sf2_priv *priv, u32 off, \ |
| - u64 val) \ |
| +static inline void name##_writeq(struct bcm_sf2_priv *priv, u64 val, \ |
| + u32 off) \ |
| { \ |
| spin_lock(&priv->indir_lock); \ |
| reg_writel(priv, upper_32_bits(val), REG_DIR_DATA_WRITE); \ |
