2.6.18-rc1: breaks boot on thinkpad x32
Hi!
I tried to update to 2.6.18-rc1-git, but got hang after
acpiphp: Slot [1] registered
...but acpi=off failed to workaround the problem, it merely hung at another place. I went back to 2.6.18-rc1, and it hung at same place. 2.6.17 works. Any ideas?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 9 lines · On Fri, 7 Jul 2006 12:50:41 +0200 Pavel Machek <[email protected]> wrote:
Hi!
I tried to update to 2.6.18-rc1-git, but got hang after
acpiphp: Slot [1] registered
...but acpi=off failed to workaround the problem, it merely hung at another place. I went back to 2.6.18-rc1, and it hung at same place.
There have been no post-2.6.18-rc1 commits yet.
Quoted 1 line
2.6.17 works. Any ideas?
Nope. Is the hang during initial bootup or during modprobing?
If during initial bootup, try adding initcall_debug to the boot command line.
If modular, work out which module is being bad?
It might be the cm_sbs driver. (initcall_debug will point at acpi_cm_sbs_init()). If so, this'll help.
drivers/acpi/cm_sbs.c renamed from drivers/acpi/cm_sbs.c~acpi-initialise-cm_sbs_sem +14 -32
@@ -39,50 +39,43 @@ ACPI_MODULE_NAME("cm_sbs")static struct proc_dir_entry *acpi_ac_dir;static struct proc_dir_entry *acpi_battery_dir; -static struct semaphore cm_sbs_sem; +static DEFINE_MUTEX (cm_sbs_mutex); -static int lock_ac_dir_cnt =0 ; -static int lock_battery_dir_cnt =0 ; +static int lock_ac_dir_cnt; +static int lock_battery_dir_cnt;struct proc_dir_entry *acpi_lock_ac_dir (void ) { - -down (&cm_sbs_sem); -if (!acpi_ac_dir) { +mutex_lock (&cm_sbs_mutex); +if (!acpi_ac_dir) acpi_ac_dir =proc_mkdir (ACPI_AC_CLASS , acpi_root_dir); - }if (acpi_ac_dir) { lock_ac_dir_cnt++; }else {ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Cannot create %s\n" ,ACPI_AC_CLASS )); } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex);return acpi_ac_dir; } -EXPORT_SYMBOL (acpi_lock_ac_dir);void acpi_unlock_ac_dir (struct proc_dir_entry *acpi_ac_dir_param) { - -down (&cm_sbs_sem); -if (acpi_ac_dir_param) { +mutex_lock (&cm_sbs_mutex); +if (acpi_ac_dir_param) lock_ac_dir_cnt--; - }if (lock_ac_dir_cnt ==0 && acpi_ac_dir_param && acpi_ac_dir) {remove_proc_entry (ACPI_AC_CLASS , acpi_root_dir); acpi_ac_dir =0 ; } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex); } -EXPORT_SYMBOL (acpi_unlock_ac_dir);struct proc_dir_entry *acpi_lock_battery_dir (void ) { - -down (&cm_sbs_sem); +mutex_lock (&cm_sbs_mutex);if (!acpi_battery_dir) { acpi_battery_dir =proc_mkdir (ACPI_BATTERY_CLASS , acpi_root_dir);
@@ -93,39 +86,28 @@ struct proc_dir_entry *acpi_lock_batteryACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Cannot create %s\n" ,ACPI_BATTERY_CLASS )); } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex);return acpi_battery_dir; } -EXPORT_SYMBOL (acpi_lock_battery_dir);void acpi_unlock_battery_dir (struct proc_dir_entry *acpi_battery_dir_param) { - -down (&cm_sbs_sem); -if (acpi_battery_dir_param) { +mutex_lock (&cm_sbs_mutex); +if (acpi_battery_dir_param) lock_battery_dir_cnt--; - }if (lock_battery_dir_cnt ==0 && acpi_battery_dir_param && acpi_battery_dir) {remove_proc_entry (ACPI_BATTERY_CLASS , acpi_root_dir); acpi_battery_dir =0 ; } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex);return ; } -EXPORT_SYMBOL (acpi_unlock_battery_dir);static int __init acpi_cm_sbs_init (void ) { - -if (acpi_disabled) -return 0 ; - -init_MUTEX (&cm_sbs_sem); -return 0 ; } -subsys_initcall (acpi_cm_sbs_init);
_
Re: 2.6.18-rc1: breaks boot on thinkpad x32 -- acpiphp problems?
Hi!
Quoted 8 lines
Quoted 7 lines
I tried to update to 2.6.18-rc1-git, but got hang after
acpiphp: Slot [1] registered
...but acpi=off failed to workaround the problem, it merely hung at another place. I went back to 2.6.18-rc1, and it hung at same place.
Quoted 8 lines
There have been no post-2.6.18-rc1 commits yet.
Quoted 1 line
2.6.17 works. Any ideas?
Nope. Is the hang during initial bootup or during modprobing?
If during initial bootup, try adding
initcall_debugto the boot command line.
Initial bootup, I basically do not use modules.
It hangs at the same place... but with with acpi=off, I can see it hanging at acpi_ac_init. What is going on?
Why is acpiphp being initialized with acpi=off?
Will try disabling acpiphp in config and see what happens.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: 2.6.18-rc1: breaks boot on thinkpad x32 -- acpiphp problems?
Hi!
Quoted 17 lines
Quoted 8 lines
Quoted 7 lines
I tried to update to 2.6.18-rc1-git, but got hang after
acpiphp: Slot [1] registered
...but acpi=off failed to workaround the problem, it merely hung at another place. I went back to 2.6.18-rc1, and it hung at same place.
Quoted 8 lines
There have been no post-2.6.18-rc1 commits yet.
Quoted 1 line
2.6.17 works. Any ideas?
Nope. Is the hang during initial bootup or during modprobing?
If during initial bootup, try adding
initcall_debugto the boot command line.
Quoted 8 lines
Initial bootup, I basically do not use modules.
It hangs at the same place... but with with acpi=off, I can see it hanging at
acpi_ac_init. What is going on?Why is acpiphp being initialized with acpi=off?
Will try disabling acpiphp in config and see what happens.
With acpiphp disabled, machine indeed boots properly.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: 2.6.18-rc1: breaks boot on thinkpad x32 -- acpiphp problems?
In reply to Pavel MachekQuoted 14 lines · On Sat, 8 Jul 2006 14:06:35 +0200 Pavel Machek <[email protected]> wrote:
Quoted 13 lines
Quoted 7 lines
I tried to update to 2.6.18-rc1-git, but got hang after
acpiphp: Slot [1] registered
...but acpi=off failed to workaround the problem, it merely hung at another place. I went back to 2.6.18-rc1, and it hung at same place.
There have been no post-2.6.18-rc1 commits yet.
Quoted 1 line
2.6.17 works. Any ideas?
Nope. Is the hang during initial bootup or during modprobing?
Quoted 7 lines
Quoted 2 lines
If during initial bootup, try adding
initcall_debugto the boot command line.Initial bootup, I basically do not use modules.
It hangs at the same place... but with with acpi=off, I can see it hanging at
acpi_ac_init. What is going on?
The patch I sent should fix it, honest. Here it is again.
From: Andrew Morton <[email protected]>
cm_sbs_sem is being downed (via acpi_ac_init->acpi_lock_ac_dir) before it is initialised, with grave results.
- Make it a mutex
- Initialise it
- Make it static
- Clean other stuff up.
Thanks to Paul Drynoff <[email protected]> for reporting and testing.
---
drivers/acpi/cm_sbs.c | 46 ++++++++++++---------------------------- 1 file changed, 14 insertions(+), 32 deletions(-)
drivers/acpi/cm_sbs.c renamed from drivers/acpi/cm_sbs.c~acpi-initialise-cm_sbs_sem +14 -32
@@ -39,50 +39,43 @@ ACPI_MODULE_NAME("cm_sbs")static struct proc_dir_entry *acpi_ac_dir;static struct proc_dir_entry *acpi_battery_dir; -static struct semaphore cm_sbs_sem; +static DEFINE_MUTEX (cm_sbs_mutex); -static int lock_ac_dir_cnt =0 ; -static int lock_battery_dir_cnt =0 ; +static int lock_ac_dir_cnt; +static int lock_battery_dir_cnt;struct proc_dir_entry *acpi_lock_ac_dir (void ) { - -down (&cm_sbs_sem); -if (!acpi_ac_dir) { +mutex_lock (&cm_sbs_mutex); +if (!acpi_ac_dir) acpi_ac_dir =proc_mkdir (ACPI_AC_CLASS , acpi_root_dir); - }if (acpi_ac_dir) { lock_ac_dir_cnt++; }else {ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Cannot create %s\n" ,ACPI_AC_CLASS )); } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex);return acpi_ac_dir; } -EXPORT_SYMBOL (acpi_lock_ac_dir);void acpi_unlock_ac_dir (struct proc_dir_entry *acpi_ac_dir_param) { - -down (&cm_sbs_sem); -if (acpi_ac_dir_param) { +mutex_lock (&cm_sbs_mutex); +if (acpi_ac_dir_param) lock_ac_dir_cnt--; - }if (lock_ac_dir_cnt ==0 && acpi_ac_dir_param && acpi_ac_dir) {remove_proc_entry (ACPI_AC_CLASS , acpi_root_dir); acpi_ac_dir =0 ; } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex); } -EXPORT_SYMBOL (acpi_unlock_ac_dir);struct proc_dir_entry *acpi_lock_battery_dir (void ) { - -down (&cm_sbs_sem); +mutex_lock (&cm_sbs_mutex);if (!acpi_battery_dir) { acpi_battery_dir =proc_mkdir (ACPI_BATTERY_CLASS , acpi_root_dir);
@@ -93,39 +86,28 @@ struct proc_dir_entry *acpi_lock_batteryACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Cannot create %s\n" ,ACPI_BATTERY_CLASS )); } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex);return acpi_battery_dir; } -EXPORT_SYMBOL (acpi_lock_battery_dir);void acpi_unlock_battery_dir (struct proc_dir_entry *acpi_battery_dir_param) { - -down (&cm_sbs_sem); -if (acpi_battery_dir_param) { +mutex_lock (&cm_sbs_mutex); +if (acpi_battery_dir_param) lock_battery_dir_cnt--; - }if (lock_battery_dir_cnt ==0 && acpi_battery_dir_param && acpi_battery_dir) {remove_proc_entry (ACPI_BATTERY_CLASS , acpi_root_dir); acpi_battery_dir =0 ; } -up (&cm_sbs_sem); +mutex_unlock (&cm_sbs_mutex);return ; } -EXPORT_SYMBOL (acpi_unlock_battery_dir);static int __init acpi_cm_sbs_init (void ) { - -if (acpi_disabled) -return 0 ; - -init_MUTEX (&cm_sbs_sem); -return 0 ; } -subsys_initcall (acpi_cm_sbs_init);
_