Re: Fw: Re: 2.6.10-rc1-mm1

[Bjorn Helgaas <bjorn.helgaas@hp.com>]

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

> > name=hpet node=c03ee9a0 acpi_bus_drivers.prev=c03ea6a0
> > name=i8042 node=c03eeda0 acpi_bus_drivers.prev=c03ee9a0
> > name=floppy node=c03f24c0 acpi_bus_drivers.prev=c03ee9a0
> > 
> > Note acpi_bus_drivers.prev for floppy was not set to c03eeda0, which you 
> > would normally expect?

The i8042 driver unregisters if it doesn't fine hardware, so the
above looks OK to me.  You might add similar debug to the
acpi_bus_unregister_driver() path just to be sure.

The problem is definitely something to do with the acpi driver
list maintenance, so I'm interested in all your debug output.

I did find a couple places that unregister the driver even when
acpi_bus_register_driver() fails, which could cause this.  But I
really doubt that this is the problem, because the only error
returns there are for "acpi_disabled" and "!driver".  Patch is
attached anyway if you want to try it.

> ah.  the acpi floppy scanning code seems to be misinterpreting the
> acpi_bus_register_driver() return value, so if it returns zero we think
> that the driver was registered, only it wasn't.  floppy_init() then
> proceeds to unregister a not-registered driver.  I think.  Does this help?

I don't think so.  acpi_bus_register_driver() returns <0 for error
(driver not registered), or >=0 if it was registered.  The count is
the number of devices found.  So I think the floppy code is OK.

> Bjorn, do I remember hearing that we can drop all that code anyway?  That
> it'll be done in another way?

There's talk about making PNP smart enough to use info from ACPI.
But that doesn't seem to be cooked yet, and floppy doesn't use PNP
yet in any case.

[-- Attachment #2: diffs --]
[-- Type: text/x-diff, Size: 971 bytes --]

--- 2.6.10-rc1-mm1/drivers/acpi/asus_acpi.c.orig	2004-10-27 12:41:07.642080571 -0600
+++ 2.6.10-rc1-mm1/drivers/acpi/asus_acpi.c	2004-10-27 12:41:48.714345693 -0600
@@ -1213,7 +1213,8 @@
 
 	result = acpi_bus_register_driver(&asus_hotk_driver);
 	if (result < 1) {
-		acpi_bus_unregister_driver(&asus_hotk_driver);
+		if (result >= 0)
+			acpi_bus_unregister_driver(&asus_hotk_driver);
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
 		return -ENODEV;
 	}
--- 2.6.10-rc1-mm1/drivers/acpi/thinkpad_acpi.c.orig	2004-10-27 12:42:14.422353190 -0600
+++ 2.6.10-rc1-mm1/drivers/acpi/thinkpad_acpi.c	2004-10-27 12:43:40.715320883 -0600
@@ -247,8 +247,11 @@
 		return -ENODEV;
 
 	result = acpi_bus_register_driver(&acpi_thinkpad_driver);
-	if (result != 1)
+	if (result != 1) {
+		if (result >= 0)
+			acpi_bus_unregister_driver(&acpi_thinkpad_driver);
 		return -ENODEV;
+	}
 
 	printk(KERN_INFO LOGPREFIX "ACPI IBM Thinkpad Fn+Fx key driver version %s\n", DRIVER_VERSION);