Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

765426e8 · Linus Torvalds <[email protected]> · 2008-10-23 10:20:36 -07:00

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
  dock: make dock driver not a module
  ACPI: fix ia64 build warning
  ACPI: hack around sysfs warning with link order
  ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
  intel_menlo: fix build warning
  panasonic-laptop: fix build
  ACPICA: Update version to 20080926
  ACPICA: Add support for zero-length buffer-to-string conversions
  ACPICA: New: Validation for predefined ACPI methods/objects
  ACPICA: Fix for implicit return compatibility
  ACPICA: Fixed a couple memory leaks associated with "implicit return"
  ACPICA: Optimize buffer allocation procedure
  ACPICA: Fix possible memory leak, error exit path
  ACPICA: Fix fault after mem allocation failure in AML parser
  ACPICA: Remove unused ACPI register bit definition
  ACPICA: Update version to 20080829
  ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
  ACPICA: Cleanup for internal Reference Object
  ACPICA: Update comments - no functional changes
  ACPICA: Update for Reference ACPI_OPERAND_OBJECT
  ...

Commit: 765426e8ee4c0ab2bc9d44951f4865b8494cdbd0
Parents: 36ec8918 · 898b054f

Merge commit. Changes below are compared with the first parent: 36ec8918.

Changes

145 files changed · +5917 −2212

File	Status	Add	Del	Content
Documentation/kernel-parameters.txt	modified	+46	−15	View file
Documentation/laptops/acer-wmi.txt	modified	+4	−24	View file
MAINTAINERS	modified	+13	−2	View file
arch/ia64/sn/kernel/io_acpi_init.c	modified	+5	−5	View file
arch/x86/Kconfig	modified	+5	−0	View file
arch/x86/kernel/acpi/boot.c	modified	+3	−2	View file
arch/x86/kernel/acpi/sleep.c	modified	+2	−2	View file
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	modified	+3	−0	View file
arch/x86/kernel/cpu/cpufreq/powernow-k8.c	modified	+24	−18	View file
arch/x86/kernel/early-quirks.c	modified	+52	−3	View file
arch/x86/kernel/process_64.c	modified	+7	−0	View file
drivers/Makefile	modified	+1	−0	View file
drivers/acpi/Kconfig	modified	+4	−11	View file
drivers/acpi/Makefile	modified	+1	−2	View file
drivers/acpi/ac.c	modified	+2	−2	View file
drivers/acpi/acpi_memhotplug.c	modified	+5	−6	View file
drivers/acpi/asus_acpi.c	modified	+114	−113	View file
drivers/acpi/battery.c	modified	+1	−1	View file
drivers/acpi/bay.c	deleted	+0	−411	View before deletion
drivers/acpi/bus.c	modified	+66	−12	View file
drivers/acpi/button.c	modified	+3	−3	View file
drivers/acpi/cm_sbs.c	modified	+4	−4	View file
drivers/acpi/container.c	modified	+2	−2	View file
drivers/acpi/debug.c	modified	+0	−2	View file
drivers/acpi/dispatcher/dsmethod.c	modified	+3	−0	View file
drivers/acpi/dispatcher/dsmthdat.c	modified	+43	−40	View file
drivers/acpi/dispatcher/dsobject.c	modified	+39	−23	View file
drivers/acpi/dispatcher/dsopcode.c	modified	+1	−1	View file
drivers/acpi/dispatcher/dswexec.c	modified	+8	−4	View file
drivers/acpi/dock.c	modified	+300	−88	View file
drivers/acpi/ec.c	modified	+211	−189	View file
drivers/acpi/executer/exconfig.c	modified	+86	−37	View file
drivers/acpi/executer/exconvrt.c	modified	+20	−12	View file
drivers/acpi/executer/exdump.c	modified	+40	−47	View file
drivers/acpi/executer/exmisc.c	modified	+7	−7	View file
drivers/acpi/executer/exoparg1.c	modified	+13	−13	View file
drivers/acpi/executer/exoparg2.c	modified	+2	−2	View file
drivers/acpi/executer/exresnte.c	modified	+6	−10	View file
drivers/acpi/executer/exresolv.c	modified	+29	−31	View file
drivers/acpi/executer/exresop.c	modified	+22	−28	View file
drivers/acpi/executer/exstore.c	modified	+32	−29	View file
drivers/acpi/executer/exstoren.c	modified	+2	−1	View file
drivers/acpi/fan.c	modified	+3	−3	View file
drivers/acpi/hardware/hwsleep.c	modified	+18	−26	View file
drivers/acpi/namespace/Makefile	modified	+1	−1	View file
drivers/acpi/namespace/nsdump.c	modified	+1	−4	View file
drivers/acpi/namespace/nseval.c	modified	+62	−11	View file
drivers/acpi/namespace/nsnames.c	modified	+3	−4	View file
drivers/acpi/namespace/nspredef.c	added	+900	−0	View file
drivers/acpi/namespace/nssearch.c	modified	+1	−1	View file
drivers/acpi/namespace/nsxfeval.c	modified	+78	−0	View file
drivers/acpi/namespace/nsxfname.c	modified	+5	−0	View file
drivers/acpi/numa.c	modified	+1	−1	View file
drivers/acpi/osl.c	modified	+45	−10	View file
drivers/acpi/parser/psloop.c	modified	+2	−0	View file
drivers/acpi/parser/psparse.c	modified	+14	−18	View file
drivers/acpi/pci_link.c	modified	+3	−3	View file
drivers/acpi/pci_root.c	modified	+2	−2	View file
drivers/acpi/pci_slot.c	modified	+5	−5	View file
drivers/acpi/power.c	modified	+48	−26	View file
drivers/acpi/processor_core.c	modified	+3	−3	View file
drivers/acpi/processor_idle.c	modified	+1	−0	View file
drivers/acpi/processor_perflib.c	modified	+21	−9	View file
drivers/acpi/processor_throttling.c	modified	+6	−6	View file
drivers/acpi/reboot.c	modified	+22	−3	View file
drivers/acpi/resources/rscalc.c	modified	+2	−3	View file
drivers/acpi/resources/rscreate.c	modified	+4	−6	View file
drivers/acpi/sbs.c	modified	+1	−1	View file
drivers/acpi/sbshc.c	modified	+3	−3	View file
drivers/acpi/scan.c	modified	+53	−37	View file
drivers/acpi/sleep/main.c	modified	+61	−5	View file
drivers/acpi/system.c	modified	+2	−2	View file
drivers/acpi/tables/tbfadt.c	modified	+25	−7	View file
drivers/acpi/tables/tbinstal.c	modified	+50	−11	View file
drivers/acpi/thermal.c	modified	+35	−22	View file
drivers/acpi/toshiba_acpi.c	modified	+1	−1	View file
drivers/acpi/utilities/utalloc.c	modified	+28	−25	View file
drivers/acpi/utilities/utcopy.c	modified	+16	−13	View file
drivers/acpi/utilities/utdelete.c	modified	+9	−3	View file
drivers/acpi/utilities/utglobal.c	modified	+46	−6	View file
drivers/acpi/utilities/utmisc.c	modified	+9	−0	View file
drivers/acpi/utilities/utobject.c	modified	+9	−6	View file
drivers/acpi/utilities/utxface.c	modified	+6	−1	View file
drivers/acpi/utils.c	modified	+2	−2	View file
drivers/acpi/video.c	modified	+30	−30	View file
drivers/acpi/wmi.c	modified	+42	−7	View file
drivers/ata/libata-acpi.c	modified	+48	−87	View file
drivers/cpuidle/cpuidle.c	modified	+8	−1	View file
drivers/dma/ioat_dma.c	modified	+3	−0	View file
drivers/idle/Kconfig	added	+16	−0	View file
drivers/idle/Makefile	added	+2	−0	View file
drivers/idle/i7300_idle.c	added	+674	−0	View file
drivers/misc/Kconfig	modified	+12	−0	View file
drivers/misc/Makefile	modified	+1	−0	View file
drivers/misc/acer-wmi.c	modified	+140	−85	View file
drivers/misc/asus-laptop.c	modified	+9	−8	View file
drivers/misc/eeepc-laptop.c	modified	+211	−21	View file
drivers/misc/fujitsu-laptop.c	modified	+77	−58	View file
drivers/misc/intel_menlow.c	modified	+16	−15	View file
drivers/misc/panasonic-laptop.c	added	+767	−0	View file
drivers/misc/sony-laptop.c	modified	+1	−1	View file
drivers/misc/thinkpad_acpi.c	modified	+62	−3	View file
drivers/pci/hotplug/acpiphp_glue.c	modified	+11	−9	View file
drivers/pci/hotplug/acpiphp_ibm.c	modified	+1	−1	View file
drivers/pci/hotplug/sgi_hotplug.c	modified	+2	−2	View file
drivers/pnp/Kconfig	modified	+14	−6	View file
drivers/pnp/Makefile	modified	+0	−4	View file
drivers/pnp/base.h	modified	+10	−0	View file
drivers/pnp/core.c	modified	+19	−10	View file
drivers/pnp/driver.c	modified	+0	−4	View file
drivers/pnp/isapnp/Makefile	modified	+0	−4	View file
drivers/pnp/isapnp/core.c	modified	+6	−6	View file
drivers/pnp/manager.c	modified	+17	−17	View file
drivers/pnp/pnpacpi/Makefile	modified	+0	−4	View file
drivers/pnp/pnpacpi/core.c	modified	+10	−6	View file
drivers/pnp/pnpacpi/rsparser.c	modified	+22	−21	View file
drivers/pnp/pnpbios/Makefile	modified	+0	−4	View file
drivers/pnp/pnpbios/core.c	modified	+2	−2	View file
drivers/pnp/pnpbios/rsparser.c	modified	+9	−9	View file
drivers/pnp/quirks.c	modified	+2	−3	View file
drivers/pnp/resource.c	modified	+6	−6	View file
drivers/pnp/support.c	modified	+5	−9	View file
include/acpi/acconfig.h	modified	+1	−1	View file
include/acpi/acdebug.h	modified	+8	−0	View file
include/acpi/acdisasm.h	modified	+4	−0	View file
include/acpi/acdispat.h	modified	+3	−3	View file
include/acpi/acexcep.h	modified	+55	−73	View file
include/acpi/aclocal.h	modified	+77	−0	View file
include/acpi/acmacros.h	modified	+120	−133	View file
include/acpi/acnamesp.h	modified	+16	−0	View file
include/acpi/acobject.h	modified	+30	−7	View file
include/acpi/acoutput.h	modified	+13	−19	View file
include/acpi/acpi_bus.h	modified	+9	−2	View file
include/acpi/acpi_drivers.h	modified	+9	−2	View file
include/acpi/acpiosxf.h	modified	+3	−0	View file
include/acpi/acpredef.h	added	+371	−0	View file
include/acpi/actbl1.h	modified	+45	−6	View file
include/acpi/actypes.h	modified	+25	−12	View file
include/acpi/acutils.h	modified	+3	−1	View file
include/acpi/platform/aclinux.h	modified	+6	−0	View file
include/asm-x86/idle.h	modified	+1	−0	View file
include/linux/acpi.h	modified	+0	−8	View file
include/linux/kernel.h	modified	+24	−0	View file
include/linux/pci_ids.h	modified	+1	−0	View file
include/linux/pnp.h	modified	+0	−10	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 53ba7c7..343e0f0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -218,20 +218,47 @@ and is between 256 and 4096 characters. It is defined in the file
 	acpi.debug_level=	[HW,ACPI]
 			Format: <int>
 			Each bit of the <int> indicates an ACPI debug level,
-			1: enable, 0: disable. It is useful for boot time
-			debugging. After system has booted up, it can be set
-			via /sys/module/acpi/parameters/debug_level.
-			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
-			Available bits (add the numbers together) to enable different
-			debug output levels of the ACPI subsystem:
-			0x01 error 0x02 warn 0x04 init 0x08 debug object
-			0x10 info 0x20 init names 0x40 parse 0x80 load
-			0x100 dispatch 0x200 execute 0x400 names 0x800 operation region
-			0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects
-			0x10000 resources 0x20000 user requests 0x40000 package.
-			The number can be in decimal or prefixed with 0x in hex.
-			Warning: Many of these options can produce a lot of
-			output and make your system unusable. Be very careful.
+			which corresponds to the level in an ACPI_DEBUG_PRINT
+			statement.  After system has booted up, this mask
+			can be set via /sys/module/acpi/parameters/debug_level.
+
+			CONFIG_ACPI_DEBUG must be enabled for this to produce
+			any output.  The number can be in decimal or prefixed
+			with 0x in hex.  Some of these options produce so much
+			output that the system is unusable.
+
+			The following global components are defined by the
+			ACPI CA:
+			       0x01 error
+			       0x02 warn
+			       0x04 init
+			       0x08 debug object
+			       0x10 info
+			       0x20 init names
+			       0x40 parse
+			       0x80 load
+			      0x100 dispatch
+			      0x200 execute
+			      0x400 names
+			      0x800 operation region
+			     0x1000 bfield
+			     0x2000 tables
+			     0x4000 values
+			     0x8000 objects
+			    0x10000 resources
+			    0x20000 user requests
+			    0x40000 package
+ 			The number can be in decimal or prefixed with 0x in hex.
+ 			Warning: Many of these options can produce a lot of
+ 			output and make your system unusable. Be very careful.
+
+ 	acpi.power_nocheck=	[HW,ACPI]
+ 			Format: 1/0 enable/disable the check of power state.
+ 			On some bogus BIOS the _PSC object/_STA object of
+ 			power resource can't return the correct device power
+ 			state. In such case it is unneccessary to check its
+ 			power state again in power transition.
+ 			1 : disable the power state check
 
 	acpi_pm_good	[X86-32,X86-64]
 			Override the pmtimer bug detection: force the kernel
