Commit 51cb465c authored by James Morse's avatar James Morse Committed by Lipeng Sang
Browse files

arm64/mm: Fix __enable_mmu() for new TGRAN range values 

stable inclusion
from stable-v5.10.153
commit c911f03f8d444e623724fddd82b07a7e1af42338
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64YCA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c911f03f8d444e623724fddd82b07a7e1af42338



--------------------------------

commit 26f55386 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.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-efi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/1615355590-21102-1-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLipeng Sang <sanglipeng1@jd.com>
parent 8411d7af

arch/arm64/include/asm/sysreg.h

+14 −6
Original line number Diff line number Diff line
@@ -865,6 +865,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
@@ -1032,13 +1037,16 @@ 


#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_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_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_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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ efi_status_t check_platform_features(void) 
		return 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