Patch "arm64/mm: Fix __enable_mmu() for new TGRAN range values" has been added to the 5.10-stable tree
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
arm64/mm: Fix __enable_mmu() for new TGRAN range values
to the 5.10-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:
arm64-mm-fix-__enable_mmu-for-new-tgran-range-values.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 26f55386f964cefa92ab7ccbed68f1a313074215 Mon Sep 17 00:00:00 2001
From: James Morse <[email protected]>
Date: Wed, 10 Mar 2021 11:23:10 +0530
Subject: arm64/mm: Fix __enable_mmu() for new TGRAN range values
From: James Morse <[email protected]>
commit 26f55386f964cefa92ab7ccbed68f1a313074215 upstream.
As per ARM ARM DDI 0487G.a, when FEAT_LPA2 is implemented, ID_AA64MMFR0_EL1 might contain a range of values to describe supported translation granules (4K and 16K pages sizes in particular) instead of just enabled or disabled values. This changes __enable_mmu() function to handle complete acceptable range of values (depending on whether the field is signed or unsigned) now represented with ID_AA64MMFR0_TGRAN_SUPPORTED_[MIN..MAX] pair. While here, also fix similar situations in EFI stub and KVM as well.
--- arch/arm64/include/asm/sysreg.h | 20 ++++++++++++++------ arch/arm64/kernel/head.S | 6 ++++-- arch/arm64/kvm/reset.c | 10 ++++++---- drivers/firmware/efi/libstub/arm64-stub.c | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-)
arch/arm64/include/asm/sysreg.h +14 -6
@@ -795,6 +795,11 @@#define ID_AA64MMFR0_PARANGE_48 0x5#define ID_AA64MMFR0_PARANGE_52 0x6 +#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_DEFAULT 0x0 +#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_NONE 0x1 +#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_MIN 0x2 +#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_MAX 0x7 +#ifdef CONFIG_ARM64_PA_BITS_52 #define ID_AA64MMFR0_PARANGE_MAX ID_AA64MMFR0_PARANGE_52#else
@@ -955,14 +960,17 @@#define ID_PFR1_PROGMOD_SHIFT 0#if defined(CONFIG_ARM64_4K_PAGES ) -#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN4_SHIFT -#define ID_AA64MMFR0_TGRAN_SUPPORTED ID_AA64MMFR0_TGRAN4_SUPPORTED +#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN4_SHIFT +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_TGRAN4_SUPPORTED +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX 0x7#elif defined(CONFIG_ARM64_16K_PAGES ) -#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN16_SHIFT -#define ID_AA64MMFR0_TGRAN_SUPPORTED ID_AA64MMFR0_TGRAN16_SUPPORTED +#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN16_SHIFT +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_TGRAN16_SUPPORTED +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX 0xF#elif defined(CONFIG_ARM64_64K_PAGES ) -#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN64_SHIFT -#define ID_AA64MMFR0_TGRAN_SUPPORTED ID_AA64MMFR0_TGRAN64_SUPPORTED +#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN64_SHIFT +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_TGRAN64_SUPPORTED +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX 0x7#endif #define MVFR2_FPMISC_SHIFT 4
arch/arm64/kernel/head.S +4 -2
@@ -797,8 +797,10 @@ SYM_FUNC_END(__secondary_too_slow) SYM_FUNC_START(__enable_mmu) mrs x2, ID_AA64MMFR0_EL1 ubfx x2, x2, #ID_AA64MMFR0_TGRAN_SHIFT, 4 - cmp x2, #ID_AA64MMFR0_TGRAN_SUPPORTED - b.ne __no_granule_support + cmp x2, #ID_AA64MMFR0_TGRAN_SUPPORTED_MIN + b.lt __no_granule_support + cmp x2, #ID_AA64MMFR0_TGRAN_SUPPORTED_MAX + b.gt __no_granule_support update_early_cpu_boot_status 0, x2, x3 adrp x2, idmap_pg_dir phys_to_ttbr x1, x1
arch/arm64/kvm/reset.c +6 -4
@@ -397,16 +397,18 @@ int kvm_set_ipa_limit(void) }switch (cpuid_feature_extract_unsigned_field (mmfr0, tgran_2)) { -default : -case 1 : +case ID_AA64MMFR0_TGRAN_2_SUPPORTED_NONE :kvm_err ("PAGE_SIZE not supported at Stage-2, giving up\n" );return -EINVAL ; -case 0 : +case ID_AA64MMFR0_TGRAN_2_SUPPORTED_DEFAULT :kvm_debug ("PAGE_SIZE supported at Stage-2 (default)\n" );break ; -case 2 : + case ID_AA64MMFR0_TGRAN_2_SUPPORTED_MIN ... ID_AA64MMFR0_TGRAN_2_SUPPORTED_MAX:kvm_debug ("PAGE_SIZE supported at Stage-2 (advertised)\n" );break ; +default : +kvm_err ("Unsupported value for TGRAN_2, giving up\n" ); +return -EINVAL ; } kvm_ipa_limit =id_aa64mmfr0_parange_to_phys_shift (parange);
drivers/firmware/efi/libstub/arm64-stub.c +1 -1
@@ -24,7 +24,7 @@ efi_status_t check_platform_features(voireturn EFI_SUCCESS ; tg = (read_cpuid (ID_AA64MMFR0_EL1 ) >>ID_AA64MMFR0_TGRAN_SHIFT ) &0xf ; -if (tg !=ID_AA64MMFR0_TGRAN_SUPPORTED ) { +if (tg <ID_AA64MMFR0_TGRAN_SUPPORTED_MIN || tg >ID_AA64MMFR0_TGRAN_SUPPORTED_MAX ) {if (IS_ENABLED (CONFIG_ARM64_64K_PAGES ))efi_err ("This 64 KB granular kernel is not supported by your CPU\n" );else
Patches currently in stable-queue which might be from [email protected] are
queue-5.10/arm64-add-ampere1-to-the-spectre-bhb-affected-list.patch queue-5.10/arm64-kexec-test-page-size-support-with-new-tgran-range-values.patch queue-5.10/arm64-mm-fix-__enable_mmu-for-new-tgran-range-values.patch
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm