Commit f3dc61cd authored by Will Deacon's avatar Will Deacon
Browse files

firmware/psci: Fix MEM_PROTECT_RANGE function numbers 



PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE
call using function identifier 20.

Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in
the PSCI UAPI header.

Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Fixes: 3137f2e6 ("firmware/psci: Add debugfs support to ease debugging")
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20221125101826.22404-1-will@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent f26cd737

include/uapi/linux/psci.h

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


#define PSCI_1_1_FN_SYSTEM_RESET2		PSCI_0_2_FN(18)

#define PSCI_1_1_FN_MEM_PROTECT			PSCI_0_2_FN(19)

#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(19)

#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(20)



#define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND	PSCI_0_2_FN64(12)

#define PSCI_1_0_FN64_NODE_HW_STATE		PSCI_0_2_FN64(13)
@@ -67,7 +67,7 @@ 
#define PSCI_1_0_FN64_STAT_COUNT		PSCI_0_2_FN64(17)



#define PSCI_1_1_FN64_SYSTEM_RESET2		PSCI_0_2_FN64(18)

#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(19)

#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(20)



/* PSCI v0.2 power state encoding for CPU_SUSPEND function */

#define PSCI_0_2_POWER_STATE_ID_MASK		0xffff