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

Merge tag 'acpi-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Fix a kernel crash during early resume from ACPI S3 that has been
  present since the 5.15 cycle when might_sleep() was added to
  down_timeout(), which in some configurations of the kernel caused an
  implicit preemption point to trigger at a wrong time"

* tag 'acpi-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep()
parents c74e2ac2 22db0633

drivers/acpi/acpica/achware.h

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ acpi_status 
acpi_hw_get_gpe_status(struct acpi_gpe_event_info *gpe_event_info,

		       acpi_event_status *event_status);



acpi_status acpi_hw_disable_all_gpes(void);



acpi_status acpi_hw_enable_all_runtime_gpes(void);



acpi_status acpi_hw_enable_all_wakeup_gpes(void);

drivers/acpi/sleep.c

+12 −4
Original line number Diff line number Diff line
@@ -636,11 +636,19 @@ static int acpi_suspend_enter(suspend_state_t pm_state) 
	}



	/*

	 * Disable and clear GPE status before interrupt is enabled. Some GPEs

	 * (like wakeup GPE) haven't handler, this can avoid such GPE misfire.

	 * acpi_leave_sleep_state will reenable specific GPEs later

	 * Disable all GPE and clear their status bits before interrupts are

	 * enabled. Some GPEs (like wakeup GPEs) have no handlers and this can

	 * prevent them from producing spurious interrups.

	 *

	 * acpi_leave_sleep_state() will reenable specific GPEs later.

	 *

	 * Because this code runs on one CPU with disabled interrupts (all of

	 * the other CPUs are offline at this time), it need not acquire any

	 * sleeping locks which may trigger an implicit preemption point even

	 * if there is no contention, so avoid doing that by using a low-level

	 * library routine here.

	 */

	acpi_disable_all_gpes();

	acpi_hw_disable_all_gpes();

	/* Allow EC transactions to happen. */

	acpi_ec_unblock_transactions();

include/acpi/acpixf.h

+1 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
						     acpi_event_status

						     *event_status))

ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_hw_disable_all_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))