Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0302bc6 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into release 



Conflicts:
	include/acpi/acpixf.h

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 106ad8d6 237889bf

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,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

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/x86/kernel/acpi/boot.c

+5 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#endif



static int __initdata acpi_force = 0;



u32 acpi_rsdt_forced;

#ifdef	CONFIG_ACPI

int acpi_disabled = 0;

#else
@@ -1794,6 +1794,10 @@ static int __init parse_acpi(char *arg) 
			disable_acpi();

		acpi_ht = 1;

	}

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

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

		acpi_rsdt_forced = 1;

	}

	/* "acpi=noirq" disables ACPI interrupt routing */

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

		acpi_noirq_set();

arch/x86/kernel/acpi/cstate.c

+3 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static struct cstate_entry *cpu_cstate_entry; /* per CPU ptr */ 
static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];



#define MWAIT_SUBSTATE_MASK	(0xf)

#define MWAIT_CSTATE_MASK	(0xf)

#define MWAIT_SUBSTATE_SIZE	(4)



#define CPUID_MWAIT_LEAF (5)
@@ -98,7 +99,8 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, 
	cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx);



	/* Check whether this particular cx_type (in CST) is supported or not */

	cstate_type = (cx->address >> MWAIT_SUBSTATE_SIZE) + 1;

	cstate_type = ((cx->address >> MWAIT_SUBSTATE_SIZE) &

			MWAIT_CSTATE_MASK) + 1;

	edx_part = edx >> (cstate_type * MWAIT_SUBSTATE_SIZE);

	num_cstate_subtype = edx_part & MWAIT_SUBSTATE_MASK;

drivers/acpi/acpica/tbutils.c

+2 −1
Original line number Diff line number Diff line
@@ -445,7 +445,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) 


	/* Differentiate between RSDT and XSDT root tables */



	if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {

	if (rsdp->revision > 1 && rsdp->xsdt_physical_address

			&& !acpi_rsdt_forced) {

		/*

		 * Root table is an XSDT (64-bit physical addresses). We must use the

		 * XSDT if the revision is > 1 and the XSDT pointer is present, as per