@@ -1711,6 +1738,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			Override pmtimer IOPort with a hex value.
 			e.g. pmtmr=0x508
 
+	pnp.debug	[PNP]
+			Enable PNP debug messages.  This depends on the
+			CONFIG_PNP_DEBUG_MESSAGES option.
+
 	pnpacpi=	[ACPI]
 			{ off }
 
@@ -2208,7 +2239,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	thermal.crt=	[HW,ACPI]
 			-1: disable all critical trip points in all thermal zones
-			<degrees C>: lower all critical trip points
+			<degrees C>: override all critical trip points
 
 	thermal.nocrt=	[HW,ACPI]
 			Set to disable actions on ACPI thermal zone

Documentation/laptops/acer-wmi.txt

View file

diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt
index 69b5dd4..2b3a6b5 100644
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
@@ -1,7 +1,7 @@
 Acer Laptop WMI Extras Driver
 http://code.google.com/p/aceracpi
-Version 0.1
-9th February 2008
+Version 0.2
+18th August 2008
 
 Copyright 2007-2008 Carlos Corbacho <[email protected]>
 
@@ -87,17 +87,7 @@ acer-wmi come with built-in wireless. However, should you feel so inclined to
 ever wish to remove the card, or swap it out at some point, please get in touch
 with me, as we may well be able to gain some data on wireless card detection.
 
-To read the status of the wireless radio (0=off, 1=on):
-cat /sys/devices/platform/acer-wmi/wireless
-
-To enable the wireless radio:
-echo 1 > /sys/devices/platform/acer-wmi/wireless
-
-To disable the wireless radio:
-echo 0 > /sys/devices/platform/acer-wmi/wireless
-
-To set the state of the wireless radio when loading acer-wmi, pass:
-wireless=X (where X is 0 or 1)
+The wireless radio is exposed through rfkill.
 
 Bluetooth
 *********
@@ -117,17 +107,7 @@ For the adventurously minded - if you want to buy an internal bluetooth
 module off the internet that is compatible with your laptop and fit it, then
 it will work just fine with acer-wmi.
 
-To read the status of the bluetooth module (0=off, 1=on):
-cat /sys/devices/platform/acer-wmi/wireless
-
-To enable the bluetooth module:
-echo 1 > /sys/devices/platform/acer-wmi/bluetooth
-
-To disable the bluetooth module:
-echo 0 > /sys/devices/platform/acer-wmi/bluetooth
-
-To set the state of the bluetooth module when loading acer-wmi, pass:
-bluetooth=X (where X is 0 or 1)
+Bluetooth is exposed through rfkill.
 
 3G
 **

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 67fa3cf..277451a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1433,8 +1433,8 @@ M:	[email protected]
 S:	Maintained
 
 DOCKING STATION DRIVER
-P:	Kristen Carlson Accardi
-M:	[email protected]
+P:	Shaohua Li
+M:	[email protected]
 L:	[email protected]
 S:	Supported
 
@@ -2109,6 +2109,12 @@ L:	[email protected]
 L:	[email protected]
 S:	Orphan
 
+IDLE-I7300
+P:	Andy Henroid
+M:	[email protected]
+L:	[email protected]
+S:	Supported
+
 IEEE 1394 SUBSYSTEM (drivers/ieee1394)
 P:	Ben Collins
 M:	[email protected]
@@ -3186,6 +3192,11 @@ M:	[email protected]
 L:	[email protected]
 S:	Maintained
 
+PANASONIC LAPTOP ACPI EXTRAS DRIVER
+P:	Harald Welte
+M:	[email protected]
+S:	Maintained
+
 PANASONIC MN10300/AM33 PORT
 P:	David Howells
 M:	[email protected]

arch/ia64/sn/kernel/io_acpi_init.c

View file

diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index 6568942..bc610a6 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -232,7 +232,7 @@ exit:
 static unsigned int
 get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
 {
-	unsigned long adr;
+	unsigned long long adr;
 	acpi_handle child;
 	unsigned int devfn;
 	int function;
@@ -292,8 +292,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
 static acpi_status
 find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-	unsigned long bbn = -1;
-	unsigned long adr;
+	unsigned long long bbn = -1;
+	unsigned long long adr;
 	acpi_handle parent = NULL;
 	acpi_status status;
 	unsigned int devfn;
@@ -348,7 +348,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info,
 	unsigned int host_devfn;
 	struct sn_pcidev_match pcidev_match;
 	acpi_handle rootbus_handle;
-	unsigned long segment;
+	unsigned long long segment;
 	acpi_status status;
 
 	rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;
@@ -357,7 +357,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info,
         if (ACPI_SUCCESS(status)) {
 		if (segment != pci_domain_nr(dev)) {
 			printk(KERN_ERR
-			       "%s: Segment number mismatch, 0x%lx vs 0x%x for: ",
+			       "%s: Segment number mismatch, 0x%llx vs 0x%x for: ",
 			       __func__, segment, pci_domain_nr(dev));
 			acpi_ns_print_node_pathname(rootbus_handle, NULL);
 			printk("\n");

arch/x86/Kconfig

View file

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5b9b123..350bee1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -116,6 +116,9 @@ config GENERIC_TIME_VSYSCALL
 config ARCH_HAS_CPU_RELAX
 	def_bool y
 
+config ARCH_HAS_DEFAULT_IDLE
+	def_bool y
+
 config ARCH_HAS_CACHE_LINE_SIZE
 	def_bool y
 
@@ -1635,6 +1638,8 @@ source "arch/x86/kernel/cpu/cpufreq/Kconfig"
 
 source "drivers/cpuidle/Kconfig"
 
+source "drivers/idle/Kconfig"
+
 endmenu
 
 

arch/x86/kernel/acpi/boot.c

View file

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 0d1c26a..53b01a1 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -153,12 +153,13 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 }
 
 #ifdef CONFIG_PCI_MMCONFIG
+
+static int acpi_mcfg_64bit_base_addr __initdata = FALSE;
+
 /* The physical address of the MMCONFIG aperture.  Set from ACPI tables. */
 struct acpi_mcfg_allocation *pci_mmcfg_config;
 int pci_mmcfg_config_num;
 
-static int acpi_mcfg_64bit_base_addr __initdata = FALSE;
-
 static int __init acpi_mcfg_oem_check(struct acpi_table_mcfg *mcfg)
 {
 	if (!strcmp(mcfg->header.oem_id, "SGI"))

arch/x86/kernel/acpi/sleep.c

View file

diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index c44cd6d..806b4e9 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -22,7 +22,7 @@ unsigned long acpi_realmode_flags;
 static unsigned long acpi_realmode;
 
 #if defined(CONFIG_SMP) && defined(CONFIG_64BIT)
-static char temp_stack[10240];
+static char temp_stack[4096];
 #endif
 
 /**
@@ -98,7 +98,7 @@ int acpi_save_state_mem(void)
 #else /* CONFIG_64BIT */
 	header->trampoline_segment = setup_trampoline() >> 4;
 #ifdef CONFIG_SMP
-	stack_start.sp = temp_stack + 4096;
+	stack_start.sp = temp_stack + sizeof(temp_stack);
 	early_gdt_descr.address =
 			(unsigned long)get_cpu_gdt_table(smp_processor_id());
 #endif

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

View file

diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index c24c4a4..8e48c5d 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -780,6 +780,9 @@ static int __init acpi_cpufreq_init(void)
 {
 	int ret;
 
+	if (acpi_disabled)
+		return 0;
+
 	dprintk("acpi_cpufreq_init\n");
 
 	ret = acpi_cpufreq_early_init();

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

View file

diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 008d23b..d3dcd58 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -45,7 +45,6 @@
 #endif
 
 #define PFX "powernow-k8: "
-#define BFX PFX "BIOS error: "
 #define VERSION "version 2.20.00"
 #include "powernow-k8.h"
 
@@ -536,35 +535,40 @@ static int check_pst_table(struct powernow_k8_data *data, struct pst_s *pst, u8 
 
 	for (j = 0; j < data->numps; j++) {
 		if (pst[j].vid > LEAST_VID) {
-			printk(KERN_ERR PFX "vid %d invalid : 0x%x\n", j, pst[j].vid);
+			printk(KERN_ERR FW_BUG PFX "vid %d invalid : 0x%x\n",
+			       j, pst[j].vid);
 			return -EINVAL;
 		}
 		if (pst[j].vid < data->rvo) {	/* vid + rvo >= 0 */
-			printk(KERN_ERR BFX "0 vid exceeded with pstate %d\n", j);
+			printk(KERN_ERR FW_BUG PFX "0 vid exceeded with pstate"
+			       " %d\n", j);
 			return -ENODEV;
 		}
 		if (pst[j].vid < maxvid + data->rvo) {	/* vid + rvo >= maxvid */
-			printk(KERN_ERR BFX "maxvid exceeded with pstate %d\n", j);
+			printk(KERN_ERR FW_BUG PFX "maxvid exceeded with pstate"
+			       " %d\n", j);
 			return -ENODEV;
 		}
 		if (pst[j].fid > MAX_FID) {
-			printk(KERN_ERR BFX "maxfid exceeded with pstate %d\n", j);
+			printk(KERN_ERR FW_BUG PFX "maxfid exceeded with pstate"
+			       " %d\n", j);
 			return -ENODEV;
 		}
 		if (j && (pst[j].fid < HI_FID_TABLE_BOTTOM)) {
 			/* Only first fid is allowed to be in "low" range */
-			printk(KERN_ERR BFX "two low fids - %d : 0x%x\n", j, pst[j].fid);
+			printk(KERN_ERR FW_BUG PFX "two low fids - %d : "
+			       "0x%x\n", j, pst[j].fid);
 			return -EINVAL;
 		}
 		if (pst[j].fid < lastfid)
 			lastfid = pst[j].fid;
 	}
 	if (lastfid & 1) {
-		printk(KERN_ERR BFX "lastfid invalid\n");
+		printk(KERN_ERR FW_BUG PFX "lastfid invalid\n");
 		return -EINVAL;
 	}
 	if (lastfid > LO_FID_TABLE_TOP)
-		printk(KERN_INFO BFX  "first fid not from lo freq table\n");
+		printk(KERN_INFO FW_BUG PFX  "first fid not from lo freq table\n");
 
 	return 0;
 }
@@ -672,13 +676,13 @@ static int find_psb_table(struct powernow_k8_data *data)
 
 		dprintk("table vers: 0x%x\n", psb->tableversion);
 		if (psb->tableversion != PSB_VERSION_1_4) {
-			printk(KERN_ERR BFX "PSB table is not v1.4\n");
+			printk(KERN_ERR FW_BUG PFX "PSB table is not v1.4\n");
 			return -ENODEV;
 		}
 
 		dprintk("flags: 0x%x\n", psb->flags1);
 		if (psb->flags1) {
-			printk(KERN_ERR BFX "unknown flags\n");
+			printk(KERN_ERR FW_BUG PFX "unknown flags\n");
 			return -ENODEV;
 		}
 
@@ -705,7 +709,7 @@ static int find_psb_table(struct powernow_k8_data *data)
 			}
 		}
 		if (cpst != 1) {
-			printk(KERN_ERR BFX "numpst must be 1\n");
+			printk(KERN_ERR FW_BUG PFX "numpst must be 1\n");
 			return -ENODEV;
 		}
 
@@ -1130,17 +1134,19 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 			       "ACPI Processor module before starting this "
 			       "driver.\n");
 #else
-			printk(KERN_ERR PFX "Your BIOS does not provide ACPI "
-			       "_PSS objects in a way that Linux understands. "
-			       "Please report this to the Linux ACPI maintainers"
-			       " and complain to your BIOS vendor.\n");
+			printk(KERN_ERR FW_BUG PFX "Your BIOS does not provide"
+			       " ACPI _PSS objects in a way that Linux "
+			       "understands. Please report this to the Linux "
+			       "ACPI maintainers and complain to your BIOS "
+			       "vendor.\n");
 #endif
 			kfree(data);
 			return -ENODEV;
 		}
 		if (pol->cpu != 0) {
-			printk(KERN_ERR PFX "No ACPI _PSS objects for CPU other than "
-			       "CPU0. Complain to your BIOS vendor.\n");
+			printk(KERN_ERR FW_BUG PFX "No ACPI _PSS objects for "
+			       "CPU other than CPU0. Complain to your BIOS "
+			       "vendor.\n");
 			kfree(data);
 			return -ENODEV;
 		}
@@ -1193,7 +1199,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 
 	/* min/max the cpu is capable of */
 	if (cpufreq_frequency_table_cpuinfo(pol, data->powernow_table)) {
-		printk(KERN_ERR PFX "invalid powernow_table\n");
+		printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");
 		powernow_k8_cpu_exit_acpi(data);
 		kfree(data->powernow_table);
 		kfree(data);

arch/x86/kernel/early-quirks.c

View file

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 733c4f8..3ce029f 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -95,7 +95,8 @@ static void __init nvidia_bugs(int num, int slot, int func)
 
 }
 
-static u32 ati_ixp4x0_rev(int num, int slot, int func)
+#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
+static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 {
 	u32 d;
 	u8  b;
@@ -115,7 +116,6 @@ static u32 ati_ixp4x0_rev(int num, int slot, int func)
 
 static void __init ati_bugs(int num, int slot, int func)
 {
-#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
 	u32 d;
 	u8  b;
 
@@ -138,9 +138,56 @@ static void __init ati_bugs(int num, int slot, int func)
 		printk(KERN_INFO "If you got timer trouble "
 		       "try acpi_use_timer_override\n");
 	}
-#endif
 }
 
+static u32 __init ati_sbx00_rev(int num, int slot, int func)
+{
+	u32 old, d;
+
+	d = read_pci_config(num, slot, func, 0x70);
+	old = d;
+	d &= ~(1<<8);
+	write_pci_config(num, slot, func, 0x70, d);
+	d = read_pci_config(num, slot, func, 0x8);
+	d &= 0xff;
+	write_pci_config(num, slot, func, 0x70, old);
+
+	return d;
+}
+
+static void __init ati_bugs_contd(int num, int slot, int func)
+{
+	u32 d, rev;
+
+	if (acpi_use_timer_override)
+		return;
+
+	rev = ati_sbx00_rev(num, slot, func);
+	if (rev > 0x13)
+		return;
+
+	/* check for IRQ0 interrupt swap */
+	d = read_pci_config(num, slot, func, 0x64);
+	if (!(d & (1<<14)))
+		acpi_skip_timer_override = 1;
+
+	if (acpi_skip_timer_override) {
+		printk(KERN_INFO "SB600 revision 0x%x\n", rev);
+		printk(KERN_INFO "Ignoring ACPI timer override.\n");
+		printk(KERN_INFO "If you got timer trouble "
+		       "try acpi_use_timer_override\n");
+	}
+}
+#else
+static void __init ati_bugs(int num, int slot, int func)
+{
+}
+
+static void __init ati_bugs_contd(int num, int slot, int func)
+{
+}
+#endif
+
 #ifdef CONFIG_DMAR
 static void __init intel_g33_dmar(int num, int slot, int func)
 {
@@ -176,6 +223,8 @@ static struct chipset early_qrk[] __initdata = {
 	  PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config },
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,
 	  PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
+	  PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd },
 #ifdef CONFIG_DMAR
 	{ PCI_VENDOR_ID_INTEL, 0x29c0,
 	  PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, intel_g33_dmar },

arch/x86/kernel/process_64.c

View file

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index cd8c0ed..c958120 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -63,6 +63,13 @@ void idle_notifier_register(struct notifier_block *n)
 {
 	atomic_notifier_chain_register(&idle_notifier, n);
 }
+EXPORT_SYMBOL_GPL(idle_notifier_register);
+
+void idle_notifier_unregister(struct notifier_block *n)
+{
+	atomic_notifier_chain_unregister(&idle_notifier, n);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_unregister);
 
 void enter_idle(void)
 {

drivers/Makefile

View file

diff --git a/drivers/Makefile b/drivers/Makefile
index cadc64f..2503f7b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_EISA)		+= eisa/
 obj-y				+= lguest/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_CPU_IDLE)		+= cpuidle/
+obj-y				+= idle/
 obj-$(CONFIG_MMC)		+= mmc/
 obj-$(CONFIG_MEMSTICK)		+= memstick/
 obj-$(CONFIG_NEW_LEDS)		+= leds/

drivers/acpi/Kconfig

View file

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index da49b00..f4f6329 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -42,7 +42,7 @@ if ACPI
 
 config ACPI_SLEEP
 	bool
-	depends on PM_SLEEP
+	depends on SUSPEND || HIBERNATION
 	default y
 
 config ACPI_PROCFS
@@ -157,18 +157,11 @@ config ACPI_FAN
 	  applications to perform basic fan control (on, off, status).
 
 config ACPI_DOCK
-	tristate "Dock"
+	bool "Dock"
 	depends on EXPERIMENTAL
 	help
-	  This driver adds support for ACPI controlled docking stations
-
-config ACPI_BAY
-	tristate "Removable Drive Bay (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
-	depends on ACPI_DOCK
-	help
-	  This driver adds support for ACPI controlled removable drive
-	  bays such as the IBM ultrabay or the Dell Module Bay.
+	  This driver adds support for ACPI controlled docking stations and removable
+	  drive bays such as the IBM ultrabay or the Dell Module Bay.
 
 config ACPI_PROCESSOR
 	tristate "Processor"

drivers/acpi/Makefile

View file

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 52a4cd4..d91c027 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -45,14 +45,13 @@ obj-$(CONFIG_ACPI_BATTERY)	+= battery.o
 obj-$(CONFIG_ACPI_BUTTON)	+= button.o
 obj-$(CONFIG_ACPI_FAN)		+= fan.o
 obj-$(CONFIG_ACPI_DOCK)		+= dock.o
-obj-$(CONFIG_ACPI_BAY)		+= bay.o
 obj-$(CONFIG_ACPI_VIDEO)	+= video.o
 obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
 obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
-obj-$(CONFIG_ACPI_POWER)	+= power.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
+obj-$(CONFIG_ACPI_POWER)	+= power.o
 obj-$(CONFIG_ACPI_SYSTEM)	+= system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)	+= debug.o
 obj-$(CONFIG_ACPI_NUMA)		+= numa.o

drivers/acpi/ac.c

View file

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 831883b..d72a1b6 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -85,7 +85,7 @@ struct acpi_ac {
 	struct power_supply charger;
 #endif

This diff is incomplete. Download the complete patch.