This is a note to let you know that I've just added the patch titled
firmware/psci: Fix MEM_PROTECT_RANGE function numbers
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
firmware-psci-fix-mem_protect_range-function-numbers.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f3dc61cde80d48751999c4cb46daf3b2185e6895 Mon Sep 17 00:00:00 2001
From: Will Deacon <will@xxxxxxxxxx>
Date: Fri, 25 Nov 2022 10:18:26 +0000
Subject: firmware/psci: Fix MEM_PROTECT_RANGE function numbers
From: Will Deacon <will@xxxxxxxxxx>
commit f3dc61cde80d48751999c4cb46daf3b2185e6895 upstream.
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@xxxxxxxxxx>
Cc: Lorenzo Pieralisi <lpieralisi@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Fixes: 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")
Acked-by: Marc Zyngier <maz@xxxxxxxxxx>
Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
Link: https://lore.kernel.org/r/20221125101826.22404-1-will@xxxxxxxxxx
Signed-off-by: Will Deacon <will@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/uapi/linux/psci.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index 3511095c2702..42a40ad3fb62 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -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
--
2.39.0
Patches currently in stable-queue which might be from will@xxxxxxxxxx are
queue-6.1/arm64-signal-always-accept-sve-signal-frames-on-sme-only-systems.patch
queue-6.1/arm64-signal-always-allocate-sve-signal-frames-on-sme-only-systems.patch
queue-6.1/arm64-mm-add-pud_user_exec-check-in-pud_user_accessible_page.patch
queue-6.1/elfcore-add-a-cprm-parameter-to-elf_core_extra_-phdrs-data_size.patch
queue-6.1/arm64-mte-fix-double-freeing-of-the-temporary-tag-storage-during-coredump.patch
queue-6.1/arm64-cmpxchg_double-hazard-against-entire-exchange-variable.patch
queue-6.1/firmware-psci-fix-mem_protect_range-function-numbers.patch
queue-6.1/arm64-ptrace-use-arm64_sme-to-guard-the-sme-register-enumerations.patch
queue-6.1/firmware-psci-don-t-register-with-debugfs-if-psci-isn-t-available.patch
queue-6.1/arm64-mte-avoid-the-racy-walk-of-the-vma-list-during-core-dump.patch
queue-6.1/arm64-mm-fix-incorrect-file_map_count-for-invalid-pmd.patch
