From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 723A11EABC7; Wed, 6 Nov 2024 12:44:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897044; cv=none; b=tpkgySGH/BFvcwQBIAjq8ij/e9NINhg05MV/4G1o2MWiftzsbf/ceFNevzL/4OZol1o0pRu6cH2QVdJBmUkLcjXEirAoIuJep761Emx/0I01n9h5ZjVnW8P61ArBMqp+Um7H/VpNWupGFu20RWpNyXhl6CajRvRfVpWczDAgXdc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897044; c=relaxed/simple; bh=Rt91iS6ZwAPpYj9mc3xJTQ35EL+2kM+xX6jPiRy0wVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XhEjdbjM3meXlI8/eJ0ZOQQXDNQPx3TyV8NhLRqp608dk++18gilnaft5dkIDP5ZlH+cUd3UXJ5xfHq427qAupSpOOYLc6O6hXYiNekUlvCxlcGWvsb70cdZHu9j//UjoQ+1FT4Lh7ILhCptnRxnyUlx+SRgWwKVSKxUmT3gCXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X8HGryt+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="X8HGryt+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E66AEC4CECD; Wed, 6 Nov 2024 12:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897044; bh=Rt91iS6ZwAPpYj9mc3xJTQ35EL+2kM+xX6jPiRy0wVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X8HGryt+k3hKLgkFY5DsbhzWAmNvZfwKzUllcXXsc0lby+LTUSG0niHiisFcRIi8r ThYdQk1dxehyqQvxhApcIdls7UU3MdQ71xKkuzrWmGsh3eufAgLKX/eVLhsnIjWNC2 +qDoFJ4cl3XjqQJRIpq/CGsJ1F1SqhD4kogp4jjI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiongfeng Wang , James Morse , Will Deacon , Sasha Levin Subject: [PATCH 6.1 048/126] firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state() Date: Wed, 6 Nov 2024 13:04:09 +0100 Message-ID: <20241106120307.403492628@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120306.038154857@linuxfoundation.org> References: <20241106120306.038154857@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiongfeng Wang [ 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 Reviewed-by: James Morse Link: https://lore.kernel.org/r/20241016084740.183353-1-wangxiongfeng2@huawei.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/firmware/arm_sdei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index 285fe7ad490d1..3e8051fe82965 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -763,7 +763,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) -- 2.43.0