evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edac: cortex: Update the function name to reflect Kryo2xx processor

Browse source 
Update the error parsing function name to reflect Kryo2xx silver
and gold processors.

CRs-Fixed: 1024276
Change-Id: Iffdefa9536352dcaf411622b1d99b01b40100ce0
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
This commit is contained in:
Runmin Wang 2016-06-03 13:21:34 -07:00 • committed by Kyle Yan
parent e5d9430d7f
commit 33323b1e32
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/edac/cortex_arm64_edac.c
View file

@ -207,7 +207,7 @@ static const struct errors_edac errors[] = {
asm("msr s3_1_c15_c2_2, %0" : : "r" (val)); \ asm("msr s3_1_c15_c2_2, %0" : : "r" (val)); \
}) })
static void ca53_ca57_print_error_state_regs(void) static void kryo2xx_print_error_state_regs(void)
{ {
u64 l2merrsr; u64 l2merrsr;
u64 cpumerrsr; u64 cpumerrsr;
@ -266,7 +266,7 @@ static void kryo2xx_gold_print_error_state_regs(void)
"Double bit error on dirty L2 cacheline\n"); "Double bit error on dirty L2 cacheline\n");
} }
static void ca53_parse_cpumerrsr(struct erp_local_data *ed) static void kryo2xx_silver_parse_cpumerrsr(struct erp_local_data *ed)
{ {
u64 cpumerrsr; u64 cpumerrsr;
int cpuid; int cpuid;
@ -283,7 +283,7 @@ static void ca53_parse_cpumerrsr(struct erp_local_data *ed)
"Kryo2xx Silver CPU%d L1 %s Error detected\n", "Kryo2xx Silver CPU%d L1 %s Error detected\n",
smp_processor_id(), err_name[ed->err]); smp_processor_id(), err_name[ed->err]);
ca53_ca57_print_error_state_regs(); kryo2xx_print_error_state_regs();
if (ed->err == DBE) if (ed->err == DBE)
edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n"); edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n");
@ -337,7 +337,7 @@ static void ca53_parse_cpumerrsr(struct erp_local_data *ed)
write_cpumerrsr_el1(0); write_cpumerrsr_el1(0);
} }
static void ca53_parse_l2merrsr(struct erp_local_data *ed) static void kryo2xx_silver_parse_l2merrsr(struct erp_local_data *ed)
{ {
u64 l2merrsr; u64 l2merrsr;
u32 l2ectlr; u32 l2ectlr;
@ -354,7 +354,7 @@ static void ca53_parse_l2merrsr(struct erp_local_data *ed)
edac_printk(KERN_CRIT, EDAC_CPU, "Kyro2xx Silver L2 %s Error detected\n", edac_printk(KERN_CRIT, EDAC_CPU, "Kyro2xx Silver L2 %s Error detected\n",
err_name[ed->err]); err_name[ed->err]);
ca53_ca57_print_error_state_regs(); kryo2xx_print_error_state_regs();
if (ed->err == DBE) if (ed->err == DBE)
edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n"); edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n");
@ -411,7 +411,7 @@ static void ca57_parse_cpumerrsr(struct erp_local_data *ed)
edac_printk(KERN_CRIT, EDAC_CPU, "Cortex A57 CPU%d L1 %s Error detected\n", edac_printk(KERN_CRIT, EDAC_CPU, "Cortex A57 CPU%d L1 %s Error detected\n",
smp_processor_id(), err_name[ed->err]); smp_processor_id(), err_name[ed->err]);
ca53_ca57_print_error_state_regs(); kryo2xx_print_error_state_regs();
if (ed->err == DBE) if (ed->err == DBE)
edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n"); edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n");
@ -476,7 +476,7 @@ static void ca57_parse_l2merrsr(struct erp_local_data *ed)
edac_printk(KERN_CRIT, EDAC_CPU, "CortexA57 L2 %s Error detected\n", edac_printk(KERN_CRIT, EDAC_CPU, "CortexA57 L2 %s Error detected\n",
err_name[ed->err]); err_name[ed->err]);
ca53_ca57_print_error_state_regs(); kryo2xx_print_error_state_regs();
if (ed->err == DBE) if (ed->err == DBE)
edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n"); edac_printk(KERN_CRIT, EDAC_CPU, "Fatal error\n");
@ -590,8 +590,8 @@ static void arm64_erp_local_handler(void *info)
switch (partnum) { switch (partnum) {
case ARM_CPU_PART_CORTEX_A53: case ARM_CPU_PART_CORTEX_A53:
case ARM_CPU_PART_KRYO2XX_SILVER: case ARM_CPU_PART_KRYO2XX_SILVER:
ca53_parse_cpumerrsr(errdata); kryo2xx_silver_parse_cpumerrsr(errdata);
ca53_parse_l2merrsr(errdata); kryo2xx_silver_parse_l2merrsr(errdata);
break; break;
case ARM_CPU_PART_CORTEX_A72: case ARM_CPU_PART_CORTEX_A72:
@ -762,8 +762,8 @@ static void check_sbe_event(struct erp_drvdata *drv)
switch (partnum) { switch (partnum) {
case ARM_CPU_PART_CORTEX_A53: case ARM_CPU_PART_CORTEX_A53:
case ARM_CPU_PART_KRYO2XX_SILVER: case ARM_CPU_PART_KRYO2XX_SILVER:
ca53_parse_cpumerrsr(&errdata); kryo2xx_silver_parse_cpumerrsr(&errdata);
ca53_parse_l2merrsr(&errdata); kryo2xx_silver_parse_l2merrsr(&errdata);
break; break;
case ARM_CPU_PART_CORTEX_A72: case ARM_CPU_PART_CORTEX_A72: