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

Commit dbbe4649 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:
  ACPI / Sleep: Allow the NVS saving to be skipped during suspend to RAM
  ACPI: create "processor.bm_check_disable" boot param
  ACPI: skip checking BM_STS if the BIOS doesn't ask for it
  ACPI: fix unused function warning
  ACPI: processor: fix processor_physically_present on UP
  ACPI video: fix string mismatch for Sony SR290 laptop
  ACPI battery: don't invoke power_supply_changed twice when battery is hot-added
  ACPI: handle systems which asynchoronously enable ACPI mode
parents 24b1442d 0e1cf388

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Diff line number Diff line
@@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de> 


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



What:	The acpi_sleep=s4_nonvs command line option

When:	2.6.37

Files:	arch/x86/kernel/acpi/sleep.c

Why:	superseded by acpi_sleep=nonvs

Who:	Rafael J. Wysocki <rjw@sisk.pl>



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

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file 
			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.

			nonvs prevents the kernel from saving/restoring the

			ACPI NVS memory during suspend/hibernation and resume.

			sci_force_enable causes the kernel to set SCI_EN directly

			on resume from S1/S3 (which is against the ACPI spec,

			but some broken systems don't work without it).

arch/x86/kernel/acpi/cstate.c

+9 −0
Original line number Diff line number Diff line
@@ -145,6 +145,15 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, 
		percpu_entry->states[cx->index].eax = cx->address;

		percpu_entry->states[cx->index].ecx = MWAIT_ECX_INTERRUPT_BREAK;

	}



	/*

	 * For _CST FFH on Intel, if GAS.access_size bit 1 is cleared,

	 * then we should skip checking BM_STS for this C-state.

	 * ref: "Intel Processor Vendor-Specific ACPI Interface Specification"

	 */

	if ((c->x86_vendor == X86_VENDOR_INTEL) && !(reg->access_size & 0x2))

		cx->bm_sts_skip = 1;



	return retval;

}

EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe);

arch/x86/kernel/acpi/sleep.c

+7 −2
Original line number Diff line number Diff line
@@ -157,9 +157,14 @@ static int __init acpi_sleep_setup(char *str) 
#ifdef CONFIG_HIBERNATION

		if (strncmp(str, "s4_nohwsig", 10) == 0)

			acpi_no_s4_hw_signature();

		if (strncmp(str, "s4_nonvs", 8) == 0)

			acpi_s4_no_nvs();

		if (strncmp(str, "s4_nonvs", 8) == 0) {

			pr_warning("ACPI: acpi_sleep=s4_nonvs is deprecated, "

					"please use acpi_sleep=nonvs instead");

			acpi_nvs_nosave();

		}

#endif

		if (strncmp(str, "nonvs", 5) == 0)

			acpi_nvs_nosave();

		if (strncmp(str, "old_ordering", 12) == 0)

			acpi_old_suspend_ordering();

		str = strchr(str, ',');

drivers/acpi/acpica/evxfevnt.c

+11 −8
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
acpi_status acpi_enable(void)

{

	acpi_status status;

	int retry;



	ACPI_FUNCTION_TRACE(acpi_enable);
@@ -98,16 +99,18 @@ acpi_status acpi_enable(void) 


	/* Sanity check that transition succeeded */



	if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {

		ACPI_ERROR((AE_INFO,

			    "Hardware did not enter ACPI mode"));

		return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);

	for (retry = 0; retry < 30000; ++retry) {

		if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {

			if (retry != 0)

				ACPI_WARNING((AE_INFO,

				"Platform took > %d00 usec to enter ACPI mode", retry));

			return_ACPI_STATUS(AE_OK);

		}

		acpi_os_stall(100);	/* 100 usec */

	}



	ACPI_DEBUG_PRINT((ACPI_DB_INIT,

			  "Transition to ACPI mode successful\n"));



	return_ACPI_STATUS(AE_OK);

	ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode"));

	return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);

}



ACPI_EXPORT_SYMBOL(acpi_enable)