Commit a3a798c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (94 commits)
  ACPICA: hide private headers
  ACPICA: create acpica/ directory
  ACPI: fix build warning
  ACPI : Use RSDT instead of XSDT by adding boot option of "acpi=rsdt"
  ACPI: Avoid array address overflow when _CST MWAIT hint bits are set
  fujitsu-laptop: Simplify SBLL/SBL2 backlight handling
  fujitsu-laptop: Add BL power, LED control and radio state information
  ACPICA: delete utcache.c
  ACPICA: delete acdisasm.h
  ACPICA: Update version to 20081204.
  ACPICA: FADT: Update error msgs for consistency
  ACPICA: FADT: set acpi_gbl_use_default_register_widths to TRUE by default
  ACPICA: FADT parsing changes and fixes
  ACPICA: Add ACPI_MUTEX_TYPE configuration option
  ACPICA: Fixes for various ACPI data tables
  ACPICA: Restructure includes into public/private
  ACPI: remove private acpica headers from driver files
  ACPI: reboot.c: use new acpi_reset interface
  ACPICA: New: acpi_reset interface - write to reset register
  ACPICA: Move all public H/W interfaces to new hwxface
  ...
parents efcb3cf7 d97c0def

Documentation/kernel-parameters.txt

+27 −19
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			ht -- run only enough ACPI to enable Hyper Threading

			strict -- Be less tolerant of platforms that are not

				strictly ACPI specification compliant.

			rsdt -- prefer RSDT over (default) XSDT



			See also Documentation/power/pm.txt, pci=noacpi
@@ -151,16 +152,20 @@ and is between 256 and 4096 characters. It is defined in the file 
			default: 0



	acpi_sleep=	[HW,ACPI] Sleep options

			Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, old_ordering }

			See Documentation/power/video.txt for s3_bios and s3_mode.

			Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,

				  old_ordering, s4_nonvs }

			See Documentation/power/video.txt for information on

			s3_bios and s3_mode.

			s3_beep is for debugging; it makes the PC's speaker beep

			as soon as the kernel's real-mode entry point is called.

			s4_nohwsig prevents ACPI hardware signature from being

			used during resume from hibernation.

			old_ordering causes the ACPI 1.0 ordering of the _PTS

			control method, wrt putting devices into low power

			states, to be enforced (the ACPI 2.0 ordering of _PTS is

			used by default).

			control method, with respect to putting devices into

			low power states, to be enforced (the ACPI 2.0 ordering

			of _PTS is used by default).

			s4_nonvs prevents the kernel from saving/restoring the

			ACPI NVS memory during hibernation.



	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode

			Format: { level | edge | high | low }
@@ -195,7 +200,7 @@ and is between 256 and 4096 characters. It is defined in the file 
	acpi_skip_timer_override [HW,ACPI]

			Recognize and ignore IRQ0/pin2 Interrupt Override.

			For broken nForce2 BIOS resulting in XT-PIC timer.

	acpi_use_timer_override [HW,ACPI}

	acpi_use_timer_override [HW,ACPI]

			Use timer override. For some broken Nvidia NF5 boards

			that require a timer override, but don't have

			HPET
@@ -878,17 +883,19 @@ and is between 256 and 4096 characters. It is defined in the file 
			See Documentation/ide/ide.txt.



	idle=		[X86]

			Format: idle=poll or idle=mwait, idle=halt, idle=nomwait

			Poll forces a polling idle loop that can slightly improves the performance

			of waking up a idle CPU, but will use a lot of power and make the system

			run hot. Not recommended.

			idle=mwait. On systems which support MONITOR/MWAIT but the kernel chose

			to not use it because it doesn't save as much power as a normal idle

			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same

			as idle=poll.

			idle=halt. Halt is forced to be used for CPU idle.

			Format: idle=poll, idle=mwait, idle=halt, idle=nomwait

			Poll forces a polling idle loop that can slightly

			improve the performance of waking up a idle CPU, but

			will use a lot of power and make the system run hot.

			Not recommended.

			idle=mwait: On systems which support MONITOR/MWAIT but

			the kernel chose to not use it because it doesn't save

			as much power as a normal idle loop, use the

			MONITOR/MWAIT idle loop anyways. Performance should be

			the same as idle=poll.

			idle=halt: Halt is forced to be used for CPU idle.

			In such case C2/C3 won't be used again.

			idle=nomwait. Disable mwait for CPU C-states

			idle=nomwait: Disable mwait for CPU C-states



	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem

			Claim all unknown PCI IDE storage controllers.
@@ -1074,8 +1081,8 @@ and is between 256 and 4096 characters. It is defined in the file 
	lapic		[X86-32,APIC] Enable the local APIC even if BIOS

			disabled it.



	lapic_timer_c2_ok	[X86-32,x86-64,APIC] trust the local apic timer in

			C2 power state.

	lapic_timer_c2_ok	[X86-32,x86-64,APIC] trust the local apic timer

			in C2 power state.



	libata.dma=	[LIBATA] DMA control

			libata.dma=0	  Disable all PATA and SATA DMA
@@ -2303,7 +2310,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	thermal.psv=	[HW,ACPI]

			-1: disable all passive trip points

			<degrees C>: override all passive trip points to this value

			<degrees C>: override all passive trip points to this

			value



	thermal.tzp=	[HW,ACPI]

			Specify global default ACPI thermal zone polling rate

arch/ia64/include/asm/acpi-ext.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define _ASM_IA64_ACPI_EXT_H



#include <linux/types.h>

#include <acpi/actypes.h>



extern acpi_status hp_acpi_csr_space (acpi_handle, u64 *base, u64 *length);

arch/ia64/include/asm/sn/acpi.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#ifndef _ASM_IA64_SN_ACPI_H

#define _ASM_IA64_SN_ACPI_H



#include "acpi/acglobal.h"



extern int sn_acpi_rev;

#define SN_ACPI_BASE_SUPPORT()   (sn_acpi_rev >= 0x20101)

arch/ia64/kernel/acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ EXPORT_SYMBOL(pm_idle); 
void (*pm_power_off) (void);

EXPORT_SYMBOL(pm_power_off);



u32 acpi_rsdt_forced;

unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;

arch/ia64/sn/kernel/io_acpi_init.c

+56 −47
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/sn/sn_sal.h>

#include "xtalk/hubdev.h"

#include <linux/acpi.h>

#include <acpi/acnamesp.h>





/*
@@ -64,6 +63,7 @@ static acpi_status __init 
sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	u64 addr;

	struct hubdev_info *hubdev;

	struct hubdev_info *hubdev_ptr;
@@ -77,11 +77,12 @@ sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret) 
	status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,

					  &sn_uuid, &buffer);

	if (ACPI_FAILURE(status)) {

		acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

		printk(KERN_ERR

		       "sn_acpi_hubdev_init: acpi_get_vendor_resource() "

		       "(0x%x) failed for: ", status);

		acpi_ns_print_node_pathname(handle, NULL);

		printk("\n");

		       "(0x%x) failed for: %s\n", status,

			(char *)name_buffer.pointer);

		kfree(name_buffer.pointer);

		return AE_OK;		/* Continue walking namespace */

	}
@@ -89,11 +90,12 @@ sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret) 
	vendor = &resource->data.vendor_typed;

	if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=

	    sizeof(struct hubdev_info *)) {

		acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

		printk(KERN_ERR

		       "sn_acpi_hubdev_init: Invalid vendor data length: %d for: ",

		        vendor->byte_length);

		acpi_ns_print_node_pathname(handle, NULL);

		printk("\n");

		       "sn_acpi_hubdev_init: Invalid vendor data length: "

		       "%d for: %s\n",

			vendor->byte_length, (char *)name_buffer.pointer);

		kfree(name_buffer.pointer);

		goto exit;

	}
@@ -120,6 +122,7 @@ sn_get_bussoft_ptr(struct pci_bus *bus) 
{

	u64 addr;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	acpi_handle handle;

	struct pcibus_bussoft *prom_bussoft_ptr;

	struct acpi_resource *resource;
@@ -131,11 +134,11 @@ sn_get_bussoft_ptr(struct pci_bus *bus) 
	status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,

					  &sn_uuid, &buffer);

	if (ACPI_FAILURE(status)) {

		acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

		printk(KERN_ERR "%s: "

		       "acpi_get_vendor_resource() failed (0x%x) for: ",

		       __func__, status);

		acpi_ns_print_node_pathname(handle, NULL);

		printk("\n");

		       "acpi_get_vendor_resource() failed (0x%x) for: %s\n",

		       __func__, status, (char *)name_buffer.pointer);

		kfree(name_buffer.pointer);

		return NULL;

	}

	resource = buffer.pointer;
@@ -168,6 +171,7 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info, 
{

	u64 addr;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct sn_irq_info *irq_info, *irq_info_prom;

	struct pcidev_info *pcidev_ptr, *pcidev_prom_ptr;

	struct acpi_resource *resource;
@@ -182,11 +186,11 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info, 
	status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,

					  &sn_uuid, &buffer);

	if (ACPI_FAILURE(status)) {

		acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

		printk(KERN_ERR

		       "%s: acpi_get_vendor_resource() failed (0x%x) for: ",

		        __func__, status);

		acpi_ns_print_node_pathname(handle, NULL);

		printk("\n");

		       "%s: acpi_get_vendor_resource() failed (0x%x) for: %s\n",

			__func__, status, (char *)name_buffer.pointer);

		kfree(name_buffer.pointer);

		return 1;

	}
