Patch "net: dsa: bcm_sf2: Utilize nested MDIO read/write" has been added to the 4.9-stable tree
This is a note to let you know that I've just added the patch titled
net: dsa: bcm_sf2: Utilize nested MDIO read/write
to the 4.9-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-utilize-nested-mdio-read-write.patch
and it can be found in the queue-4.9 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 Thu Jan 12 21:37:26 CET 2017
From: Florian Fainelli <[email protected]>
Date: Sat, 7 Jan 2017 21:01:57 -0800
Subject: net: dsa: bcm_sf2: Utilize nested MDIO read/write
From: Florian Fainelli <[email protected]>
[ Upstream commit 2cfe8f8290bd28cf1ee67db914a6e76cf8e6437b ]
We are implementing a MDIO bus which is behind another one, so use the nested version of the accessors to get lockdep annotations correct.
--- drivers/net/dsa/bcm_sf2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/dsa/bcm_sf2.c +2 -2
@@ -393,7 +393,7 @@ static int bcm_sf2_sw_mdio_read(struct mif (addr ==BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask &BIT (addr))return bcm_sf2_sw_indir_rw (priv,1 , addr, regnum,0 );else -return mdiobus_read (priv->master_mii_bus, addr, regnum); +return mdiobus_read_nested (priv->master_mii_bus, addr, regnum); } static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,
@@ -407,7 +407,7 @@ static int bcm_sf2_sw_mdio_write(structif (addr ==BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask &BIT (addr))bcm_sf2_sw_indir_rw (priv,0 , addr, regnum, val);else -mdiobus_write (priv->master_mii_bus, addr, regnum, val); +mdiobus_write_nested (priv->master_mii_bus, addr, regnum, val);return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/net-dsa-ensure-validity-of-dst-ds.patch queue-4.9/net-stmmac-fix-race-between-stmmac_drv_probe-and-stmmac_open.patch queue-4.9/net-dsa-bcm_sf2-utilize-nested-mdio-read-write.patch queue-4.9/net-dsa-bcm_sf2-do-not-clobber-b53_switch_ops.patch