Commit 4488f6b6 authored by Divya Koppera's avatar Divya Koppera Committed by David S. Miller
Browse files

net: phy: micrel: Fix concurrent register access 



Make Extended page register accessing atomic,
to overcome unexpected output from register
reads/writes.

Fixes: 7c2dcfa2 ("net: phy: micrel: Add support for LAN8804 PHY")
Signed-off-by: default avatarDivya <Koppera&lt;Divya.Koppera@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6af3b428

drivers/net/phy/micrel.c

+16 −14
Original line number Diff line number Diff line
@@ -1596,11 +1596,13 @@ static int lanphy_read_page_reg(struct phy_device *phydev, int page, u32 addr) 
{

	u32 data;



	phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);

	phy_write(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA, addr);

	phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL,

	phy_lock_mdio_bus(phydev);

	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);

	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA, addr);

	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL,

		    (page | LAN_EXT_PAGE_ACCESS_CTRL_EP_FUNC));

	data = phy_read(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA);

	data = __phy_read(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA);

	phy_unlock_mdio_bus(phydev);



	return data;

}
@@ -1608,19 +1610,19 @@ static int lanphy_read_page_reg(struct phy_device *phydev, int page, u32 addr) 
static int lanphy_write_page_reg(struct phy_device *phydev, int page, u16 addr,

				 u16 val)

{

	phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);

	phy_write(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA, addr);

	phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL,

		  (page | LAN_EXT_PAGE_ACCESS_CTRL_EP_FUNC));

	phy_lock_mdio_bus(phydev);

	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);

	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA, addr);

	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL,

		    page | LAN_EXT_PAGE_ACCESS_CTRL_EP_FUNC);



	val = phy_write(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA, val);

	if (val) {

	val = __phy_write(phydev, LAN_EXT_PAGE_ACCESS_ADDRESS_DATA, val);

	if (val != 0)

		phydev_err(phydev, "Error: phy_write has returned error %d\n",

			   val);

	phy_unlock_mdio_bus(phydev);

	return val;

}

	return 0;

}



static int lan8814_config_init(struct phy_device *phydev)

{