orinoco: unregister network device before releasing PCMCIA resources
Subsystems (3)
PATCH 1/5 orinoco: unregister network device before releasing PCMCIA resources
From: Pavel Roskin <[email protected]>
Hardware resources should not be made available to other devices while the network device is still registered. Also remove the related debug statements.
---
drivers/net/wireless/orinoco_cs.c | 9 +++------ drivers/net/wireless/spectrum_cs.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-)
drivers/net/wireless/orinoco_cs.c +3 -6
@@ -147,14 +147,11 @@ static void orinoco_cs_detach(struct pcm {struct net_device *dev = link->priv; +if (link->dev_node) +unregister_netdev (dev); +orinoco_cs_release (link); -DEBUG (0 ,PFX "detach: link=%p link->dev_node=%p\n" , link, link->dev_node); -if (link->dev_node) { -DEBUG (0 ,PFX "About to unregister net device %p\n" , - dev); -unregister_netdev (dev); - }free_orinocodev (dev); }/* orinoco_cs_detach */
drivers/net/wireless/spectrum_cs.c +3 -6
@@ -625,14 +625,11 @@ static void spectrum_cs_detach(struct pc {struct net_device *dev = link->priv; +if (link->dev_node) +unregister_netdev (dev); +spectrum_cs_release (link); -DEBUG (0 ,PFX "detach: link=%p link->dev_node=%p\n" , link, link->dev_node); -if (link->dev_node) { -DEBUG (0 ,PFX "About to unregister net device %p\n" , - dev); -unregister_netdev (dev); - }free_orinocodev (dev); }/* spectrum_cs_detach */
PATCH 2/5 orinoco: report more relevant data on startup
From: Pavel Roskin <[email protected]>
Report only the first I/O window and IRQ, and also add the driver name. The second I/O window, Vpp and configuration index are not interesting to most users. They can be found by PCMCIA debug tools if needed.
---
drivers/net/wireless/orinoco_cs.c | 17 ++++------------- drivers/net/wireless/spectrum_cs.c | 17 ++++------------- 2 files changed, 8 insertions(+), 26 deletions(-)
drivers/net/wireless/orinoco_cs.c +4 -13
@@ -343,19 +343,10 @@ orinoco_cs_config(struct pcmcia_device *net_device has been registered */ /* Finally, report what we've done */ -printk (KERN_DEBUG "%s: index 0x%02x: " , - dev->name, link->conf.ConfigIndex); -if (link->conf.Vpp) -printk (", Vpp %d.%d" , link->conf.Vpp /10 , - link->conf.Vpp %10 ); -printk (", irq %d" , link->irq.AssignedIRQ); -if (link->io.NumPorts1) -printk (", io 0x%04x-0x%04x" , link->io.BasePort1, - link->io.BasePort1 + link->io.NumPorts1 -1 ); -if (link->io.NumPorts2) -printk (" & 0x%04x-0x%04x" , link->io.BasePort2, - link->io.BasePort2 + link->io.NumPorts2 -1 ); -printk ("\n" ); +printk (KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " +"0x%04x-0x%04x\n" , dev->name, dev->class_dev.dev->bus_id, + link->irq.AssignedIRQ, link->io.BasePort1, + link->io.BasePort1 + link->io.NumPorts1 -1 );return 0 ;
drivers/net/wireless/spectrum_cs.c +4 -13
@@ -822,19 +822,10 @@ spectrum_cs_config(struct pcmcia_devicenet_device has been registered */ /* Finally, report what we've done */ -printk (KERN_DEBUG "%s: index 0x%02x: " , - dev->name, link->conf.ConfigIndex); -if (link->conf.Vpp) -printk (", Vpp %d.%d" , link->conf.Vpp /10 , - link->conf.Vpp %10 ); -printk (", irq %d" , link->irq.AssignedIRQ); -if (link->io.NumPorts1) -printk (", io 0x%04x-0x%04x" , link->io.BasePort1, - link->io.BasePort1 + link->io.NumPorts1 -1 ); -if (link->io.NumPorts2) -printk (" & 0x%04x-0x%04x" , link->io.BasePort2, - link->io.BasePort2 + link->io.NumPorts2 -1 ); -printk ("\n" ); +printk (KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " +"0x%04x-0x%04x\n" , dev->name, dev->class_dev.dev->bus_id, + link->irq.AssignedIRQ, link->io.BasePort1, + link->io.BasePort1 + link->io.NumPorts1 -1 );return 0 ;
PATCH 3/5 orinoco: simplify locking, fix error handling in PCMCIA resume
In reply to Pavel RoskinFrom: Pavel Roskin <[email protected]>
Don't use flags in the spinlocks - the PCMCIA resume functions may not be called under lock. Don't ignore any errors.
---
drivers/net/wireless/orinoco_cs.c | 7 +++---- drivers/net/wireless/spectrum_cs.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/orinoco_cs.c +3 -4
@@ -415,7 +415,6 @@ static int orinoco_cs_resume(struct pcmcstruct orinoco_private *priv =netdev_priv (dev);struct orinoco_pccard *card = priv->card;int err =0 ; -unsigned long flags;if (!test_bit (0 , &card->hard_reset_in_progress)) { err =orinoco_reinit_firmware (dev);
@@ -425,7 +424,7 @@ static int orinoco_cs_resume(struct pcmcreturn -EIO ; } -spin_lock_irqsave (&priv->lock, flags); +spin_lock (&priv->lock);netif_device_attach (dev); priv->hw_unavailable--;
@@ -437,10 +436,10 @@ static int orinoco_cs_resume(struct pcmc dev->name, err); } -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock (&priv->lock); } -return 0 ; +return err; }
drivers/net/wireless/spectrum_cs.c +3 -4
@@ -866,11 +866,10 @@ spectrum_cs_suspend(struct pcmcia_device {struct net_device *dev = link->priv;struct orinoco_private *priv =netdev_priv (dev); -unsigned long flags;int err =0 ;/* Mark the device as stopped, to block IO until later */ -spin_lock_irqsave (&priv->lock, flags); +spin_lock (&priv->lock); err =__orinoco_down (dev);if (err)
@@ -880,9 +879,9 @@ spectrum_cs_suspend(struct pcmcia_devicenetif_device_detach (dev); priv->hw_unavailable++; -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock (&priv->lock); -return 0 ; +return err; } static int
PATCH 4/5 orinoco: eliminate the suspend/resume functions if CONFIG_PM is unset
In reply to Pavel RoskinFrom: Pavel Roskin <[email protected]>
---
drivers/net/wireless/orinoco_pci.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/net/wireless/orinoco_pci.h +5 -0
@@ -44,6 +44,7 @@ static inline void orinoco_pci_setup_net pci_name(pdev), pdev->irq, range_type, start, end); } +#ifdef CONFIG_PM static int orinoco_pci_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev);
@@ -121,5 +122,9 @@ static int orinoco_pci_resume(struct pcireturn 0 ; } +#else +#define orinoco_pci_suspend NULL +#define orinoco_pci_resume NULL +#endif #endif /* _ORINOCO_PCI_H */
PATCH 5/5 orinoco: don't put PCI resource data to the network device
In reply to Pavel RoskinFrom: Pavel Roskin <[email protected]>
The resource data in the network device is intended for ISA and other older busses, but not for PCI. Don't put PCI data there. Don't (ab)use the network device for keeping the IRQ number.
Retire orinoco_pci_setup_netdev(), and print some minimal information to the kernel log instead, identifying the network device and the driver mostly to identify problems at startup. Scripts should rely on sysfs.
---
drivers/net/wireless/orinoco_nortel.c | 5 +++-- drivers/net/wireless/orinoco_pci.c | 5 +++-- drivers/net/wireless/orinoco_pci.h | 26 -------------------------- drivers/net/wireless/orinoco_plx.c | 5 +++-- drivers/net/wireless/orinoco_tmd.c | 5 +++-- 5 files changed, 12 insertions(+), 34 deletions(-)
drivers/net/wireless/orinoco_nortel.c +3 -2
@@ -206,7 +206,6 @@ static int orinoco_nortel_init_one(struc err = -EBUSY ; goto fail_irq; } -orinoco_pci_setup_netdev (dev, pdev,2 ); err =orinoco_nortel_hw_init (card);if (err) {
@@ -227,6 +226,8 @@ static int orinoco_nortel_init_one(struc }pci_set_drvdata (pdev, dev); +printk (KERN_DEBUG "%s: " DRIVER_NAME " at %s\n" , dev->name, +pci_name (pdev));return 0 ;
@@ -265,7 +266,7 @@ static void __devexit orinoco_nortel_remiowrite16 (0 , card->bridge_io +10 );unregister_netdev (dev); -free_irq (dev->irq, dev); +free_irq (pdev->irq, dev);pci_set_drvdata (pdev,NULL );free_orinocodev (dev);pci_iounmap (pdev, priv->hw.iobase);
drivers/net/wireless/orinoco_pci.c +3 -2
@@ -161,7 +161,6 @@ static int orinoco_pci_init_one(struct p err = -EBUSY ; goto fail_irq; } -orinoco_pci_setup_netdev (dev, pdev,0 ); err =orinoco_pci_cor_reset (priv);if (err) {
@@ -176,6 +175,8 @@ static int orinoco_pci_init_one(struct p }pci_set_drvdata (pdev, dev); +printk (KERN_DEBUG "%s: " DRIVER_NAME " at %s\n" , dev->name, +pci_name (pdev));return 0 ;
@@ -204,7 +205,7 @@ static void __devexit orinoco_pci_removestruct orinoco_private *priv =netdev_priv (dev);unregister_netdev (dev); -free_irq (dev->irq, dev); +free_irq (pdev->irq, dev);pci_set_drvdata (pdev,NULL );free_orinocodev (dev);pci_iounmap (pdev, priv->hw.iobase);
drivers/net/wireless/orinoco_pci.h +0 -26
@@ -18,32 +18,6 @@ struct orinoco_pci_card {void __iomem *attr_io; }; -/* Set base address or memory range of the network device based on -* the PCI device it's using. Specify BAR of the "main" resource. -* To be used after request_irq(). */ -static inline void orinoco_pci_setup_netdev (struct net_device *dev, -struct pci_dev *pdev,int bar) -{ -char *range_type; -unsigned long start =pci_resource_start (pdev, bar); -unsigned long len =pci_resource_len (pdev, bar); -unsigned long flags =pci_resource_flags (pdev, bar); -unsigned long end = start + len -1 ; - - dev->irq = pdev->irq; -if (flags &IORESOURCE_IO ) { - dev->base_addr = start; - range_type ="ports" ; - }else { - dev->mem_start = start; - dev->mem_end = end; - range_type ="memory" ; - } - - printk(KERN_DEBUG PFX "%s: irq %d, %s 0x%lx-0x%lx\n", - pci_name(pdev), pdev->irq, range_type, start, end); -} -#ifdef CONFIG_PM static int orinoco_pci_suspend (struct pci_dev *pdev,pm_message_t state) {
drivers/net/wireless/orinoco_plx.c +3 -2
@@ -245,7 +245,6 @@ static int orinoco_plx_init_one(struct p err = -EBUSY ; goto fail_irq; } -orinoco_pci_setup_netdev (dev, pdev,2 ); err =orinoco_plx_hw_init (card);if (err) {
@@ -266,6 +265,8 @@ static int orinoco_plx_init_one(struct p }pci_set_drvdata (pdev, dev); +printk (KERN_DEBUG "%s: " DRIVER_NAME " at %s\n" , dev->name, +pci_name (pdev));return 0 ;
@@ -301,7 +302,7 @@ static void __devexit orinoco_plx_removestruct orinoco_pci_card *card = priv->card;unregister_netdev (dev); -free_irq (dev->irq, dev); +free_irq (pdev->irq, dev);pci_set_drvdata (pdev,NULL );free_orinocodev (dev);pci_iounmap (pdev, priv->hw.iobase);
drivers/net/wireless/orinoco_tmd.c +3 -2
@@ -147,7 +147,6 @@ static int orinoco_tmd_init_one(struct p err = -EBUSY ; goto fail_irq; } -orinoco_pci_setup_netdev (dev, pdev,2 ); err =orinoco_tmd_cor_reset (priv);if (err) {
@@ -162,6 +161,8 @@ static int orinoco_tmd_init_one(struct p }pci_set_drvdata (pdev, dev); +printk (KERN_DEBUG "%s: " DRIVER_NAME " at %s\n" , dev->name, +pci_name (pdev));return 0 ;
@@ -194,7 +195,7 @@ static void __devexit orinoco_tmd_removestruct orinoco_pci_card *card = priv->card;unregister_netdev (dev); -free_irq (dev->irq, dev); +free_irq (pdev->irq, dev);pci_set_drvdata (pdev,NULL );free_orinocodev (dev);pci_iounmap (pdev, priv->hw.iobase);