Commit 347c8d83 authored Nov 06, 2008 by Dasgupta, Romit Committed by Jeff Garzik Nov 11, 2008

[netdrvr] smc911x: fix for driver resume (and compilation warning)



I am trying out suspend, resume on an OMAP3 based board. What I see
during resume is that the SMC911x driver resume routing gets stuck
after trying to transmit the packet out of the controller. Some debug
messages below:

--> smc911x_drv_resume
eth0: --> smc911x_reset
eth0: smc911x_reset timeout waiting for PM restore
eth0: --> smc911x_enable
eth0: --> smc911x_phy_configure()
eth0: --> smc911x_phy_reset()
eth0: phy caps=0x782d
eth0: phy advertised caps=0x0de1
eth0: --> smc911x_phy_check_media
smc911x_phy_read: phyaddr=0x1, phyreg=0x01, phydata=0x7809
smc911x_phy_read: phyaddr=0x1, phyreg=0x01, phydata=0x7809
eth0: link down
Restarting tasks ... eth0: --> smc911x_hard_start_xmit
eth0: --> smc911x_hardware_send_pkt
eth0: --> smc911x_hard_start_xmit
eth0: --> smc911x_hardware_send_pkt
eth0: --> smc911x_hard_start_xmit
eth0: --> smc911x_hardware_send_pkt
nfs: server 172.24.190.217 not responding, still trying
nfs: server 172.24.190.217 not responding, still trying

The following change makes it work fine: (The change within
smc911x_drv_probe function was to get rid of a compilation warning).

Signed-off-by: Romit Dasgupta <romit@ti.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent cf3760da

drivers/net/smc911x.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2050,7 +2050,9 @@ err_out:
		*/
		static int smc911x_drv_probe(struct platform_device *pdev)
		{
		#ifdef SMC_DYNAMIC_BUS_CONFIG
		struct smc911x_platdata *pd = pdev->dev.platform_data;
		#endif
		struct net_device *ndev;
		struct resource *res;
		struct smc911x_local *lp;
		@@ -2182,9 +2184,9 @@ static int smc911x_drv_resume(struct platform_device *dev)

		if (netif_running(ndev)) {
		smc911x_reset(ndev);
		smc911x_enable(ndev);
		if (lp->phy_type != 0)
		smc911x_phy_configure(&lp->phy_configure);
		smc911x_enable(ndev);
		netif_device_attach(ndev);
		}
		}

Admin message