Commit a3d3203e 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: (34 commits)
  ACPI: processor: push file static MADT pointer into internal map_madt_entry()
  ACPI: processor: refactor internal map_lsapic_id()
  ACPI: processor: refactor internal map_x2apic_id()
  ACPI: processor: refactor internal map_lapic_id()
  ACPI: processor: driver doesn't need to evaluate _PDC
  ACPI: processor: remove early _PDC optin quirks
  ACPI: processor: add internal processor_physically_present()
  ACPI: processor: move acpi_get_cpuid into processor_core.c
  ACPI: processor: export acpi_get_cpuid()
  ACPI: processor: mv processor_pdc.c processor_core.c
  ACPI: processor: mv processor_core.c processor_driver.c
  ACPI: plan to delete "acpi=ht" boot option
  ACPI: remove "acpi=ht" DMI blacklist
  PNPACPI: add bus number support
  PNPACPI: add window support
  resource: add window support
  resource: add bus number support
  resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type
  acpiphp: Execute ACPI _REG method for hotadded devices
  ACPI video: Be more liberal in validating _BQC behaviour
  ...
parents f937331b ec28dcc6

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Diff line number Diff line
@@ -582,3 +582,10 @@ Why: The paravirt mmu host support is slower than non-paravirt mmu, both 
Who:	Avi Kivity <avi@redhat.com>



----------------------------



What: 	"acpi=ht" boot option

When:	2.6.35

Why:	Useful in 2003, implementation is a hack.

	Generally invoked by accident today.

	Seen as doing more harm than good.

Who:	Len Brown <len.brown@intel.com>

Documentation/kernel-parameters.txt

+0 −4
Original line number Diff line number Diff line
@@ -200,10 +200,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			acpi_display_output=video

			See above.



	acpi_early_pdc_eval	[HW,ACPI] Evaluate processor _PDC methods

				early. Needed on some platforms to properly

				initialize the EC.



	acpi_irq_balance [HW,ACPI]

			ACPI will balance active IRQs

			default in APIC mode

arch/ia64/kernel/acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/efi.h>

#include <linux/mmzone.h>

#include <linux/nodemask.h>

#include <acpi/processor.h>

#include <asm/io.h>

#include <asm/iosapic.h>

#include <asm/machvec.h>
@@ -907,6 +908,8 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	cpu_set(cpu, cpu_present_map);

	ia64_cpu_to_sapicid[cpu] = physid;



	acpi_processor_set_pdc(handle);



	*pcpu = cpu;

	return (0);

}

arch/x86/kernel/acpi/boot.c

+6 −94
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) 
 *  ACPI based hotplug support for CPU

 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

#include <acpi/processor.h>



static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{
@@ -567,6 +568,8 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) 
		goto free_new_map;

	}



	acpi_processor_set_pdc(handle);



	cpu = cpumask_first(new_map);

	acpi_map_cpu2node(handle, cpu, physid);
@@ -1292,23 +1295,6 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d) 
	return 0;

}



/*

 * Limit ACPI to CPU enumeration for HT

 */

static int __init force_acpi_ht(const struct dmi_system_id *d)

{

	if (!acpi_force) {

		printk(KERN_NOTICE "%s detected: force use of acpi=ht\n",

		       d->ident);

		disable_acpi();

		acpi_ht = 1;

	} else {

		printk(KERN_NOTICE

		       "Warning: acpi=force overrules DMI blacklist: acpi=ht\n");

	}

	return 0;

}



/*

 * Force ignoring BIOS IRQ0 pin2 override

 */
@@ -1344,82 +1330,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { 
		     },

	 },



	/*

	 * Boxes that need acpi=ht

	 */

	{

	 .callback = force_acpi_ht,

	 .ident = "FSC Primergy T850",

	 .matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "PRIMERGY T850"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "HP VISUALIZE NT Workstation",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP VISUALIZE NT Workstation"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "Compaq Workstation W8000",

	 .matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "Workstation W8000"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "ASUS CUR-DLS",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),

		     DMI_MATCH(DMI_BOARD_NAME, "CUR-DLS"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "ABIT i440BX-W83977",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "ABIT <http://www.abit.com>"),

		     DMI_MATCH(DMI_BOARD_NAME, "i440BX-W83977 (BP6)"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "IBM Bladecenter",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),

		     DMI_MATCH(DMI_BOARD_NAME, "IBM eServer BladeCenter HS20"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "IBM eServer xSeries 360",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),

		     DMI_MATCH(DMI_BOARD_NAME, "eServer xSeries 360"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "IBM eserver xSeries 330",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),

		     DMI_MATCH(DMI_BOARD_NAME, "eserver xSeries 330"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "IBM eserver xSeries 440",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"),

		     },

	 },



	/*

	 * Boxes that need ACPI PCI IRQ routing disabled

	 */
@@ -1652,8 +1562,10 @@ static int __init parse_acpi(char *arg) 
	}

	/* Limit ACPI just to boot-time to enable HT */

	else if (strcmp(arg, "ht") == 0) {

		if (!acpi_force)

		if (!acpi_force) {

			printk(KERN_WARNING "acpi=ht will be removed in Linux-2.6.35\n");

			disable_acpi();

		}

		acpi_ht = 1;

	}

	/* acpi=rsdt use RSDT instead of XSDT */

drivers/acpi/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ acpi-$(CONFIG_ACPI_SLEEP) += proc.o 
#

acpi-y				+= bus.o glue.o

acpi-y				+= scan.o

acpi-y				+= processor_pdc.o

acpi-y				+= processor_core.o

acpi-y				+= ec.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
@@ -61,7 +61,7 @@ obj-$(CONFIG_ACPI_SBS) += sbs.o 
obj-$(CONFIG_ACPI_POWER_METER)	+= power_meter.o



# processor has its own "processor." module_param namespace

processor-y			:= processor_core.o processor_throttling.o

processor-y			:= processor_driver.o processor_throttling.o

processor-y			+= processor_idle.o processor_thermal.o

processor-$(CONFIG_CPU_FREQ)	+= processor_perflib.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE