Commit f1131b9c authored by Claudiu Beznea's avatar Claudiu Beznea Committed by David S. Miller
Browse files

net: phy: micrel: use kszphy_suspend()/kszphy_resume for irq aware devices 



On a setup with KSZ9131 and MACB drivers it happens on suspend path, from
time to time, that the PHY interrupt arrives after PHY and MACB were
suspended (PHY via genphy_suspend(), MACB via macb_suspend()). In this
case the phy_read() at the beginning of kszphy_handle_interrupt() will
fail (as MACB driver is suspended at this time) leading to phy_error()
being called and a stack trace being displayed on console. To solve this
.suspend/.resume functions for all KSZ devices implementing
.handle_interrupt were replaced with kszphy_suspend()/kszphy_resume()
which disable/enable interrupt before/after calling
genphy_suspend()/genphy_resume().

The fix has been adapted for all KSZ devices which implements
.handle_interrupt but it has been tested only on KSZ9131.

Fixes: 59ca4e58 ("net: phy: micrel: implement generic .handle_interrupt() callback")
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1771afd4

drivers/net/phy/micrel.c

+18 −18
Original line number Diff line number Diff line
@@ -1726,8 +1726,8 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ8021,

	.phy_id_mask	= 0x00ffffff,
@@ -1741,8 +1741,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ8031,

	.phy_id_mask	= 0x00ffffff,
@@ -1756,8 +1756,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ8041,

	.phy_id_mask	= MICREL_PHY_ID_MASK,
@@ -1788,8 +1788,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.name		= "Micrel KSZ8051",

	/* PHY_BASIC_FEATURES */
@@ -1802,8 +1802,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.match_phy_device = ksz8051_match_phy_device,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ8001,

	.name		= "Micrel KSZ8001 or KS8721",
@@ -1817,8 +1817,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ8081,

	.name		= "Micrel KSZ8081 or KSZ8091",
@@ -1848,8 +1848,8 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= ksz8061_config_init,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ9021,

	.phy_id_mask	= 0x000ffffe,
@@ -1864,8 +1864,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

	.read_mmd	= genphy_read_mmd_unsupported,

	.write_mmd	= genphy_write_mmd_unsupported,

}, {
@@ -1883,7 +1883,7 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_LAN8814,
@@ -1928,7 +1928,7 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

}, {

	.phy_id		= PHY_ID_KSZ8873MLL,