fixing errors handling during pci_driver resume stage [net]
Subsystems (4)
PATCH 1/5 fixing errors handling during pci_driver resume stage [net]
network pci drivers have to return correct error code during resume stage in case of errors.
-----
Makefile +0 -0
drivers/net/3c59x.c +8 -1
@@ -823,11 +823,18 @@ static int vortex_resume(struct pci_dev {struct net_device *dev =pci_get_drvdata (pdev);struct vortex_private *vp =netdev_priv (dev); +int err;if (dev && vp) {pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + err =pci_enable_device (pdev); +if (err) { +dev_err (&pdev->dev,"Cannot enable PCI device, " +" aborting.\n" ); +return err; + } +pci_set_master (pdev);if (request_irq (dev->irq, vp->full_bus_master_rx ? &boomerang_interrupt : &vortex_interrupt,IRQF_SHARED , dev->name, dev)) {
drivers/net/b44.c +11 -2
@@ -2315,16 +2315,25 @@ static int b44_resume(struct pci_dev *pd {struct net_device *dev =pci_get_drvdata (pdev);struct b44 *bp =netdev_priv (dev); +int err;pci_restore_state (pdev); -pci_enable_device (pdev); + err =pci_enable_device (pdev); +if (err) { +dev_err (&pdev->dev,"Cannot enable PCI device, aborting.\n" ); +return err; + } +pci_set_master (pdev);if (!netif_running (dev))return 0 ; -if (request_irq (dev->irq, b44_interrupt,IRQF_SHARED , dev->name, dev)) +if (request_irq (dev->irq, b44_interrupt,IRQF_SHARED , dev->name, dev)) { printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name); +pci_disable_device (pdev); +return -EBUSY ; + }spin_lock_irq (&bp->lock);
drivers/net/eepro100.c +7 -1
@@ -2292,10 +2292,16 @@ static int eepro100_resume(struct pci_destruct net_device *dev =pci_get_drvdata (pdev);struct speedo_private *sp =netdev_priv (dev);void __iomem *ioaddr = sp->regs; +int err;pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + err =pci_enable_device (pdev); +if (err) { +dev_err (&pdev->dev,"Cannot enable PCI device, aborting.\n" ); +return err; + } +pci_set_master (pdev);if (!netif_running (dev))
drivers/net/natsemi.c +8 -1
@@ -3195,13 +3195,20 @@ static int natsemi_resume (struct pci_de {struct net_device *dev =pci_get_drvdata (pdev);struct netdev_private *np =netdev_priv (dev); +int err;rtnl_lock ();if (netif_device_present (dev)) goto out;if (netif_running (dev)) {BUG_ON (!np->hands_off); -pci_enable_device (pdev); + err =pci_enable_device (pdev); +if (err) { +dev_err (&pdev->dev,"Cannot enable PCI device, " +"aborting.\n" ); +return err; + } +/* pci_power_on(pdev); */ natsemi_reset (dev);
drivers/net/ne2k-pci.c +6 -1
@@ -670,10 +670,15 @@ static int ne2k_pci_suspend (struct pci_static int ne2k_pci_resume (struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); +int err;pci_set_power_state (pdev,0 );pci_restore_state (pdev); -pci_enable_device (pdev); + err =pci_enable_device (pdev); +if (err) { +dev_err (&pdev->dev,"Cannot enable PCI device, aborting.\n" ); +return err; + }NS8390_init (dev,1 );netif_device_attach (dev);
drivers/net/sk98lin/skge.c +6 -1
@@ -5125,7 +5125,12 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +dev_err (&pdev->dev,"Cannot enable PCI device, aborting.\n" ); +return ret; + } +pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
drivers/net/tulip/xircom_tulip_cb.c +7 -1
@@ -1655,10 +1655,16 @@ static int xircom_resume(struct pci_dev {struct net_device *dev =pci_get_drvdata (pdev);struct xircom_private *tp =netdev_priv (dev); +int err;printk (KERN_INFO "xircom_resume(%s)\n" , dev->name);pci_set_power_state (pdev,0 ); -pci_enable_device (pdev); + err =pci_enable_device (pdev); +if (err) { +dev_err (&pdev->dev,"Cannot enable PCI device, aborting.\n" ); +return err; + } +pci_restore_state (pdev);/* Bring the chip out of sleep mode.
Quoted 4 lines · On Tue, 09 Jan 2007 12:01:14 +0300 Dmitriy Monakhov <[email protected]>…
network pci drivers have to return correct error code during resume stage in case of errors.
Signed-off-by Dmitriy Monakhov <[email protected]>-----
Please don't introduce one dev_err() call into a device driver if all the other error printout's use a different interface.
Signature · 1 line
Stephen Hemminger <[email protected]>
Quoted 10 lines · Stephen Hemminger
Quoted 4 lines · On Tue, 09 Jan 2007 12:01:14 +0300 Dmitriy Monakhov <[email protected]>…
network pci drivers have to return correct error code during resume stage in case of errors.
Signed-off-by Dmitriy Monakhov <[email protected]>-----
Please don't introduce one
dev_err()call into a device driver if all the other error printout's use a different interface.
Ok. It was wrong decision to fix all affected drivers in one patchset. Especially without respect to concrete driver specific. I'll try to rewrite it in more slowly but (i hope) more correct way
Quoted 8 lines
Signature · 7 lines
-- Stephen Hemminger <[email protected]> - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/