phy: micrel: Ensure interrupts are reenabled on resume (f5aba91d) · Commits · 戴 / test

At least on ksz8081, when getting back from power down, interrupts are disabled. ensure they are reenabled if they were previously enabled. This fixes resuming which is failing on the xplained boards from atmel since (net: phy: Use interrupts when available in NOLINK state) Fixes: (net: phy: Use interrupts when available in NOLINK state) Signed-off-by:

Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/micrel.c

+16 −1

Original line number	Diff line number	Diff line
		@@ -635,6 +635,21 @@ static void kszphy_get_stats(struct phy_device *phydev,
		data[i] = kszphy_get_stat(phydev, i);
		}

		static int kszphy_resume(struct phy_device *phydev)
		{
		int value;

		mutex_lock(&phydev->lock);

		value = phy_read(phydev, MII_BMCR);
		phy_write(phydev, MII_BMCR, value & ~BMCR_PDOWN);

		kszphy_config_intr(phydev);
		mutex_unlock(&phydev->lock);

		return 0;
		}

		static int kszphy_probe(struct phy_device *phydev)
		{
		const struct kszphy_type *type = phydev->drv->driver_data;
		@@ -844,7 +859,7 @@ static struct phy_driver ksphy_driver[] = {
		.get_strings = kszphy_get_strings,
		.get_stats = kszphy_get_stats,
		.suspend = genphy_suspend,
		.resume = genphy_resume,
		.resume = kszphy_resume,
		}, {
		.phy_id = PHY_ID_KSZ8061,
		.name = "Micrel KSZ8061",

Admin message