ACPI fix for 6.4-rc8
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. -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmSRzgISHHJqd0Byand5 c29ja2kubmV0AAoJEILEb/54YlRx7xAP/ifRMO55I2+K4oGO36Iol07TJASzSU6Q mVk5/rw4LbcS/WnONO3T77hkBTCQ/uILkMImV/OwPQgOA+n6Fg5fKQMdGG8tamQb FAJUE0TBDFLSGLl3YjoqYz3euA1ldZvivAukPSfom8G1Xoqcyrx6PfHqMKzL5JQt fLb+8WOPkxtMt6fJ/iWFewkXHMU2/ZqiOpvaCOG3+SrBtf6S+EKnZmiQSxLaZ3o1 LK2Dx5lIWVT+aR6EgrF+3Vvrex0vry7MOI/7da8g3ou9newklAgtGAgUH1sqMDfp dlQv0gksdCnNeBn5mtbcb3ZGsedaoy77WNrdzWod2psySCo0mgE+F8c7iEFBccZW ss9a4Ev7fCtaghrxv/SSvn3CHFdM7wBvRnfrBJhCHTcr93hu8HiSS5GZKEDuRQye wYSCgxHA7YTIetHcb0FZxnJgYHKihqD3qoaKlXcbd2cQXvGJGIGRcWw7COggNpw8 D3TR6/kJiePzEwuTV7EVlsGS26UjSBA73eXsMTxn4CyzJbO5oveLsMmkzMjVathg s/pJIBXnU4i3nTdLjTezioAODhfIAkA7i/c61ZO3Y+bNgve5EoyT5MuFOsejBX3L SJus945AFKNFLzuGVxsvlG+dc1P2fApo10gf5jE5gG9Xo1HLyiHfYK+1Lu5+dKW0 5LLGa6rd/NOs =FyLX -----END PGP SIGNATURE----- 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()
This commit is contained in:
commit
e660abd551
|
@ -101,8 +101,6 @@ acpi_status
|
||||||
acpi_hw_get_gpe_status(struct acpi_gpe_event_info *gpe_event_info,
|
acpi_hw_get_gpe_status(struct acpi_gpe_event_info *gpe_event_info,
|
||||||
acpi_event_status *event_status);
|
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_runtime_gpes(void);
|
||||||
|
|
||||||
acpi_status acpi_hw_enable_all_wakeup_gpes(void);
|
acpi_status acpi_hw_enable_all_wakeup_gpes(void);
|
||||||
|
|
|
@ -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
|
* Disable all GPE and clear their status bits before interrupts are
|
||||||
* (like wakeup GPE) haven't handler, this can avoid such GPE misfire.
|
* enabled. Some GPEs (like wakeup GPEs) have no handlers and this can
|
||||||
* acpi_leave_sleep_state will reenable specific GPEs later
|
* 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. */
|
/* Allow EC transactions to happen. */
|
||||||
acpi_ec_unblock_transactions();
|
acpi_ec_unblock_transactions();
|
||||||
|
|
||||||
|
|
|
@ -761,6 +761,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
|
||||||
acpi_event_status
|
acpi_event_status
|
||||||
*event_status))
|
*event_status))
|
||||||
ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))
|
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_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_runtime_gpes(void))
|
||||||
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))
|
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))
|
||||||
|
|
Loading…
Reference in New Issue