This is a note to let you know that I've just added the patch titled
firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 86e9c484caf9e9a03bb9d3df16f9daedb650e025
Author: Xiongfeng Wang <wangxiongfeng2@xxxxxxxxxx>
Date: Wed Oct 16 16:47:40 2024 +0800
firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state()
[ Upstream commit c83212d79be2c9886d3e6039759ecd388fd5fed1 ]
In sdei_device_freeze(), the input parameter of cpuhp_remove_state() is
passed as 'sdei_entry_point' by mistake. Change it to 'sdei_hp_state'.
Fixes: d2c48b2387eb ("firmware: arm_sdei: Fix sleep from invalid context BUG")
Signed-off-by: Xiongfeng Wang <wangxiongfeng2@xxxxxxxxxx>
Reviewed-by: James Morse <james.morse@xxxxxxx>
Link: https://lore.kernel.org/r/20241016084740.183353-1-wangxiongfeng2@xxxxxxxxxx
Signed-off-by: Will Deacon <will@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index b0e8752174c6f..f6627ccbc2d81 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -802,7 +802,7 @@ static int sdei_device_freeze(struct device *dev)
int err;
/* unregister private events */
- cpuhp_remove_state(sdei_entry_point);
+ cpuhp_remove_state(sdei_hp_state);
err = sdei_unregister_shared();
if (err)
