Skip to content

Commit f3dc61c

Browse files
committed
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: 3137f2e ("firmware/psci: Add debugfs support to ease debugging") Acked-by: Marc Zyngier <maz@kernel.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20221125101826.22404-1-will@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
1 parent f26cd73 commit f3dc61c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

include/uapi/linux/psci.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
#define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18)
6060
#define PSCI_1_1_FN_MEM_PROTECT PSCI_0_2_FN(19)
61-
#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(19)
61+
#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(20)
6262

6363
#define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND PSCI_0_2_FN64(12)
6464
#define PSCI_1_0_FN64_NODE_HW_STATE PSCI_0_2_FN64(13)
@@ -67,7 +67,7 @@
6767
#define PSCI_1_0_FN64_STAT_COUNT PSCI_0_2_FN64(17)
6868

6969
#define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18)
70-
#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(19)
70+
#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(20)
7171

7272
/* PSCI v0.2 power state encoding for CPU_SUSPEND function */
7373
#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff

0 commit comments

Comments
 (0)