Skip to contentSkip to conversation

ACPI patches for 2.6.31-rc0 - part 3

PATCH New Len Brown 2 participants 8 messages Sep 27, 2009 – Sep 28, 2009

Subsystems (3)
lore
Share & tools
lore
author reviewer
#1 lore raw

PATCH 1/5 thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem

In reply to Len Brown

From: Henrique de Moraes Holschuh <[email protected]>

Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:

CHECK drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
CC [M] drivers/platform/x86/thinkpad_acpi.o
drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment

---
 drivers/platform/x86/thinkpad_acpi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +2 -0
index 3910f2f..d93108d 100644
@@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask)
 
 	HOTKEY_CONFIG_CRITICAL_START
 	hotkey_driver_mask = mask;
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
 	hotkey_source_mask |= (mask & ~hotkey_all_mask);
+#endif
 	HOTKEY_CONFIG_CRITICAL_END
 
 	rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) &
Signature · 1 line
1.6.0.6

Len Brown

author reviewer
#0 lore raw

please speak up if you disagree these should merge upstream.

thanks,
Len Brown, Intel Open Source Technology Center

author reviewer
#2 lore raw

PATCH 2/5 ACPI: Clarify resource conflict message

From: Jean Delvare <[email protected]>

The message "ACPI: Device needs an ACPI driver" is misleading. The device _may_ need an ACPI driver, if the BIOS implemented a custom API for the device in question (which, AFAIK, can't be checked.) If not, then either a generic ACPI driver may be used (for example "thermal"), or nothing can be done (other than a white list).

I propose to reword the message to:

ACPI: If an ACPI driver is available for this device, you should use it instead of the native driver

which I think is more correct. Comments and suggestions welcome.

I also added a message warning about possible problems and system instability when users pass acpi_enforce_resources=lax, as suggested by Len.

Cc Thomas Renninger <[email protected]>
Cc Alan Jenkins <[email protected]>
---
 drivers/acpi/osl.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
drivers/acpi/osl.c +7 -1
index 5633b86..7c1c59e 100644
@@ -1161,7 +1161,13 @@ int acpi_check_resource_conflict(struct resource *res)
 			       res_list_elem->name,
 			       (long long) res_list_elem->start,
 			       (long long) res_list_elem->end);
-			printk(KERN_INFO "ACPI: Device needs an ACPI driver\n");
+			if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
+				printk(KERN_NOTICE "ACPI: This conflict may"
+				       " cause random problems and system"
+				       " instability\n");
+			printk(KERN_INFO "ACPI: If an ACPI driver is available"
+			       " for this device, you should use it instead of"
+			       " the native driver\n");
 		}
 		if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT)
 			return -EBUSY;
Signature · 1 line
1.6.0.6
author reviewer
#3 lore raw

PATCH 3/5 ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression

In reply to Len Brown

From: Zhao Yakui <[email protected]>

Don't disable ARB_DISABLE when the familary ID is 0x0F.

http://bugzilla.kernel.org/show_bug.cgi?id=14211

This was a 2.6.31 regression, and so this patch
needs to be applied to 2.6.31.stable

---
 arch/x86/kernel/acpi/cstate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/acpi/cstate.c +1 -1
index 8c44c23..59cdfa4 100644
@@ -48,7 +48,7 @@ void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
 	 * P4, Core and beyond CPUs
 	 */
 	if (c->x86_vendor == X86_VENDOR_INTEL &&
-	    (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 14)))
+	    (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 14)))
 			flags->bm_control = 0;
 }
 EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
Signature · 1 line
1.6.0.6
author reviewer
#4 lore raw

PATCH 4/5 ACPI: Kill overly verbose "power state" log messages

In reply to Len Brown

From: Roland Dreier <[email protected]>

I was recently lucky enough to get a 64-CPU system, so my kernel log ends up with 64 lines like:

    ACPI: CPU0 (power states: C1[C1] C2[C3])

This is pretty useless clutter because this info is already available after boot from both /sys/devices/system/cpu/cpu*/cpuidle/state?/ as well as /proc/acpi/processor/CPU*/power.

So just delete the code that prints the C-states in processor_idle.c.

---
 drivers/acpi/processor_idle.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/acpi/processor_idle.c +0 -7
index cc61a62..706eacf 100644
@@ -1214,13 +1214,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 		acpi_processor_setup_cpuidle(pr);
 		if (cpuidle_register_device(&pr->power.dev))
 			return -EIO;
-
-		printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
-		for (i = 1; i <= pr->power.count; i++)
-			if (pr->power.states[i].valid)
-				printk(" C%d[C%d]", i,
-				       pr->power.states[i].type);
-		printk(")\n");
 	}
 #ifdef CONFIG_ACPI_PROCFS
 	/* 'power' [R] */
Signature · 1 line
1.6.0.6
author reviewer
#5 lore raw

PATCH 5/5 ACPI: IA64=y ACPI=n build fix

In reply to Len Brown

From: Len Brown <[email protected]>

ia64's sim_defconfig uses CONFIG_ACPI=n which now #define's acpi_disabled in <linux/acpi.h>

So we shouldn't re-define it here in <asm/acpi.h>

---
 arch/ia64/include/asm/acpi.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/ia64/include/asm/acpi.h +2 -0
index 0f82cc2..91df968 100644
@@ -89,10 +89,12 @@ ia64_acpi_release_global_lock (unsigned int *lock)
 #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)				\
 	((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
 
+#ifdef	CONFIG_ACPI
 #define acpi_disabled 0	/* ACPI always enabled on IA64 */
 #define acpi_noirq 0	/* ACPI always enabled on IA64 */
 #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
 #define acpi_strict 1	/* no ACPI spec workarounds on IA64 */
+#endif
 #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
 static inline void disable_acpi(void) { }
 
Signature · 1 line
1.6.0.6