]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
firmware: arm_scmi: Fix ARCH_COLD_RESET
authorEtienne Carriere <etienne.carriere@linaro.org>
Thu, 8 Oct 2020 14:37:22 +0000 (16:37 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 10 Dec 2020 11:02:40 +0000 (12:02 +0100)
BugLink: https://bugs.launchpad.net/bugs/1904450
[ Upstream commit 45b9e04d5ba0b043783dfe2b19bb728e712cb32e ]

The defination for ARCH_COLD_RESET is wrong. Let us fix it according to
the SCMI specification.

Link: https://lore.kernel.org/r/20201008143722.21888-5-etienne.carriere@linaro.org
Fixes: 95a15d80aa0d ("firmware: arm_scmi: Add RESET protocol in SCMI v2.0")
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: William Breathitt Gray <william.gray@canonical.com>
drivers/firmware/arm_scmi/reset.c

index ab42c21c55175ddd81503a99af8a28fc06d3ca47..6d223f345b6c97ee7b36bf9b8b43c41cc58ebefb 100644 (file)
@@ -35,9 +35,7 @@ struct scmi_msg_reset_domain_reset {
 #define EXPLICIT_RESET_ASSERT  BIT(1)
 #define ASYNCHRONOUS_RESET     BIT(2)
        __le32 reset_state;
-#define ARCH_RESET_TYPE                BIT(31)
-#define COLD_RESET_STATE       BIT(0)
-#define ARCH_COLD_RESET                (ARCH_RESET_TYPE | COLD_RESET_STATE)
+#define ARCH_COLD_RESET                0
 };
 
 struct reset_dom_info {