Messages in this thread Patches in this message | | | Date | Mon, 3 Nov 2003 23:46:37 +0100 | From | Daniele Venzano <> | Subject | Re: [PATCH] Add PM support to sis900 network driver |
| |
On Mon, Nov 03, 2003 at 12:06:47PM -0800, Andrew Morton wrote: > OK. I think. Net driver suspend handlers in general seem a bit racy wrt > interrupt activity as well as SMP. Maybe I'm missing something. Looking at the logs I just discovered the following line buried in the middle of all that Bad: scheduling while atomic during resume: eth0: Abnormal interrupt, status 0x03008200
This seems to happen with all the patches I sent you, but then the network card is working correctly, it seems a leftover handled correctly on the first interrupt..
> > I think also the 8139too driver has the same locking problem in > > rtl8139_suspend, do you want a patch ? > > Wouldn't hurt, thanks. It's one way to wake Jeff up ;) Attached you find a patch that just moves up the lock release before the call to pci_set_power_state. (and Jeff is CCed)
> 8139too just does netif_device_detach(), whereas your sis900 patch does > netif_stop_queue() and then netif_device_detach(). > > I don't know which is right, really. 8139too will end up with a > non-stopped queue if __LINK_STATE_PRESENT is clear. The sis900 approach is > certainly safe enough, but it'd be nice to know what netif_device_detach() > is trying to do there. I tried to comment out the stop_queue call, and suspending with the network cable unplugged. The card keeps working on resume, as I was expecting.
Perhaps we could keep only the stop_queue call and still remain on the safe side, certainly doing two times the same call is dumb. With this setup (only stop_queue) I did not get any Abnormal interrupt message, but I don't know if they are related.
So in the end you get two patches, the 8139too and the sis900 with no locking and no netif_device_detach.
Both are available at http://teg.homeunix.org/kernel_patches.html
-- ------------------------------ Daniele Venzano Web: http://teg.homeunix.org --- linux-2.6.0-test9/drivers/net/8139too.c 2003-10-18 17:17:51.000000000 +0200 +++ linux-2.6.0-test9-dv/drivers/net/8139too.c 2003-11-03 22:21:54.000000000 +0100 @@ -2474,10 +2474,11 @@ tp->stats.rx_missed_errors += RTL_R32 (RxMissed); RTL_W32 (RxMissed, 0); + spin_unlock_irqrestore (&tp->lock, flags); + pci_set_power_state (pdev, 3); pci_save_state (pdev, tp->pci_state); - spin_unlock_irqrestore (&tp->lock, flags); return 0; } --- linux-2.6.0-test9/drivers/net/sis900.c 2003-09-28 15:26:42.000000000 +0200 +++ linux-2.6.0-test9-dv/drivers/net/sis900.c 2003-11-03 23:07:42.000000000 +0100 @@ -18,10 +18,11 @@ preliminary Rev. 1.0 Jan. 18, 1998 http://www.sis.com.tw/support/databook.htm + Rev 1.08.07 Nov. 2 2003 Daniele Venzano <webvenza@libero.it> add suspend/resume support Rev 1.08.06 Sep. 24 2002 Mufasa Yang bug fix for Tx timeout & add SiS963 support - Rev 1.08.05 Jun. 6 2002 Mufasa Yang bug fix for read_eeprom & Tx descriptor over-boundary + Rev 1.08.05 Jun. 6 2002 Mufasa Yang bug fix for read_eeprom & Tx descriptor over-boundary Rev 1.08.04 Apr. 25 2002 Mufasa Yang <mufasa@sis.com.tw> added SiS962 support - Rev 1.08.03 Feb. 1 2002 Matt Domsch <Matt_Domsch@dell.com> update to use library crc32 function + Rev 1.08.03 Feb. 1 2002 Matt Domsch <Matt_Domsch@dell.com> update to use library crc32 function Rev 1.08.02 Nov. 30 2001 Hui-Fen Hsu workaround for EDB & bug fix for dhcp problem Rev 1.08.01 Aug. 25 2001 Hui-Fen Hsu update for 630ET & workaround for ICS1893 PHY Rev 1.08.00 Jun. 11 2001 Hui-Fen Hsu workaround for RTL8201 PHY and some bug fix @@ -72,7 +73,7 @@ #include "sis900.h" #define SIS900_MODULE_NAME "sis900" -#define SIS900_DRV_VERSION "v1.08.06 9/24/2002" +#define SIS900_DRV_VERSION "v1.08.07 11/02/2003" static char version[] __devinitdata = KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n"; @@ -169,6 +170,7 @@ unsigned int tx_full; /* The Tx queue is full. */ u8 host_bridge_rev; + u32 pci_state[16]; }; MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>, Ollie Lho <ollie@sis.com.tw>"); @@ -305,7 +307,7 @@ *( ((u16 *)net_dev->dev_addr) + i) = inw(ioaddr + rfdr); } - /* enable packet filitering */ + /* enable packet filtering */ outl(rfcrSave | RFEN, rfcr + ioaddr); return 1; @@ -994,7 +996,7 @@ } } - /* enable packet filitering */ + /* enable packet filtering */ outl(rfcrSave | RFEN, rfcr + ioaddr); } @@ -1466,7 +1468,7 @@ * @net_dev: the net device to transmit with * * Set the transmit buffer descriptor, - * and write TxENA to enable transimt state machine. + * and write TxENA to enable transmit state machine. * tell upper layer if the buffer is full */ @@ -2184,11 +2186,72 @@ pci_set_drvdata(pci_dev, NULL); } +#ifdef CONFIG_PM + +static int sis900_suspend(struct pci_dev *pci_dev, u32 state) +{ + struct net_device *net_dev = pci_get_drvdata(pci_dev); + struct sis900_private *sis_priv = net_dev->priv; + long ioaddr = net_dev->base_addr; + + if(!netif_running(net_dev)) + return 0; + + netif_stop_queue(net_dev); + + /* Stop the chip's Tx and Rx Status Machine */ + outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr); + + pci_set_power_state(pci_dev, 3); + pci_save_state(pci_dev, sis_priv->pci_state); + + return 0; +} + +static int sis900_resume(struct pci_dev *pci_dev) +{ + struct net_device *net_dev = pci_get_drvdata(pci_dev); + struct sis900_private *sis_priv = net_dev->priv; + long ioaddr = net_dev->base_addr; + + if(!netif_running(net_dev)) + return 0; + pci_restore_state(pci_dev, sis_priv->pci_state); + pci_set_power_state(pci_dev, 0); + + sis900_init_rxfilter(net_dev); + + sis900_init_tx_ring(net_dev); + sis900_init_rx_ring(net_dev); + + set_rx_mode(net_dev); + + netif_device_attach(net_dev); + netif_start_queue(net_dev); + + /* Workaround for EDB */ + sis900_set_mode(ioaddr, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED); + + /* Enable all known interrupts by setting the interrupt mask. */ + outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); + outl(RxENA | inl(ioaddr + cr), ioaddr + cr); + outl(IE, ioaddr + ier); + + sis900_check_mode(net_dev, sis_priv->mii); + + return 0; +} +#endif /* CONFIG_PM */ + static struct pci_driver sis900_pci_driver = { .name = SIS900_MODULE_NAME, .id_table = sis900_pci_tbl, .probe = sis900_probe, .remove = __devexit_p(sis900_remove), +#ifdef CONFIG_PM + .suspend = sis900_suspend, + .resume = sis900_resume, +#endif /* CONFIG_PM */ }; static int __init sis900_init_module(void) | |