Re: de2104x: fix power management

[Jeff Garzik]

On 09/25/2010 05:57 AM, Ondrej Zary wrote:
> At least my 21041 cards come out of suspend with bus mastering disabled so
> they did not work after resume(no data transferred).
> After adding pci_set_master(), the driver oopsed immediately on resume -
> because de_clean_rings() is called on suspend but de_init_rings() call
> was missing in resume.
>
> Also disable link (reset SIA) before sleep (de4x5 does this too).
>
> Signed-off-by: Ondrej Zary<linux@xxxxxxxxxxxxxxxxxxxx>
>
> --- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c	2010-09-25 11:27:26.000000000 +0200
> +++ linux-2.6.36-rc3/drivers/net/tulip/de2104x.c	2010-09-25 11:29:22.000000000 +0200
> @@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_
>   	if (de->de21040)
>   		return;
>
> +	dw32(CSR13, 0); /* Reset phy */
>   	pci_read_config_dword(de->pdev, PCIPM,&pmctl);
>   	pmctl |= PM_Sleep;
>   	pci_write_config_dword(de->pdev, PCIPM, pmctl);
> @@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pd
>   		dev_err(&dev->dev, "pci_enable_device failed in resume\n");
>   		goto out;
>   	}
> +	pci_set_master(pdev);
> +	de_init_rings(de);
>   	de_init_hw(de);
>   out_attach:
>   	netif_device_attach(dev);

Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

IMO suspend/resume could use another look; if netif_running is false 
(interface is down), de2104x does not put the PCI device to sleep, which 
seems strange.

I also wonder if rtnl_lock() couldn't be eliminated, as other net 
drivers don't need it in suspend/resume.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/