Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62c94444 authored by James Morse's avatar James Morse Committed by Sami Tolvanen
Browse files

BACKPORT: arm64: cpufeature: Change read_cpuid() to use sysreg's mrs_s macro 



Older assemblers may not have support for newer feature registers. To get
round this, sysreg.h provides a 'mrs_s' macro that takes a register
encoding and generates the raw instruction.

Change read_cpuid() to use mrs_s in all cases so that new registers
don't have to be a special case. Including sysreg.h means we need to move
the include and definition of read_cpuid() after the #ifndef __ASSEMBLY__
to avoid syntax errors in vmlinux.lds.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>

Bug: 31432001
Change-Id: I14b627485c39a8ce180360409b5ecdc6fc5a874b
(cherry picked from commit 0f54b14e76f5302afe164dc911b049b5df836ff5)
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent f48bd3b5

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ u64 read_system_reg(u32 id); 


static inline bool cpu_supports_mixed_endian_el0(void)

{

	return id_aa64mmfr0_mixed_endian_el0(read_cpuid(ID_AA64MMFR0_EL1));

	return id_aa64mmfr0_mixed_endian_el0(read_cpuid(SYS_ID_AA64MMFR0_EL1));

}



static inline bool system_supports_mixed_endian_el0(void)

arch/arm64/include/asm/cputype.h

+11 −9
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 
#define MPIDR_AFFINITY_LEVEL(mpidr, level) \

	((mpidr >> MPIDR_LEVEL_SHIFT(level)) & MPIDR_LEVEL_MASK)



#define read_cpuid(reg) ({						\

	u64 __val;							\

	asm("mrs	%0, " #reg : "=r" (__val));			\

	__val;								\

})



#define MIDR_REVISION_MASK	0xf

#define MIDR_REVISION(midr)	((midr) & MIDR_REVISION_MASK)

#define MIDR_PARTNUM_SHIFT	4
@@ -74,6 +68,14 @@ 


#ifndef __ASSEMBLY__



#include <asm/sysreg.h>



#define read_cpuid(reg) ({						\

	u64 __val;							\

	asm("mrs_s	%0, " __stringify(reg) : "=r" (__val));		\

	__val;								\

})



/*

 * The CPU ID never changes at run time, so we might as well tell the

 * compiler that it's constant.  Use this function to read the CPU ID
@@ -81,12 +83,12 @@ 
 */

static inline u32 __attribute_const__ read_cpuid_id(void)

{

	return read_cpuid(MIDR_EL1);

	return read_cpuid(SYS_MIDR_EL1);

}



static inline u64 __attribute_const__ read_cpuid_mpidr(void)

{

	return read_cpuid(MPIDR_EL1);

	return read_cpuid(SYS_MPIDR_EL1);

}



static inline unsigned int __attribute_const__ read_cpuid_implementor(void)
@@ -101,7 +103,7 @@ static inline unsigned int __attribute_const__ read_cpuid_part_number(void) 


static inline u32 __attribute_const__ read_cpuid_cachetype(void)

{

	return read_cpuid(CTR_EL0);

	return read_cpuid(SYS_CTR_EL0);

}

#endif /* __ASSEMBLY__ */

arch/arm64/kernel/cpufeature.c

+29 −29
Original line number Diff line number Diff line
@@ -762,35 +762,35 @@ static inline void set_sys_caps_initialised(void) 
static u64 __raw_read_system_reg(u32 sys_id)

