ACPI toshiba: only register rfkill if bt is enabled

PATCH In review Frederik Deweerdt 7 participants 11 messages Oct 29, 2008 – Dec 1, 2008 ACPI

lore

Share & tools

lore

Frederik Deweerdt

author

2008-10-29 08:19 UTC #0 lore raw

PATCH 1/1 ACPI toshiba: only register rfkill if bt is enabled

[resending as it didn't make it to the list, removing netdev from cc also]
Hello Andrey,

It looks like a part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Does it solve the problem for you?

Regards,
Frederik

Part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Some minor cleanups (> 80 char lines) were also added in the process.

On Tue, Oct 28, 2008 at 10:10:37PM +0300, Andrey Borzenkov wrote:
[...]

Quoted 3 lines

[   66.633036] toshiba_acpi: Toshiba Laptop ACPI Extras version 0.19
[   66.633054] toshiba_acpi:     HCI method: \_SB_.VALD.GHCI
[   66.637764] input: Toshiba RFKill Switch as /devices/virtual/input/input3

[...]

Quoted 26 lines

[  113.920753] ------------[ cut here ]------------
[  113.920828] kernel BUG at /home/bor/src/linux-git/net/rfkill/rfkill.c:347!
[  113.920845] invalid opcode: 0000 [#1] 
[  113.920877] last sysfs file: /sys/devices/pci0000:00/0000:00:04.0/host0/target0:0:0/0:0:0:0/block/sda/size
[  113.920900] Dumping ftrace buffer:
[  113.920919]    (ftrace buffer empty)
[  113.920933] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc loop dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod alim15x3 ide_core nvram toshiba cryptomgr aead crypto_blkcipher michael_mic crypto_algapi orinoco_cs orinoco hermes_dld hermes pcmcia firmware_class snd_ali5451 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device smsc_ircc2 snd_pcm_oss snd_pcm rtc_cmos irda snd_timer snd_mixer_oss rtc_core snd crc_ccitt yenta_socket rtc_lib rsrc_nonstatic i2c_ali1535 pcmcia_core pcspkr psmouse soundcore i2c_core evdev sr_mod snd_page_alloc alim1535_wdt cdrom fan sg video output toshiba_acpi rfkill thermal backlight ali_agp processor ac button input_polldev battery agpgart ohci_hcd usbcore reiserfs pata_ali libata sd_mod scsi_mod [last unloaded: scsi_wait_scan]
[  113.921765] 
[  113.921785] Pid: 3272, comm: ipolldevd Not tainted (2.6.28-rc2-1avb #3) PORTEGE 4000
[  113.921801] EIP: 0060:[<dfaa4683>] EFLAGS: 00010246 CPU: 0
[  113.921854] EIP is at rfkill_force_state+0x53/0x90 [rfkill]
[  113.921870] EAX: 00000000 EBX: 00000000 ECX: 00000003 EDX: 00000000
[  113.921885] ESI: 00000000 EDI: ddd50300 EBP: d8d7af40 ESP: d8d7af24
[  113.921900]  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
[  113.921918] Process ipolldevd (pid: 3272, ti=d8d7a000 task=d8d93c90 task.ti=d8d7a000)
[  113.921933] Stack:
[  113.921945]  d8d7af38 00000246 dfb029d8 dfb029c0 dfb029d8 dfb029c0 ddd50300 d8d7af5c
[  113.922014]  dfb018e2 01000246 01000000 ddd50300 ddd50314 ddabb8a0 d8d7af68 dfb381c1
[  113.922098]  00000000 d8d7afa4 c012ec0a 00000000 00000002 00000000 c012eba8 ddabb8c0
[  113.922240] Call Trace:
[  113.922240]  [<dfb018e2>] ? bt_poll_rfkill+0x5c/0x82 [toshiba_acpi]
[  113.922240]  [<dfb381c1>] ? input_polled_device_work+0x11/0x40 [input_polldev]
[  113.922240]  [<c012ec0a>] ? run_workqueue+0xea/0x1f0
[  113.922240]  [<c012eba8>] ? run_workqueue+0x88/0x1f0
[  113.922240]  [<dfb381b0>] ? input_polled_device_work+0x0/0x40 [input_polldev]
[  113.922240]  [<c012f047>] ? worker_thread+0x87/0xf0

Quoted 8 lines

[  113.922240]  [<c0132b00>] ? autoremove_wake_function+0x0/0x50
[  113.922240]  [<c012efc0>] ? worker_thread+0x0/0xf0
[  113.922240]  [<c013280f>] ? kthread+0x3f/0x80
[  113.922240]  [<c01327d0>] ? kthread+0x0/0x80
[  113.922240]  [<c01040d7>] ? kernel_thread_helper+0x7/0x10
[  113.922240] Code: 43 54 89 73 54 39 c6 74 11 89 d9 ba 01 00 00 00 b8 40 68 aa df e8 3e 35 69 e0 89 f8 e8 77 fd 85 e0 31 c0 83 c4 10 5b 5e 5f 5d c3 <0f> 0b eb fe 89 f6 8d bc 27 00 00 00 00 be f4 4d aa df bb 5f 01 
[  113.922240] EIP: [<dfaa4683>] rfkill_force_state+0x53/0x90 [rfkill] SS:ESP 0068:d8d7af24
[  113.924700] ---[ end trace 0e404eb40cadd5f0 ]---

Signed-off-by Frederik Deweerdt <[email protected]>

drivers/acpi/toshiba_acpi.c +31 ~~-27~~

index 66aac06..c1c9d87 100644
@@ -824,34 +824,38 @@ static int __init toshiba_acpi_init(void)
 			toshiba_acpi_exit();
 			return -ENOMEM;
 		}
-	}
 
-	/* Register input device for kill switch */
-	toshiba_acpi.poll_dev = input_allocate_polled_device();
-	if (!toshiba_acpi.poll_dev) {
-		printk(MY_ERR "unable to allocate kill-switch input device\n");
-		toshiba_acpi_exit();
-		return -ENOMEM;
-	}
-	toshiba_acpi.poll_dev->private = &toshiba_acpi;
-	toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
-	toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
-
-	toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
-	toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
-	toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */
-	set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
-	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
-	input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
-	input_sync(toshiba_acpi.poll_dev->input);
-
-	ret = input_register_polled_device(toshiba_acpi.poll_dev);
-	if (ret) {
-		printk(MY_ERR "unable to register kill-switch input device\n");
-		rfkill_free(toshiba_acpi.rfk_dev);
-		toshiba_acpi.rfk_dev = NULL;
-		toshiba_acpi_exit();
-		return ret;
+		/* Register input device for kill switch */
+		toshiba_acpi.poll_dev = input_allocate_polled_device();
+		if (!toshiba_acpi.poll_dev) {
+			printk(MY_ERR
+			       "unable to allocate kill-switch input device\n");
+			toshiba_acpi_exit();
+			return -ENOMEM;
+		}
+		toshiba_acpi.poll_dev->private = &toshiba_acpi;
+		toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
+		toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
+
+		toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
+		toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
+		/* Toshiba USB ID */
+		toshiba_acpi.poll_dev->input->id.vendor = 0x0930;
+		set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
+		set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
+		input_report_switch(toshiba_acpi.poll_dev->input,
+				    SW_RFKILL_ALL, TRUE);
+		input_sync(toshiba_acpi.poll_dev->input);
+
+		ret = input_register_polled_device(toshiba_acpi.poll_dev);
+		if (ret) {
+			printk(MY_ERR
+			       "unable to register kill-switch input device\n");
+			rfkill_free(toshiba_acpi.rfk_dev);
+			toshiba_acpi.rfk_dev = NULL;
+			toshiba_acpi_exit();
+			return ret;
+		}
 	}
 
 	return 0;

----- End forwarded message -----

Frans Pop

2008-10-29 13:11 UTC #1 lore raw

Quoted 8 lines · Frederik Deweerdt

It looks like a part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Does it solve the problem for you?
Regards,
Frederik

Quoted 6 lines

Register toshiba RFKill Switch only if bluetooth is enabled
Part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Some minor cleanups (> 80 char lines) were also added in the process.

I just saw the same issue on my Toshiba Satellite A40 with Atheros pcmcia card. The patch solves the kernel BUG for me when applied on top of current git.

Cheers,
FJP

Philip Langdale

Acked-by on v1 1/1

2008-10-29 15:30 UTC #2 lore raw

In reply to Frederik Deweerdt

Acked-by Philip Langdale <[email protected]>

--phil

Andrey Borzenkov

Tested-by

2008-10-29 17:05 UTC #3 lore raw

Quoted 2 lines · Philip Langdale

Acked-by Philip Langdale <[email protected]>

Tested-by Andrey Borzenkov <[email protected]>

Andrey Borzenkov

2008-11-16 08:29 UTC #4 lore raw

In reply to Frederik Deweerdt

Quoted 9 lines · Frederik Deweerdt

[resending as it didn't make it to the list, removing netdev from cc also]
Hello Andrey,
It looks like a part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Does it solve the problem for you?

This patch fixes regression in 2.6.28. Patch has been tested and acnowledged. Rafael, could you add it to list of open regressions? Thank you!

Quoted 127 lines

Regards,
Frederik

On Tue, Oct 28, 2008 at 10:10:37PM +0300, Andrey Borzenkov wrote:
[...]

Quoted 3 lines

[   66.633036] toshiba_acpi: Toshiba Laptop ACPI Extras version 0.19
[   66.633054] toshiba_acpi:     HCI method: \_SB_.VALD.GHCI
[   66.637764] input: Toshiba RFKill Switch as /devices/virtual/input/input3

[...]

Quoted 26 lines

[  113.920753] ------------[ cut here ]------------
[  113.920828] kernel BUG at /home/bor/src/linux-git/net/rfkill/rfkill.c:347!
[  113.920845] invalid opcode: 0000 [#1] 
[  113.920877] last sysfs file: /sys/devices/pci0000:00/0000:00:04.0/host0/target0:0:0/0:0:0:0/block/sda/size
[  113.920900] Dumping ftrace buffer:
[  113.920919]    (ftrace buffer empty)
[  113.920933] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc loop dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod alim15x3 ide_core nvram toshiba cryptomgr aead crypto_blkcipher michael_mic crypto_algapi orinoco_cs orinoco hermes_dld hermes pcmcia firmware_class snd_ali5451 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device smsc_ircc2 snd_pcm_oss snd_pcm rtc_cmos irda snd_timer snd_mixer_oss rtc_core snd crc_ccitt yenta_socket rtc_lib rsrc_nonstatic i2c_ali1535 pcmcia_core pcspkr psmouse soundcore i2c_core evdev sr_mod snd_page_alloc alim1535_wdt cdrom fan sg video output toshiba_acpi rfkill thermal backlight ali_agp processor ac button input_polldev battery agpgart ohci_hcd usbcore reiserfs pata_ali libata sd_mod scsi_mod [last unloaded: scsi_wait_scan]
[  113.921765] 
[  113.921785] Pid: 3272, comm: ipolldevd Not tainted (2.6.28-rc2-1avb #3) PORTEGE 4000
[  113.921801] EIP: 0060:[<dfaa4683>] EFLAGS: 00010246 CPU: 0
[  113.921854] EIP is at rfkill_force_state+0x53/0x90 [rfkill]
[  113.921870] EAX: 00000000 EBX: 00000000 ECX: 00000003 EDX: 00000000
[  113.921885] ESI: 00000000 EDI: ddd50300 EBP: d8d7af40 ESP: d8d7af24
[  113.921900]  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
[  113.921918] Process ipolldevd (pid: 3272, ti=d8d7a000 task=d8d93c90 task.ti=d8d7a000)
[  113.921933] Stack:
[  113.921945]  d8d7af38 00000246 dfb029d8 dfb029c0 dfb029d8 dfb029c0 ddd50300 d8d7af5c
[  113.922014]  dfb018e2 01000246 01000000 ddd50300 ddd50314 ddabb8a0 d8d7af68 dfb381c1
[  113.922098]  00000000 d8d7afa4 c012ec0a 00000000 00000002 00000000 c012eba8 ddabb8c0
[  113.922240] Call Trace:
[  113.922240]  [<dfb018e2>] ? bt_poll_rfkill+0x5c/0x82 [toshiba_acpi]
[  113.922240]  [<dfb381c1>] ? input_polled_device_work+0x11/0x40 [input_polldev]
[  113.922240]  [<c012ec0a>] ? run_workqueue+0xea/0x1f0
[  113.922240]  [<c012eba8>] ? run_workqueue+0x88/0x1f0
[  113.922240]  [<dfb381b0>] ? input_polled_device_work+0x0/0x40 [input_polldev]
[  113.922240]  [<c012f047>] ? worker_thread+0x87/0xf0

Quoted 8 lines

[  113.922240]  [<c0132b00>] ? autoremove_wake_function+0x0/0x50
[  113.922240]  [<c012efc0>] ? worker_thread+0x0/0xf0
[  113.922240]  [<c013280f>] ? kthread+0x3f/0x80
[  113.922240]  [<c01327d0>] ? kthread+0x0/0x80
[  113.922240]  [<c01040d7>] ? kernel_thread_helper+0x7/0x10
[  113.922240] Code: 43 54 89 73 54 39 c6 74 11 89 d9 ba 01 00 00 00 b8 40 68 aa df e8 3e 35 69 e0 89 f8 e8 77 fd 85 e0 31 c0 83 c4 10 5b 5e 5f 5d c3 <0f> 0b eb fe 89 f6 8d bc 27 00 00 00 00 be f4 4d aa df bb 5f 01 
[  113.922240] EIP: [<dfaa4683>] rfkill_force_state+0x53/0x90 [rfkill] SS:ESP 0068:d8d7af24
[  113.924700] ---[ end trace 0e404eb40cadd5f0 ]---

Signed-off-by Frederik Deweerdt <[email protected]>

drivers/acpi/toshiba_acpi.c +31 ~~-28~~

index 66aac06..c1c9d87 100644
@@ -824,34 +824,38 @@ static int __init toshiba_acpi_init(void)
 			toshiba_acpi_exit();
 			return -ENOMEM;
 		}
-	}
 
-	/* Register input device for kill switch */
-	toshiba_acpi.poll_dev = input_allocate_polled_device();
-	if (!toshiba_acpi.poll_dev) {
-		printk(MY_ERR "unable to allocate kill-switch input device\n");
-		toshiba_acpi_exit();
-		return -ENOMEM;
-	}
-	toshiba_acpi.poll_dev->private = &toshiba_acpi;
-	toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
-	toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
-
-	toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
-	toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
-	toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */
-	set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
-	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
-	input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
-	input_sync(toshiba_acpi.poll_dev->input);
-
-	ret = input_register_polled_device(toshiba_acpi.poll_dev);
-	if (ret) {
-		printk(MY_ERR "unable to register kill-switch input device\n");
-		rfkill_free(toshiba_acpi.rfk_dev);
-		toshiba_acpi.rfk_dev = NULL;
-		toshiba_acpi_exit();
-		return ret;
+		/* Register input device for kill switch */
+		toshiba_acpi.poll_dev = input_allocate_polled_device();
+		if (!toshiba_acpi.poll_dev) {
+			printk(MY_ERR
+			       "unable to allocate kill-switch input device\n");
+			toshiba_acpi_exit();
+			return -ENOMEM;
+		}
+		toshiba_acpi.poll_dev->private = &toshiba_acpi;
+		toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
+		toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
+
+		toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
+		toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
+		/* Toshiba USB ID */
+		toshiba_acpi.poll_dev->input->id.vendor = 0x0930;
+		set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
+		set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
+		input_report_switch(toshiba_acpi.poll_dev->input,
+				    SW_RFKILL_ALL, TRUE);
+		input_sync(toshiba_acpi.poll_dev->input);
+
+		ret = input_register_polled_device(toshiba_acpi.poll_dev);
+		if (ret) {
+			printk(MY_ERR
+			       "unable to register kill-switch input device\n");
+			rfkill_free(toshiba_acpi.rfk_dev);
+			toshiba_acpi.rfk_dev = NULL;
+			toshiba_acpi_exit();
+			return ret;
+		}
 	}
 
 	return 0;
 
----- End forwarded message -----

Rafael J. Wysocki

2008-11-16 12:35 UTC #5 lore raw

Quoted 11 lines · Andrey Borzenkov

Quoted 9 lines · Frederik Deweerdt
[resending as it didn't make it to the list, removing netdev from cc also]
Hello Andrey,
It looks like a part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Does it solve the problem for you?

Quoted 3 lines

This patch fixes regression in 2.6.28. Patch has been tested and acnowledged. Rafael, could you add it to list of open regressions? Thank you!

I will, if you provide me with a link to the patch and (optionally) to the original bug report.

Thanks,
Rafael

Quoted 12 lines

Quoted 12 lines
Register toshiba RFKill Switch only if bluetooth is enabled
Part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Some minor cleanups (> 80 char lines) were also added in the process.
On Tue, Oct 28, 2008 at 10:10:37PM +0300, Andrey Borzenkov wrote:
[...]
Quoted 3 lines
[   66.633036] toshiba_acpi: Toshiba Laptop ACPI Extras version 0.19
[   66.633054] toshiba_acpi:     HCI method: \_SB_.VALD.GHCI
[   66.637764] input: Toshiba RFKill Switch as /devices/virtual/input/input3

Quoted 8 lines

[...]

Quoted 7 lines

[  113.920753] ------------[ cut here ]------------
[  113.920828] kernel BUG at /home/bor/src/linux-git/net/rfkill/rfkill.c:347!
[  113.920845] invalid opcode: 0000 [#1] 
[  113.920877] last sysfs file: /sys/devices/pci0000:00/0000:00:04.0/host0/target0:0:0/0:0:0:0/block/sda/size
[  113.920900] Dumping ftrace buffer:
[  113.920919]    (ftrace buffer empty)
[  113.920933] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc loop dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod alim15x3 ide_core nvram toshiba cryptomgr aead crypto_blkcipher michael_mic crypto_algapi orinoco_cs orinoco hermes_dld hermes pcmcia firmware_class snd_ali5451 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device smsc_ircc2 snd_pcm_oss snd_pcm rtc_cmos irda snd_timer snd_mixer_oss rtc_core snd crc_ccitt yenta_socket rtc_lib rsrc_nonstatic i2c_ali1535 pcmcia_core pcspkr psmouse soundcore i2c_core evdev sr_mod snd_page_alloc alim1535_wdt cdrom fan sg video output toshiba_acpi rfkill thermal backlight ali_agp processor ac button input_polldev battery agpgart ohci_hcd usbcore reiser

fs pata_ali libata sd_mod scsi_mod [last unloaded: scsi_wait_scan]

Quoted 107 lines

Quoted 104 lines

Quoted 19 lines

[  113.921765] 
[  113.921785] Pid: 3272, comm: ipolldevd Not tainted (2.6.28-rc2-1avb #3) PORTEGE 4000
[  113.921801] EIP: 0060:[<dfaa4683>] EFLAGS: 00010246 CPU: 0
[  113.921854] EIP is at rfkill_force_state+0x53/0x90 [rfkill]
[  113.921870] EAX: 00000000 EBX: 00000000 ECX: 00000003 EDX: 00000000
[  113.921885] ESI: 00000000 EDI: ddd50300 EBP: d8d7af40 ESP: d8d7af24
[  113.921900]  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
[  113.921918] Process ipolldevd (pid: 3272, ti=d8d7a000 task=d8d93c90 task.ti=d8d7a000)
[  113.921933] Stack:
[  113.921945]  d8d7af38 00000246 dfb029d8 dfb029c0 dfb029d8 dfb029c0 ddd50300 d8d7af5c
[  113.922014]  dfb018e2 01000246 01000000 ddd50300 ddd50314 ddabb8a0 d8d7af68 dfb381c1
[  113.922098]  00000000 d8d7afa4 c012ec0a 00000000 00000002 00000000 c012eba8 ddabb8c0
[  113.922240] Call Trace:
[  113.922240]  [<dfb018e2>] ? bt_poll_rfkill+0x5c/0x82 [toshiba_acpi]
[  113.922240]  [<dfb381c1>] ? input_polled_device_work+0x11/0x40 [input_polldev]
[  113.922240]  [<c012ec0a>] ? run_workqueue+0xea/0x1f0
[  113.922240]  [<c012eba8>] ? run_workqueue+0x88/0x1f0
[  113.922240]  [<dfb381b0>] ? input_polled_device_work+0x0/0x40 [input_polldev]
[  113.922240]  [<c012f047>] ? worker_thread+0x87/0xf0

Quoted 8 lines

[  113.922240]  [<c0132b00>] ? autoremove_wake_function+0x0/0x50
[  113.922240]  [<c012efc0>] ? worker_thread+0x0/0xf0
[  113.922240]  [<c013280f>] ? kthread+0x3f/0x80
[  113.922240]  [<c01327d0>] ? kthread+0x0/0x80
[  113.922240]  [<c01040d7>] ? kernel_thread_helper+0x7/0x10
[  113.922240] Code: 43 54 89 73 54 39 c6 74 11 89 d9 ba 01 00 00 00 b8 40 68 aa df e8 3e 35 69 e0 89 f8 e8 77 fd 85 e0 31 c0 83 c4 10 5b 5e 5f 5d c3 <0f> 0b eb fe 89 f6 8d bc 27 00 00 00 00 be f4 4d aa df bb 5f 01 
[  113.922240] EIP: [<dfaa4683>] rfkill_force_state+0x53/0x90 [rfkill] SS:ESP 0068:d8d7af24
[  113.924700] ---[ end trace 0e404eb40cadd5f0 ]---

Signed-off-by Frederik Deweerdt <[email protected]>

drivers/acpi/toshiba_acpi.c +31 ~~-28~~

index 66aac06..c1c9d87 100644
@@ -824,34 +824,38 @@ static int __init toshiba_acpi_init(void)
 			toshiba_acpi_exit();
 			return -ENOMEM;
 		}
-	}
 
-	/* Register input device for kill switch */
-	toshiba_acpi.poll_dev = input_allocate_polled_device();
-	if (!toshiba_acpi.poll_dev) {
-		printk(MY_ERR "unable to allocate kill-switch input device\n");
-		toshiba_acpi_exit();
-		return -ENOMEM;
-	}
-	toshiba_acpi.poll_dev->private = &toshiba_acpi;
-	toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
-	toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
-
-	toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
-	toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
-	toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */
-	set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
-	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
-	input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
-	input_sync(toshiba_acpi.poll_dev->input);
-
-	ret = input_register_polled_device(toshiba_acpi.poll_dev);
-	if (ret) {
-		printk(MY_ERR "unable to register kill-switch input device\n");
-		rfkill_free(toshiba_acpi.rfk_dev);
-		toshiba_acpi.rfk_dev = NULL;
-		toshiba_acpi_exit();
-		return ret;
+		/* Register input device for kill switch */
+		toshiba_acpi.poll_dev = input_allocate_polled_device();
+		if (!toshiba_acpi.poll_dev) {
+			printk(MY_ERR
+			       "unable to allocate kill-switch input device\n");
+			toshiba_acpi_exit();
+			return -ENOMEM;
+		}
+		toshiba_acpi.poll_dev->private = &toshiba_acpi;
+		toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
+		toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
+
+		toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
+		toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
+		/* Toshiba USB ID */
+		toshiba_acpi.poll_dev->input->id.vendor = 0x0930;
+		set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
+		set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
+		input_report_switch(toshiba_acpi.poll_dev->input,
+				    SW_RFKILL_ALL, TRUE);
+		input_sync(toshiba_acpi.poll_dev->input);
+
+		ret = input_register_polled_device(toshiba_acpi.poll_dev);
+		if (ret) {
+			printk(MY_ERR
+			       "unable to register kill-switch input device\n");
+			rfkill_free(toshiba_acpi.rfk_dev);
+			toshiba_acpi.rfk_dev = NULL;
+			toshiba_acpi_exit();
+			return ret;
+		}
 	}
 
 	return 0;
 
----- End forwarded message -----

Signature · 3 lines

Everyone knows that debugging is twice as hard as writing a program
in the first place.  So if you're as clever as you can be when you write it,
how will you ever debug it? --- Brian Kernighan

Andrey Borzenkov

2008-11-16 12:50 UTC #6 lore raw

Quoted 12 lines · Rafael J. Wysocki

Quoted 11 lines · Andrey Borzenkov
Quoted 9 lines · Frederik Deweerdt
[resending as it didn't make it to the list, removing netdev from cc also]
Hello Andrey,
It looks like a part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Does it solve the problem for you?

Quoted 7 lines

Quoted 3 lines
This patch fixes regression in 2.6.28. Patch has been tested and acnowledged. Rafael, could you add it to list of open regressions? Thank you!
I will, if you provide me with a link to the patch and (optionally) to the original bug report.

Original bug report:
http://marc.info/?l=linux-kernel&m=122522113619025&w=2

Patch:
http://marc.info/?l=linux-kernel&m=122526843117478&w=2

Thank you!

Rafael J. Wysocki

2008-11-16 16:39 UTC #7 lore raw

Quoted 21 lines · Andrey Borzenkov

Quoted 12 lines · Rafael J. Wysocki
Quoted 11 lines · Andrey Borzenkov
Quoted 9 lines · Frederik Deweerdt
[resending as it didn't make it to the list, removing netdev from cc also]
Hello Andrey,
It looks like a part of the rfkill initialization was done whenever BT was on or not. The following patch checks for BT presence before registering the rfkill to the input layer. Does it solve the problem for you?
Quoted 7 lines
Quoted 3 lines
This patch fixes regression in 2.6.28. Patch has been tested and acnowledged. Rafael, could you add it to list of open regressions? Thank you!
I will, if you provide me with a link to the patch and (optionally) to the original bug report.

Quoted 5 lines

Original bug report:
http://marc.info/?l=linux-kernel&m=122522113619025&w=2
Patch:
http://marc.info/?l=linux-kernel&m=122526843117478&w=2

Thanks, added to the list as http://bugzilla.kernel.org/show_bug.cgi?id=12047

Best,
Rafael

Andrew Morton

2008-12-01 19:31 UTC #8 lore raw

In reply to Frederik Deweerdt

This patch:

Quoted 1 line · On Wed, 29 Oct 2008 08:19:34 +0000 Frederik Deweerdt…

Register toshiba RFKill Switch only if bluetooth is enabled

which is here: http://userweb.kernel.org/~akpm/mmotm/broken-out/acpi-toshiba-only-register-rfkill-if-bt-is-enabled.patch

fixes a post-2.6.27 regression. It doesn't apply any more, due to the recent merge of this:

commit e251fa12fb5713e722029341c03b2f48bcd7b7be

Author: Arjan van de Ven <[email protected]>
Date:   Fri Nov 28 08:19:09 2008 -0800

toshiba_acpi: close race in toshiba_acpi driver

in linux-next.

It is unclear to me whether these two patches fix the same bug, or different ones.

Could you please take a look in linux-next and see what needs to be done?

Thanks.

Arjan van de Ven

2008-12-01 19:38 UTC #9 lore raw

Quoted 17 lines · On Mon, 1 Dec 2008 11:30:52 -0800 Andrew Morton <[email protected]>…

This patch:
Quoted 1 line · On Wed, 29 Oct 2008 08:19:34 +0000 Frederik Deweerdt…
Register toshiba RFKill Switch only if bluetooth is enabled
which is here:
http://userweb.kernel.org/~akpm/mmotm/broken-out/acpi-toshiba-only-register-rfkill-if-bt-is-enabled.patch
fixes a post-2.6.27 regression. It doesn't apply any more, due to the recent merge of this:
commit e251fa12fb5713e722029341c03b2f48bcd7b7be
Author: Arjan van de Ven <[email protected]>
Date:   Fri Nov 28 08:19:09 2008 -0800

Quoted 7 lines

toshiba_acpi: close race in toshiba_acpi driver
in linux-next.
It is unclear to me whether these two patches fix the same bug, or different ones.

they fix the same symptom, but are both needed.
My patch fixes "if it goes wrong and init fails, don't oops", the mmotm patch fixes "lets not make init fail for <this case>". If there's some other reason the init fails, my patch is still needed.

Signature · 3 lines

Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

Frederik Deweerdt

author Tested-by Andrey Borzenkov Acked-by Philip Langdale

2008-12-01 23:52 UTC #10 lore raw

Quoted 4 lines · Arjan van de Ven

they fix the same symptom, but are both needed.
My patch fixes "if it goes wrong and init fails, don't oops", the mmotm patch fixes "lets not make init fail for <this case>". If there's some other reason the init fails, my patch is still needed.

Confirmed, both are needed. You'll find a refreshed patch attached.

Regards,
Frederik

From: Frederik Deweerdt <[email protected]>

On Tue, Oct 28, 2008 at 10:10:37PM +0300, Andrey Borzenkov wrote:
[...]

Quoted 3 lines

[   66.633036] toshiba_acpi: Toshiba Laptop ACPI Extras version 0.19
[   66.633054] toshiba_acpi:     HCI method: \_SB_.VALD.GHCI
[   66.637764] input: Toshiba RFKill Switch as /devices/virtual/input/input3

[...]

Quoted 7 lines

[  113.920753] ------------[ cut here ]------------
[  113.920828] kernel BUG at /home/bor/src/linux-git/net/rfkill/rfkill.c:347!
[  113.920845] invalid opcode: 0000 [#1]
[  113.920877] last sysfs file: /sys/devices/pci0000:00/0000:00:04.0/host0/target0:0:0/0:0:0:0/block/sda/size
[  113.920900] Dumping ftrace buffer:
[  113.920919]    (ftrace buffer empty)
[  113.920933] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc loop dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod alim15x3 ide_core nvram toshiba cryptomgr aead crypto_blkcipher michael_mic crypto_algapi orinoco_cs orinoco hermes_dld hermes pcmcia firmware_class snd_ali5451 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device smsc_ircc2 snd_pcm_oss snd_pcm rtc_cmos irda snd_timer snd_mixer_oss rtc_core snd crc_ccitt yenta_socket rtc_lib rsrc_nonstatic i2c_ali1535 pcmcia_core pcspkr psmouse soundcore i2c_core evdev sr_mod snd_page_alloc alim1535_wdt cdrom fan sg video output toshiba_acpi rfkill thermal backlight ali_agp processor ac button input_polldev battery agpgart ohci_hcd usbcore reiserfs p

ata_ali libata sd_mod scsi_mod [last unloaded: scsi_wait_scan]

Quoted 19 lines

[  113.921765]
[  113.921785] Pid: 3272, comm: ipolldevd Not tainted (2.6.28-rc2-1avb #3) PORTEGE 4000
[  113.921801] EIP: 0060:[<dfaa4683>] EFLAGS: 00010246 CPU: 0
[  113.921854] EIP is at rfkill_force_state+0x53/0x90 [rfkill]
[  113.921870] EAX: 00000000 EBX: 00000000 ECX: 00000003 EDX: 00000000
[  113.921885] ESI: 00000000 EDI: ddd50300 EBP: d8d7af40 ESP: d8d7af24
[  113.921900]  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
[  113.921918] Process ipolldevd (pid: 3272, ti=d8d7a000 task=d8d93c90 task.ti=d8d7a000)
[  113.921933] Stack:
[  113.921945]  d8d7af38 00000246 dfb029d8 dfb029c0 dfb029d8 dfb029c0 ddd50300 d8d7af5c
[  113.922014]  dfb018e2 01000246 01000000 ddd50300 ddd50314 ddabb8a0 d8d7af68 dfb381c1
[  113.922098]  00000000 d8d7afa4 c012ec0a 00000000 00000002 00000000 c012eba8 ddabb8c0
[  113.922240] Call Trace:
[  113.922240]  [<dfb018e2>] ? bt_poll_rfkill+0x5c/0x82 [toshiba_acpi]
[  113.922240]  [<dfb381c1>] ? input_polled_device_work+0x11/0x40 [input_polldev]
[  113.922240]  [<c012ec0a>] ? run_workqueue+0xea/0x1f0
[  113.922240]  [<c012eba8>] ? run_workqueue+0x88/0x1f0
[  113.922240]  [<dfb381b0>] ? input_polled_device_work+0x0/0x40 [input_polldev]
[  113.922240]  [<c012f047>] ? worker_thread+0x87/0xf0

Quoted 8 lines

[  113.922240]  [<c0132b00>] ? autoremove_wake_function+0x0/0x50
[  113.922240]  [<c012efc0>] ? worker_thread+0x0/0xf0
[  113.922240]  [<c013280f>] ? kthread+0x3f/0x80
[  113.922240]  [<c01327d0>] ? kthread+0x0/0x80
[  113.922240]  [<c01040d7>] ? kernel_thread_helper+0x7/0x10
[  113.922240] Code: 43 54 89 73 54 39 c6 74 11 89 d9 ba 01 00 00 00 b8 40 68 aa df e8 3e 35 69 e0 89 f8 e8 77 fd 85 e0 31 c0 83 c4 10 5b 5e 5f 5d c3 <0f> 0b eb fe 89 f6 8d bc 27 00 00 00 00 be f4 4d aa df bb 5f 01
[  113.922240] EIP: [<dfaa4683>] rfkill_force_state+0x53/0x90 [rfkill] SS:ESP 0068:d8d7af24
[  113.924700] ---[ end trace 0e404eb40cadd5f0 ]---

Signed-off-by Frederik Deweerdt <[email protected]>

Tested-by Andrey Borzenkov <[email protected]>

Cc Len Brown <[email protected]>

Cc Richard Purdie <[email protected]>

Acked-by Philip Langdale <[email protected]>

drivers/acpi/toshiba_acpi.c +29 ~~-25~~

index 25f531d..40e60fc 100644
@@ -824,32 +824,36 @@ static int __init toshiba_acpi_init(void)
 			toshiba_acpi_exit();
 			return -ENOMEM;
 		}
-	}
 
-	/* Register input device for kill switch */
-	toshiba_acpi.poll_dev = input_allocate_polled_device();
-	if (!toshiba_acpi.poll_dev) {
-		printk(MY_ERR "unable to allocate kill-switch input device\n");
-		toshiba_acpi_exit();
-		return -ENOMEM;
-	}
-	toshiba_acpi.poll_dev->private = &toshiba_acpi;
-	toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
-	toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
-
-	toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
-	toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
-	toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */
-	set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
-	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
-	input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
-	input_sync(toshiba_acpi.poll_dev->input);
-
-	ret = input_register_polled_device(toshiba_acpi.poll_dev);
-	if (ret) {
-		printk(MY_ERR "unable to register kill-switch input device\n");
-		toshiba_acpi_exit();
-		return ret;
+		/* Register input device for kill switch */
+		toshiba_acpi.poll_dev = input_allocate_polled_device();
+		if (!toshiba_acpi.poll_dev) {
+			printk(MY_ERR
+			       "unable to allocate kill-switch input device\n");
+			toshiba_acpi_exit();
+			return -ENOMEM;
+		}
+		toshiba_acpi.poll_dev->private = &toshiba_acpi;
+		toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
+		toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
+
+		toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
+		toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
+		/* Toshiba USB ID */
+		toshiba_acpi.poll_dev->input->id.vendor = 0x0930;
+		set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
+		set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
+		input_report_switch(toshiba_acpi.poll_dev->input,
+				    SW_RFKILL_ALL, TRUE);
+		input_sync(toshiba_acpi.poll_dev->input);
+
+		ret = input_register_polled_device(toshiba_acpi.poll_dev);
+		if (ret) {
+			printk(MY_ERR
+			       "unable to register kill-switch input device\n");
+			toshiba_acpi_exit();
+			return ret;
+		}
 	}
 
 	return 0;