From 7a7ea6d35bfcf0b5a10c1ef280e03fce4479fddb Mon Sep 17 00:00:00 2001 From: xiewen3 Date: Tue, 16 May 2023 23:11:28 +0800 Subject: [PATCH] LUR: Revert "BACKPORT: arm64: cpufeature: introduce helper cpu_has_hw_af()" The LRU function is not compatible with GKI, causing GKI to fail to start, so revert. This reverts commit 3b34499f4bbabc44f1e46239024ca4fe07a00461. Change-Id: I3f9a610dc3f0dbc9e935224956c1a21efc46d33d Reviewed-on: https://gerrit.mot.com/2609785 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- arch/arm64/include/asm/cpufeature.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 74bc372ec016..95f661f1933f 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -707,19 +707,6 @@ static inline u32 id_aa64mmfr0_parange_to_phys_shift(int parange) extern bool cpu_has_amu_feat(int cpu); #endif -/* Check whether hardware update of the Access flag is supported */ -static inline bool cpu_has_hw_af(void) -{ - u64 mmfr1; - - if (!IS_ENABLED(CONFIG_ARM64_HW_AFDBM)) - return false; - - mmfr1 = read_cpuid(ID_AA64MMFR1_EL1); - return cpuid_feature_extract_unsigned_field(mmfr1, - ID_AA64MMFR1_HADBS_SHIFT); -} - #endif /* __ASSEMBLY__ */ #endif