Commit 482f3bae authored Jun 24, 2020 by David S. Miller

Merge branch 'net-phy-call-phy_disable_interrupts-in-phy_init_hw'



Jisheng Zhang says:

====================
net: phy: call phy_disable_interrupts() in phy_init_hw()

We face an issue with rtl8211f, a pin is shared between INTB and PMEB,
and the PHY Register Accessible Interrupt is enabled by default, so
the INTB/PMEB pin is always active in polling mode case.

As Heiner pointed out "I was thinking about calling
phy_disable_interrupts() in phy_init_hw(), to have a defined init
state as we don't know in which state the PHY is if the PHY driver is
loaded. We shouldn't assume that it's the chip power-on defaults, BIOS
or boot loader could have changed this. Or in case of dual-boot
systems the other OS could leave the PHY in whatever state."

patch1 makes phy_disable_interrupts() non-static so that it could be used
in phy_init_hw() to have a defined init state.

patch2 calls phy_disable_interrupts() in phy_init_hw() to have a
defined init state.

Since v3:
  - call phy_disable_interrupts() have interrupts disabled first then
    config_init, thank Florian

Since v2:
  - Don't export phy_disable_interrupts() but just make it non-static

Since v1:
  - EXPORT the correct symbol
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 41c2b6b4 9886a4db

drivers/net/phy/phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -840,7 +840,7 @@ static void phy_error(struct phy_device *phydev)
		* phy_disable_interrupts - Disable the PHY interrupts from the PHY side
		* @phydev: target phy_device struct
		*/
		static int phy_disable_interrupts(struct phy_device *phydev)
		int phy_disable_interrupts(struct phy_device *phydev)
		{
		int err;

drivers/net/phy/phy_device.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1092,6 +1092,10 @@ int phy_init_hw(struct phy_device *phydev)
		if (ret < 0)
		return ret;

		ret = phy_disable_interrupts(phydev);
		if (ret)
		return ret;

		if (phydev->drv->config_init)
		ret = phydev->drv->config_init(phydev);

include/linux/phy.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1416,6 +1416,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
		int phy_mii_ioctl(struct phy_device phydev, struct ifreq ifr, int cmd);
		int phy_do_ioctl(struct net_device dev, struct ifreq ifr, int cmd);
		int phy_do_ioctl_running(struct net_device dev, struct ifreq ifr, int cmd);
		int phy_disable_interrupts(struct phy_device *phydev);
		void phy_request_interrupt(struct phy_device *phydev);
		void phy_free_interrupt(struct phy_device *phydev);
		void phy_print_status(struct phy_device *phydev);

Admin message