@@ -194,11 +198,12 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info, 
	vendor = &resource->data.vendor_typed;

	if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=

	    sizeof(struct pci_devdev_info *)) {

		acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

		printk(KERN_ERR

		       "%s: Invalid vendor data length: %d for: ",

		        __func__, vendor->byte_length);

		acpi_ns_print_node_pathname(handle, NULL);

		printk("\n");

		       "%s: Invalid vendor data length: %d for: %s\n",

			 __func__, vendor->byte_length,

			(char *)name_buffer.pointer);

		kfree(name_buffer.pointer);

		ret = 1;

		goto exit;

	}
@@ -239,6 +244,9 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) 
	acpi_handle parent;

	int slot;

	acpi_status status;

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };



	acpi_get_name(device_handle, ACPI_FULL_PATHNAME, &name_buffer);



	/*

	 * Do an upward search to find the root bus device, and
@@ -249,9 +257,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) 
		status = acpi_get_parent(child, &parent);

		if (ACPI_FAILURE(status)) {

			printk(KERN_ERR "%s: acpi_get_parent() failed "

			       "(0x%x) for: ", __func__, status);

			acpi_ns_print_node_pathname(child, NULL);

			printk("\n");

			       "(0x%x) for: %s\n", __func__, status,

				(char *)name_buffer.pointer);

			panic("%s: Unable to find host devfn\n", __func__);

		}

		if (parent == rootbus_handle)
@@ -259,22 +266,20 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) 
		child = parent;

	}

	if (!child) {

		printk(KERN_ERR "%s: Unable to find root bus for: ",

		       __func__);

		acpi_ns_print_node_pathname(device_handle, NULL);

		printk("\n");

		printk(KERN_ERR "%s: Unable to find root bus for: %s\n",

		       __func__, (char *)name_buffer.pointer);

		BUG();

	}



	status = acpi_evaluate_integer(child, METHOD_NAME__ADR, NULL, &adr);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR "%s: Unable to get _ADR (0x%x) for: ",

		       __func__, status);

		acpi_ns_print_node_pathname(child, NULL);

		printk("\n");

		printk(KERN_ERR "%s: Unable to get _ADR (0x%x) for: %s\n",

		       __func__, status, (char *)name_buffer.pointer);

		panic("%s: Unable to find host devfn\n", __func__);

	}



	kfree(name_buffer.pointer);



	slot = (adr >> 16) & 0xffff;

	function = adr & 0xffff;

	devfn = PCI_DEVFN(slot, function);
@@ -300,27 +305,28 @@ find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv) 
	int function;

	int slot;

	struct sn_pcidev_match *info = context;

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };



        status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,

                                       &adr);

        if (ACPI_SUCCESS(status)) {

		status = acpi_get_parent(handle, &parent);

		if (ACPI_FAILURE(status)) {

			acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

			printk(KERN_ERR

			       "%s: acpi_get_parent() failed (0x%x) for: ",

					__func__, status);

			acpi_ns_print_node_pathname(handle, NULL);

			printk("\n");

			       "%s: acpi_get_parent() failed (0x%x) for: %s\n",

				__func__, status, (char *)name_buffer.pointer);

			kfree(name_buffer.pointer);

			return AE_OK;

		}

		status = acpi_evaluate_integer(parent, METHOD_NAME__BBN,

					       NULL, &bbn);

		if (ACPI_FAILURE(status)) {

			acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);

			printk(KERN_ERR

			  "%s: Failed to find _BBN in parent of: ",

					__func__);

			acpi_ns_print_node_pathname(handle, NULL);

			printk("\n");

			  "%s: Failed to find _BBN in parent of: %s\n",

					__func__, (char *)name_buffer.pointer);

			kfree(name_buffer.pointer);

			return AE_OK;

		}
@@ -350,24 +356,27 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
	acpi_handle rootbus_handle;

	unsigned long long segment;

	acpi_status status;

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };



	rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;

        status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL,

                                       &segment);

        if (ACPI_SUCCESS(status)) {

		if (segment != pci_domain_nr(dev)) {

			acpi_get_name(rootbus_handle, ACPI_FULL_PATHNAME,

				&name_buffer);

			printk(KERN_ERR

			       "%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");

			       "%s: Segment number mismatch, 0x%llx vs 0x%x for: %s\n",

			       __func__, segment, pci_domain_nr(dev),

			       (char *)name_buffer.pointer);

			kfree(name_buffer.pointer);

			return 1;

		}

	} else {

		printk(KERN_ERR "%s: Unable to get __SEG from: ",

		       __func__);

		acpi_ns_print_node_pathname(rootbus_handle, NULL);

		printk("\n");

		acpi_get_name(rootbus_handle, ACPI_FULL_PATHNAME, &name_buffer);

		printk(KERN_ERR "%s: Unable to get __SEG from: %s\n",

		       __func__, (char *)name_buffer.pointer);

		kfree(name_buffer.pointer);

		return 1;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE