lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Jul 2015 10:21:14 -0500 From: Nathan Sullivan <nathan.sullivan@...com> To: f.fainelli@...il.com Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org, Nathan Sullivan <nathan.sullivan@...com> Subject: [PATCH] net/phy: micrel: Reenable interrupts during resume The ksz9031 has a behavior where it will clear the interrupt enable bits when leaving power down. To work around this, make sure the interrupt bits are in the state they are expected to be when resuming. Signed-off-by: Nathan Sullivan <nathan.sullivan@...com> --- drivers/net/phy/micrel.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 499185e..7a93af6 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -447,6 +447,22 @@ static int ksz9031_center_flp_timing(struct phy_device *phydev) return genphy_restart_aneg(phydev); } +static int ksz9031_resume(struct phy_device *phydev) +{ + int result; + + result = genphy_resume(phydev); + + if (result) + return result; + + /* This phy will reset interrupt enables when leaving power down */ + if (PHY_INTERRUPT_ENABLED & phydev->interrupts) + result = kszphy_set_interrupt(phydev); + + return result; +} + static int ksz9031_config_init(struct phy_device *phydev) { const struct device *dev = &phydev->dev; @@ -776,7 +792,7 @@ static struct phy_driver ksphy_driver[] = { .ack_interrupt = kszphy_ack_interrupt, .config_intr = kszphy_config_intr, .suspend = genphy_suspend, - .resume = genphy_resume, + .resume = ksz9031_resume, .driver = { .owner = THIS_MODULE, }, }, { .phy_id = PHY_ID_KSZ8873MLL, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists