summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/cpuinfo.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm64/kernel/cpuinfo.c')
-rw-r--r--arch/arm64/kernel/cpuinfo.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 00bdfa3f4532..84c8684431c7 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -203,36 +203,36 @@ 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(SYS_DCZID_EL0);
+ info->reg_dczid = read_cpuid(DCZID_EL0);
info->reg_midr = read_cpuid_id();
- 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_aa64mmfr2 = read_cpuid(SYS_ID_AA64MMFR2_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);
+ 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_aa64mmfr2 = read_cpuid(ID_AA64MMFR2_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);
cpuinfo_detect_icache_policy(info);