Re: [PATCH] ne.c fix for hibernate and rmmod oops fix
From: Paul Gortmaker <hidden>
Date: 2008-09-05 08:01:33
Also in:
lkml
On Wed, Sep 3, 2008 at 11:02 PM, David Fries [off-list ref] wrote:
Andrew Morton, This patch is ready to be merged.
Hi David, I think there are some things that should be done here still. Generally speaking, this is an old driver for hardware that most of us will never see again, so the concern is that any changes may break some existing configurations we can't easily test. In light of that, the change footprint should be minimized and/or be bisectable wherever possible. For example, if I'm reading it correctly, you've changed the module behaviour so that on module load an autoprobe takes place, where that was not the case before, because the probe is invasive. It looks like you've got several semi-independent fixes here, plus some shuffling of code blocks and a couple of needless white space changes which all add up to a pretty big patch to an old legacy driver. I think it would be good if this was broken down a bit and had a reduced footprint. It would also be good to know if you have tested both module and non-module (build and/or boot). Additional comments inline. Thanks, Paul.
This ne2000 and the previous cr4 problem found when enabling suspend to disk on my i486 with a PnP ISA NE2000 and Creative SB Live in the trunk of my car. It is providing in car podcast entertainment. Must be a unique setup. -- David Fries [off-list ref] http://fries.net/~david/ (PGP encryption key available) From c2307cd616ccbe4b8eb1bb65e46aea11da7787a2 Mon Sep 17 00:00:00 2001 Message-Id: [off-list ref] From: David Fries <redacted> Date: Wed, 27 Aug 2008 22:49:16 -0500 Subject: [PATCH 1/1] [PATCH] ne.c fix for hibernate and rmmod oops fix Removing the module would cause a kernel oops as platform_driver_probe failed to detect a device and unregistered the platform driver on module init, and cleanup_module would unregister the already unregistered driver. The suspend and resume functions weren't being called and the network card didn't function across a suspend to disk followed by a power cycle.
The suspend/resume fix looks to be a candidate for a simple fix (i.e. separate patch) in its own right.
platform_driver support was added earlier, but without any platform_device_register* calls I don't think it was being used. Now all devices are registered using platform_device_register_simple and pointers are kept to unregister the ones that the probe failed for or unregister all devices on module shutdown. init_module no longer calls ne_init to reduce confusion (and multiple unregister paths that caused the rmmod oops). With the devices now registered they are added to the platform driver and get suspend and resume events. A call to pnp_stop_dev and pnp_start_dev now shutsdown and initializes plug and play devices. netif_device_detach(dev) was added before unregister_netdev(dev) when removing the region as occationally I would see a race condition where the device was still being used in unregister_netdev.
This too sounds like it could be an independent fix on its own. I'd say do those 1st and then the platform patch won't be as big.
quoted hunk ↗ jump to hunk
Signed-off-by: David Fries <redacted> Cc: Atsushi Nemoto <redacted> Cc: Paul Gortmaker <redacted> Cc: Alan Cox <redacted> Cc: Jeff Garzik <redacted> Cc: Andrew Morton <akpm@linux-foundation.org> --- drivers/net/ne.c | 277 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 172 insertions(+), 105 deletions(-)diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 42443d6..7980cf0 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c@@ -64,6 +64,27 @@ static const char version2[] = /* Do we support clones that don't adhere to 14,15 of the SAprom ? */ #define SUPPORT_NE_BAD_CLONES +/* 0xbad = bad sig or no reset ack */ +#define BAD 0xbad +#define BAD_STR "0xbad"
I think your change puts the above as the human readable name in /proc/ioports when you have a bad clone. As such it probably should be something like "ne2000(bad sig)" or similar, so it doesn't look like some resource management bug to an end user.
+
+#define MAX_NE_CARDS 4 /* Max number of NE cards per module */
+static struct platform_device *pdev_ne[MAX_NE_CARDS];
+
+static int io[MAX_NE_CARDS];
+static int irq[MAX_NE_CARDS];
+static int bad[MAX_NE_CARDS];
+
+#ifdef MODULE
+module_param_array(io, int, NULL, 0);
+module_param_array(irq, int, NULL, 0);
+module_param_array(bad, int, NULL, 0);
+MODULE_PARM_DESC(io, "I/O base address(es),required");
+MODULE_PARM_DESC(irq, "IRQ number(s)");
+MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures");
+MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver");
+MODULE_LICENSE("GPL");
+#endif /* MODULE */The relocation of all this makes it harder to read through the patch and see what the significant changes are. Is it necessary?
quoted hunk ↗ jump to hunk
/* Do we perform extra sanity checks on stuff ? */ /* #define NE_SANITY_CHECK */@@ -162,7 +183,6 @@ static void ne_block_input(struct net_device *dev, int count, static void ne_block_output(struct net_device *dev, const int count, const unsigned char *buf, const int start_page); - /* Probe for various non-shared-memory ethercards.
Gratuitous whitespace change.
quoted hunk ↗ jump to hunk
NEx000-clone boards have a Station Address PROM (SAPROM) in the packet@@ -192,8 +212,13 @@ static int __init do_ne_probe(struct net_device *dev) #endif /* First check any supplied i/o locations. User knows best. <cough> */ - if (base_addr > 0x1ff) /* Check a single specified location. */ - return ne_probe1(dev, base_addr); + if (base_addr > 0x1ff) { /* Check a single specified location. */ + int ret = ne_probe1(dev, base_addr); + if (ret) + printk(KERN_WARNING "ne.c: No NE*000 card found at " + "i/o = %#lx\n", base_addr); + return ret; + } else if (base_addr != 0) /* Don't probe at all. */ return -ENXIO;@@ -214,28 +239,6 @@ static int __init do_ne_probe(struct net_device *dev) return -ENODEV; } -#ifndef MODULE -struct net_device * __init ne_probe(int unit) -{ - struct net_device *dev = alloc_eip_netdev(); - int err; - - if (!dev) - return ERR_PTR(-ENOMEM); - - sprintf(dev->name, "eth%d", unit); - netdev_boot_setup_check(dev); - - err = do_ne_probe(dev); - if (err) - goto out; - return dev; -out: - free_netdev(dev); - return ERR_PTR(err); -} -#endif - static int __init ne_probe_isapnp(struct net_device *dev) { int i;@@ -329,7 +332,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) with an otherwise unused dev->mem_end value of "0xBAD" will cause the driver to skip these parts of the probe. */ - bad_card = ((dev->base_addr != 0) && (dev->mem_end == 0xbad)); + bad_card = ((dev->base_addr != 0) && (dev->mem_end == BAD)); /* Reset card. Who knows what dain-bramaged state it was left in. */@@ -472,7 +475,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) outb_p(0x00, ioaddr + EN0_RCNTLO); outb_p(0x00, ioaddr + EN0_RCNTHI); outb_p(E8390_RREAD+E8390_START, ioaddr); /* Trigger it... */ - mdelay(10); /* wait 10ms for interrupt to propagate */ + mdelay(10); /* wait 10ms for interrupt to propagate */
Gratuitous whitespace change.
quoted hunk ↗ jump to hunk
outb_p(0x00, ioaddr + EN0_IMR); /* Mask it again. */ dev->irq = probe_irq_off(cookie); if (ei_debug > 2)@@ -807,18 +810,20 @@ static int __init ne_drv_probe(struct platform_device *pdev) { struct net_device *dev; struct resource *res; - int err, irq; + int err, r_irq; res = platform_get_resource(pdev, IORESOURCE_IO, 0); - irq = platform_get_irq(pdev, 0); - if (!res || irq < 0) + r_irq = platform_get_irq(pdev, 0); + if (!res || r_irq < 0) return -ENODEV; dev = alloc_eip_netdev(); if (!dev) return -ENOMEM; - dev->irq = irq; + dev->irq = r_irq; dev->base_addr = res->start; + if (!strcmp(res->name, BAD_STR)) + dev->mem_end = BAD; err = do_ne_probe(dev); if (err) { free_netdev(dev);@@ -828,24 +833,56 @@ static int __init ne_drv_probe(struct platform_device *pdev) return 0; } -static int __exit ne_drv_remove(struct platform_device *pdev) +static int ne_drv_remove(struct platform_device *pdev)
I guess the above is because of your addition of ne_loop_rm? If someone is unfortunate enough to be using an ISA ne2000, then they might care about saving on driver size while built-in...
quoted hunk ↗ jump to hunk
{ struct net_device *dev = platform_get_drvdata(pdev); - unregister_netdev(dev); - free_irq(dev->irq, dev); - release_region(dev->base_addr, NE_IO_EXTENT); - free_netdev(dev); + if (dev) { + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; + netif_device_detach(dev); + unregister_netdev(dev); + if (idev) + pnp_device_detach(idev); + /* Careful ne_drv_remove can be called twice, once from + * the platform_driver.remove and again when the + * platform_device is being removed. + */ + ei_status.priv = 0; + free_irq(dev->irq, dev); + release_region(dev->base_addr, NE_IO_EXTENT); + free_netdev(dev); + platform_set_drvdata(pdev, NULL); + } return 0; } +/* Remove unused devices or all if true. */ +static void ne_loop_rm_unreg(int all) +{ + int this_dev; + struct platform_device *pdev; + for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { + pdev = pdev_ne[this_dev]; + /* No network device == unused */ + if (pdev && (!platform_get_drvdata(pdev) || all)) { + ne_drv_remove(pdev); + platform_device_unregister(pdev); + pdev_ne[this_dev] = NULL; + } + } +} + #ifdef CONFIG_PM static int ne_drv_suspend(struct platform_device *pdev, pm_message_t state) { struct net_device *dev = platform_get_drvdata(pdev); - if (netif_running(dev)) + if (netif_running(dev)) { + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; netif_device_detach(dev); + if (idev) + pnp_stop_dev(idev); + } return 0; }@@ -854,6 +891,9 @@ static int ne_drv_resume(struct platform_device *pdev) struct net_device *dev = platform_get_drvdata(pdev); if (netif_running(dev)) { + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; + if (idev) + pnp_start_dev(idev); ne_reset_8390(dev); NS8390p_init(dev, 1); netif_device_attach(dev);
The two chunks above look to be what could be bundled together as a separate, stand-alone fix.
quoted hunk ↗ jump to hunk
@@ -866,7 +906,7 @@ static int ne_drv_resume(struct platform_device *pdev) #endif static struct platform_driver ne_driver = { - .remove = __exit_p(ne_drv_remove), + .remove = ne_drv_remove, .suspend = ne_drv_suspend, .resume = ne_drv_resume, .driver = {@@ -875,91 +915,118 @@ static struct platform_driver ne_driver = { }, }; -static int __init ne_init(void) -{ - return platform_driver_probe(&ne_driver, ne_drv_probe); -} - -static void __exit ne_exit(void) -{ - platform_driver_unregister(&ne_driver); -} - -#ifdef MODULE -#define MAX_NE_CARDS 4 /* Max number of NE cards per module */ -static struct net_device *dev_ne[MAX_NE_CARDS]; -static int io[MAX_NE_CARDS]; -static int irq[MAX_NE_CARDS]; -static int bad[MAX_NE_CARDS]; /* 0xbad = bad sig or no reset ack */ - -module_param_array(io, int, NULL, 0); -module_param_array(irq, int, NULL, 0); -module_param_array(bad, int, NULL, 0); -MODULE_PARM_DESC(io, "I/O base address(es),required"); -MODULE_PARM_DESC(irq, "IRQ number(s)"); -MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures"); -MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver"); -MODULE_LICENSE("GPL"); - /* This is set up so that no ISA autoprobe takes place. We can't guarantee that the ne2k probe is the last 8390 based probe to take place (as it is at boot) and so the probe will get confused by any other 8390 cards. ISA device autoprobes on a running machine are not recommended anyway. */ -int __init init_module(void) +/* Register platform devices for each non-zero io[] (and one 0 io for probe + * or pnp probing), then probe to see if we found any. + */ +static void __init ne_add_devices(void) { - int this_dev, found = 0; - int plat_found = !ne_init(); + int this_dev; + int probed_zero = 0; + struct platform_device *pdev; for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { - struct net_device *dev = alloc_eip_netdev(); - if (!dev) - break; - dev->irq = irq[this_dev]; - dev->mem_end = bad[this_dev]; - dev->base_addr = io[this_dev]; - if (do_ne_probe(dev) == 0) { - dev_ne[found++] = dev; - continue; + struct resource r[2] = { + { + .start = io[this_dev], + .end = io[this_dev]+NE_IO_EXTENT-1, + .flags = IORESOURCE_IO}, + { + .start = irq[this_dev], + .flags = IORESOURCE_IRQ} }; + /* probe zero once */ + if (io[this_dev] == 0) { + if (probed_zero) + continue; + probed_zero = 1; }
This is where I think you now have the module doing an autoprobe that wasn''t being done before.
- free_netdev(dev);
- if (found || plat_found)
- break;
- if (io[this_dev] != 0)
- printk(KERN_WARNING "ne.c: No NE*000 card found at i/o = %#x\n", io[this_dev]);
- else
- printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\" value(s) for ISA cards.\n");
- return -ENXIO;
+ if (pdev_ne[this_dev])
+ continue;
+ if (bad[this_dev] == BAD)
+ r[0].name = BAD_STR;
+ pdev = platform_device_register_simple(
+ DRV_NAME, this_dev, r, ARRAY_SIZE(r));
+ if (IS_ERR(pdev))
+ continue;
+ pdev_ne[this_dev] = pdev;
}
- if (found || plat_found)
- return 0;
- return -ENODEV;
}
-static void cleanup_card(struct net_device *dev)
+#ifdef MODULE
+int __init init_module()
{
- struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
- if (idev)
- pnp_device_detach(idev);
- free_irq(dev->irq, dev);
- release_region(dev->base_addr, NE_IO_EXTENT);
+ int retval;
+ ne_add_devices();
+ retval = platform_driver_probe(&ne_driver, ne_drv_probe);
+ if (retval) {
+ if (io[0] == 0)
+ printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\""
+ " value(s) for ISA cards.\n");
+ ne_loop_rm_unreg(1);
+ return retval;
+ }
+
+ /* Unregister unused platform_devices. */
+ ne_loop_rm_unreg(0);
+ return retval;
+}
+#else /* MODULE */
+static int __init ne_init(void)
+{
+ int retval = platform_driver_probe(&ne_driver, ne_drv_probe);
+
+ /* Unregister unused platform_devices. */
+ ne_loop_rm_unreg(0);
+ return retval;
}
+module_init(ne_init);
-void __exit cleanup_module(void)
+struct net_device * __init ne_probe(int unit)
{
int this_dev;
+ struct net_device *dev;
+ struct platform_device *pdev;
- ne_exit();
- for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
- struct net_device *dev = dev_ne[this_dev];
- if (dev) {
- unregister_netdev(dev);
- cleanup_card(dev);
- free_netdev(dev);
- }
+ /* Find an empty slot. */
+ this_dev = 0;
+ while (pdev_ne[this_dev] || io[this_dev]) {
+ if (++this_dev == MAX_NE_CARDS)
+ return ERR_PTR(-ENOMEM);
}
+
+ /* Get irq, io from kernel command line */
+ dev = alloc_eip_netdev();
+ if (!dev)
+ return ERR_PTR(-ENOMEM);
+
+ sprintf(dev->name, "eth%d", unit);
+ netdev_boot_setup_check(dev);
+
+ io[this_dev] = dev->base_addr;
+ irq[this_dev] = dev->irq;
+ bad[this_dev] = dev->mem_end;
+
+ free_netdev(dev);
+
+ ne_add_devices();
+
+ /* return the first device found */
+ for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++)
+ if ((pdev = pdev_ne[this_dev]) &&
+ (dev = platform_get_drvdata(pdev)))
+ return dev;
+
+ return ERR_PTR(-ENODEV);
}
-#else /* MODULE */
-module_init(ne_init);
-module_exit(ne_exit);
#endif /* MODULE */
+
+static void __exit ne_exit(void)
+{
+ platform_driver_unregister(&ne_driver);
+ ne_loop_rm_unreg(1);
+}
+module_exit(ne_exit);
--
1.4.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/