{

	switch (sys_id) {

	case SYS_ID_PFR0_EL1:		return (u64)read_cpuid(ID_PFR0_EL1);

	case SYS_ID_PFR1_EL1:		return (u64)read_cpuid(ID_PFR1_EL1);

	case SYS_ID_DFR0_EL1:		return (u64)read_cpuid(ID_DFR0_EL1);

	case SYS_ID_MMFR0_EL1:		return (u64)read_cpuid(ID_MMFR0_EL1);

	case SYS_ID_MMFR1_EL1:		return (u64)read_cpuid(ID_MMFR1_EL1);

	case SYS_ID_MMFR2_EL1:		return (u64)read_cpuid(ID_MMFR2_EL1);

	case SYS_ID_MMFR3_EL1:		return (u64)read_cpuid(ID_MMFR3_EL1);

	case SYS_ID_ISAR0_EL1:		return (u64)read_cpuid(ID_ISAR0_EL1);

	case SYS_ID_ISAR1_EL1:		return (u64)read_cpuid(ID_ISAR1_EL1);

	case SYS_ID_ISAR2_EL1:		return (u64)read_cpuid(ID_ISAR2_EL1);

	case SYS_ID_ISAR3_EL1:		return (u64)read_cpuid(ID_ISAR3_EL1);

	case SYS_ID_ISAR4_EL1:		return (u64)read_cpuid(ID_ISAR4_EL1);

	case SYS_ID_ISAR5_EL1:		return (u64)read_cpuid(ID_ISAR4_EL1);

	case SYS_MVFR0_EL1:		return (u64)read_cpuid(MVFR0_EL1);

	case SYS_MVFR1_EL1:		return (u64)read_cpuid(MVFR1_EL1);

	case SYS_MVFR2_EL1:		return (u64)read_cpuid(MVFR2_EL1);



	case SYS_ID_AA64PFR0_EL1:	return (u64)read_cpuid(ID_AA64PFR0_EL1);

	case SYS_ID_AA64PFR1_EL1:	return (u64)read_cpuid(ID_AA64PFR0_EL1);

	case SYS_ID_AA64DFR0_EL1:	return (u64)read_cpuid(ID_AA64DFR0_EL1);

	case SYS_ID_AA64DFR1_EL1:	return (u64)read_cpuid(ID_AA64DFR0_EL1);

	case SYS_ID_AA64MMFR0_EL1:	return (u64)read_cpuid(ID_AA64MMFR0_EL1);

	case SYS_ID_AA64MMFR1_EL1:	return (u64)read_cpuid(ID_AA64MMFR1_EL1);

	case SYS_ID_AA64ISAR0_EL1:	return (u64)read_cpuid(ID_AA64ISAR0_EL1);

	case SYS_ID_AA64ISAR1_EL1:	return (u64)read_cpuid(ID_AA64ISAR1_EL1);



	case SYS_CNTFRQ_EL0:		return (u64)read_cpuid(CNTFRQ_EL0);

	case SYS_CTR_EL0:		return (u64)read_cpuid(CTR_EL0);

	case SYS_DCZID_EL0:		return (u64)read_cpuid(DCZID_EL0);

	case SYS_ID_PFR0_EL1:		return read_cpuid(SYS_ID_PFR0_EL1);

	case SYS_ID_PFR1_EL1:		return read_cpuid(SYS_ID_PFR1_EL1);

	case SYS_ID_DFR0_EL1:		return read_cpuid(SYS_ID_DFR0_EL1);

	case SYS_ID_MMFR0_EL1:		return read_cpuid(SYS_ID_MMFR0_EL1);

	case SYS_ID_MMFR1_EL1:		return read_cpuid(SYS_ID_MMFR1_EL1);

	case SYS_ID_MMFR2_EL1:		return read_cpuid(SYS_ID_MMFR2_EL1);

	case SYS_ID_MMFR3_EL1:		return read_cpuid(SYS_ID_MMFR3_EL1);

	case SYS_ID_ISAR0_EL1:		return read_cpuid(SYS_ID_ISAR0_EL1);

	case SYS_ID_ISAR1_EL1:		return read_cpuid(SYS_ID_ISAR1_EL1);

	case SYS_ID_ISAR2_EL1:		return read_cpuid(SYS_ID_ISAR2_EL1);

	case SYS_ID_ISAR3_EL1:		return read_cpuid(SYS_ID_ISAR3_EL1);

	case SYS_ID_ISAR4_EL1:		return read_cpuid(SYS_ID_ISAR4_EL1);

	case SYS_ID_ISAR5_EL1:		return read_cpuid(SYS_ID_ISAR4_EL1);

	case SYS_MVFR0_EL1:		return read_cpuid(SYS_MVFR0_EL1);

	case SYS_MVFR1_EL1:		return read_cpuid(SYS_MVFR1_EL1);

	case SYS_MVFR2_EL1:		return read_cpuid(SYS_MVFR2_EL1);



	case SYS_ID_AA64PFR0_EL1:	return read_cpuid(SYS_ID_AA64PFR0_EL1);

	case SYS_ID_AA64PFR1_EL1:	return read_cpuid(SYS_ID_AA64PFR0_EL1);

	case SYS_ID_AA64DFR0_EL1:	return read_cpuid(SYS_ID_AA64DFR0_EL1);

	case SYS_ID_AA64DFR1_EL1:	return read_cpuid(SYS_ID_AA64DFR0_EL1);

	case SYS_ID_AA64MMFR0_EL1:	return read_cpuid(SYS_ID_AA64MMFR0_EL1);

	case SYS_ID_AA64MMFR1_EL1:	return read_cpuid(SYS_ID_AA64MMFR1_EL1);

	case SYS_ID_AA64ISAR0_EL1:	return read_cpuid(SYS_ID_AA64ISAR0_EL1);

	case SYS_ID_AA64ISAR1_EL1:	return read_cpuid(SYS_ID_AA64ISAR1_EL1);



	case SYS_CNTFRQ_EL0:		return read_cpuid(SYS_CNTFRQ_EL0);

	case SYS_CTR_EL0:		return read_cpuid(SYS_CTR_EL0);

	case SYS_DCZID_EL0:		return read_cpuid(SYS_DCZID_EL0);

	default:

		BUG();

		return 0;

arch/arm64/kernel/cpuinfo.c

+27 −27
Original line number Diff line number Diff line
@@ -196,35 +196,35 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) 
{

	info->reg_cntfrq = arch_timer_get_cntfrq();

	info->reg_ctr = read_cpuid_cachetype();

	info->reg_dczid = read_cpuid(DCZID_EL0);

	info->reg_dczid = read_cpuid(SYS_DCZID_EL0);

	info->reg_midr = read_cpuid_id();



	info->reg_id_aa64dfr0 = read_cpuid(ID_AA64DFR0_EL1);

	info->reg_id_aa64dfr1 = read_cpuid(ID_AA64DFR1_EL1);

	info->reg_id_aa64isar0 = read_cpuid(ID_AA64ISAR0_EL1);

	info->reg_id_aa64isar1 = read_cpuid(ID_AA64ISAR1_EL1);

	info->reg_id_aa64mmfr0 = read_cpuid(ID_AA64MMFR0_EL1);

	info->reg_id_aa64mmfr1 = read_cpuid(ID_AA64MMFR1_EL1);

	info->reg_id_aa64pfr0 = read_cpuid(ID_AA64PFR0_EL1);

	info->reg_id_aa64pfr1 = read_cpuid(ID_AA64PFR1_EL1);



	info->reg_id_dfr0 = read_cpuid(ID_DFR0_EL1);

	info->reg_id_isar0 = read_cpuid(ID_ISAR0_EL1);

	info->reg_id_isar1 = read_cpuid(ID_ISAR1_EL1);

	info->reg_id_isar2 = read_cpuid(ID_ISAR2_EL1);

	info->reg_id_isar3 = read_cpuid(ID_ISAR3_EL1);

	info->reg_id_isar4 = read_cpuid(ID_ISAR4_EL1);

	info->reg_id_isar5 = read_cpuid(ID_ISAR5_EL1);

	info->reg_id_mmfr0 = read_cpuid(ID_MMFR0_EL1);

	info->reg_id_mmfr1 = read_cpuid(ID_MMFR1_EL1);

	info->reg_id_mmfr2 = read_cpuid(ID_MMFR2_EL1);

	info->reg_id_mmfr3 = read_cpuid(ID_MMFR3_EL1);

	info->reg_id_pfr0 = read_cpuid(ID_PFR0_EL1);

	info->reg_id_pfr1 = read_cpuid(ID_PFR1_EL1);



	info->reg_mvfr0 = read_cpuid(MVFR0_EL1);

	info->reg_mvfr1 = read_cpuid(MVFR1_EL1);

	info->reg_mvfr2 = read_cpuid(MVFR2_EL1);

	info->reg_id_aa64dfr0 = read_cpuid(SYS_ID_AA64DFR0_EL1);

	info->reg_id_aa64dfr1 = read_cpuid(SYS_ID_AA64DFR1_EL1);

	info->reg_id_aa64isar0 = read_cpuid(SYS_ID_AA64ISAR0_EL1);

	info->reg_id_aa64isar1 = read_cpuid(SYS_ID_AA64ISAR1_EL1);

	info->reg_id_aa64mmfr0 = read_cpuid(SYS_ID_AA64MMFR0_EL1);

	info->reg_id_aa64mmfr1 = read_cpuid(SYS_ID_AA64MMFR1_EL1);

	info->reg_id_aa64pfr0 = read_cpuid(SYS_ID_AA64PFR0_EL1);

	info->reg_id_aa64pfr1 = read_cpuid(SYS_ID_AA64PFR1_EL1);



	info->reg_id_dfr0 = read_cpuid(SYS_ID_DFR0_EL1);

	info->reg_id_isar0 = read_cpuid(SYS_ID_ISAR0_EL1);

	info->reg_id_isar1 = read_cpuid(SYS_ID_ISAR1_EL1);

	info->reg_id_isar2 = read_cpuid(SYS_ID_ISAR2_EL1);

	info->reg_id_isar3 = read_cpuid(SYS_ID_ISAR3_EL1);

	info->reg_id_isar4 = read_cpuid(SYS_ID_ISAR4_EL1);

	info->reg_id_isar5 = read_cpuid(SYS_ID_ISAR5_EL1);

	info->reg_id_mmfr0 = read_cpuid(SYS_ID_MMFR0_EL1);

	info->reg_id_mmfr1 = read_cpuid(SYS_ID_MMFR1_EL1);

	info->reg_id_mmfr2 = read_cpuid(SYS_ID_MMFR2_EL1);

	info->reg_id_mmfr3 = read_cpuid(SYS_ID_MMFR3_EL1);

	info->reg_id_pfr0 = read_cpuid(SYS_ID_PFR0_EL1);

	info->reg_id_pfr1 = read_cpuid(SYS_ID_PFR1_EL1);



	info->reg_mvfr0 = read_cpuid(SYS_MVFR0_EL1);

	info->reg_mvfr1 = read_cpuid(SYS_MVFR1_EL1);

	info->reg_mvfr2 = read_cpuid(SYS_MVFR2_EL1);



	cpuinfo_detect_icache_policy(info);

arch/arm64/mm/context.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <asm/cachetype.h>



#define asid_bits(reg) \

	(((read_cpuid(ID_AA64MMFR0_EL1) & 0xf0) >> 2) + 8)

	(((read_cpuid(SYS_ID_AA64MMFR0_EL1) & 0xf0) >> 2) + 8)



#define ASID_FIRST_VERSION	(1 << MAX_ASID_BITS)