firmware/psci: Fix MEM_PROTECT_RANGE function numbers
PATCH 1/1 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.
--- include/uapi/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/psci.h +2 -2
@@ -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
Signature · 7 lines
2.38.1.584.g0f3c55d4c2-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 35 lines · Marc Zyngier
Quoted 33 lines · Will Deacon
PSCI v1.1 offers 32-bit and 64-bit variants of the
MEM_PROTECT_RANGEcall using function identifier 20.Fix the incorrect definitions of the
MEM_PROTECT_CHECK_RANGEcalls in the PSCI UAPI header.Cc Dmitry Baryshkov <[email protected]>Cc Mark Rutland <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Arnd Bergmann <[email protected]>Fixes 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")Signed-off-by Will Deacon <[email protected]>--- include/uapi/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/psci.h +1
-1@@ -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)
Quoted 8 lines
include/uapi/linux/psci.h line 73
Quoted 6 lines
include/uapi/linux/psci.h +1
-1#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 0xffffAcked-by Marc Zyngier <[email protected]>
Likewise:
Quoted 1 line
Should this be taken via the arm64 tree, together with [1]?
Yes please to both being queued via the arm64 tree.
Sorry for droppnig the ball here.
Going forward I'll try to be explicit w.r.t. how to queue PSCI bits; I'd be happy to route them through arm64 generally if that arm64 maintainers are happy with that.
Thanks,
Mark.
Quoted 9 lines
Thanks,
M.[1] https://lore.kernel.org/r/[email protected]
Signature · 1 line
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 31 lines · Will Deacon
PSCI v1.1 offers 32-bit and 64-bit variants of the
MEM_PROTECT_RANGEcall using function identifier 20.Fix the incorrect definitions of the
MEM_PROTECT_CHECK_RANGEcalls in the PSCI UAPI header.Cc Dmitry Baryshkov <[email protected]>Cc Mark Rutland <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Arnd Bergmann <[email protected]>Fixes 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")Signed-off-by Will Deacon <[email protected]>--- include/uapi/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/psci.h +1
-1@@ -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)
include/uapi/linux/psci.h line 73
Quoted 8 lines
include/uapi/linux/psci.h +1
-1@@ -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
Should this be taken via the arm64 tree, together with [1]?
Thanks,
M.
[1] https://lore.kernel.org/r/[email protected]
Signature · 6 lines
Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 51 lines · Mark Rutland
Quoted 35 lines · Marc Zyngier
Quoted 33 lines · Will Deacon
PSCI v1.1 offers 32-bit and 64-bit variants of the
MEM_PROTECT_RANGEcall using function identifier 20.Fix the incorrect definitions of the
MEM_PROTECT_CHECK_RANGEcalls in the PSCI UAPI header.Cc Dmitry Baryshkov <[email protected]>Cc Mark Rutland <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Arnd Bergmann <[email protected]>Fixes 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")Signed-off-by Will Deacon <[email protected]>--- include/uapi/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/psci.h +1
-1@@ -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)Quoted 8 lines
include/uapi/linux/psci.h line 73
Quoted 6 lines
include/uapi/linux/psci.h +1
-1#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 0xffffAcked-by Marc Zyngier <[email protected]>Likewise:
Acked-by Mark Rutland <[email protected]>Quoted 1 line
Should this be taken via the arm64 tree, together with [1]?
Quoted 7 lines
Yes please to both being queued via the arm64 tree.
Sorry for droppnig the ball here.
Going forward I'll try to be explicit w.r.t. how to queue PSCI bits; I'd be happy to route them through arm64 generally if that arm64 maintainers are happy with that.
Thanks, I'll sweep these two up as fixes, since I already have a few pending.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
AppliedQuoted 8 lines · Will Deacon
PSCI v1.1 offers 32-bit and 64-bit variants of the
MEM_PROTECT_RANGEcall using function identifier 20.Fix the incorrect definitions of the
MEM_PROTECT_CHECK_RANGEcalls in the PSCI UAPI header.[...]
Applied to arm64 (for-next/fixes), thanks!
[1/1] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
https://git.kernel.org/arm64/c/f3dc61cde80d
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel