Patch "net: dsa: bcm_sf2: Fix 64-bits register writes" has been added to the 4.1-stable tree
This is a note to let you know that I've just added the patch titled
net: dsa: bcm_sf2: Fix 64-bits register writes
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-dsa-bcm_sf2-fix-64-bits-register-writes.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Sep 30 05:18:31 CEST 2015
From: Florian Fainelli <[email protected]>
Date: Tue, 8 Sep 2015 20:06:41 -0700
Subject: net: dsa: bcm_sf2: Fix 64-bits register writes
From: Florian Fainelli <[email protected]>
[ 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.
--- drivers/net/dsa/bcm_sf2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/dsa/bcm_sf2.h +2 -2
@@ -112,8 +112,8 @@ static inline u64 name##_readq(struct bcspin_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 ); \
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/net-dsa-bcm_sf2-do-not-override-speed-settings.patch queue-4.1/net-phy-fixed_phy-handle-link-down-case.patch queue-4.1/net-dsa-bcm_sf2-fix-ageing-conditions-and-operation.patch queue-4.1/of_mdio-add-new-dt-property-managed-to-specify-the-phy-management-type.patch queue-4.1/net-dsa-bcm_sf2-fix-64-bits-register-writes.patch