chore(errata-abi): minor variable rename
'cpu_partnumber' variable part of 'em_cpu_list' actually contains the
cpu midr value and not the actual part number. The part number is
extracted from midr value in 'non_arm_interconnect_errata' function.
So 'cpu_partnumber' is misleading and the actual value is midr, thus
rename it to 'cpu_midr'.
Change-Id: I4bfe71ce24542d508e2bcf39a1097724d14c4511
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/services/std_svc/errata_abi/cpu_errata_info.h b/services/std_svc/errata_abi/cpu_errata_info.h
index 2d59fc9..61e1076 100644
--- a/services/std_svc/errata_abi/cpu_errata_info.h
+++ b/services/std_svc/errata_abi/cpu_errata_info.h
@@ -45,7 +45,7 @@
};
struct em_cpu_list{
- unsigned long cpu_partnumber; /* cpu specific part number defined in midr reg */
+ unsigned long cpu_midr; /* cpu specific part number is bit[15:4] of midr value */
struct em_cpu cpu_errata_list[MAX_PLAT_CPU_ERRATA_ENTRIES];
};
diff --git a/services/std_svc/errata_abi/errata_abi_main.c b/services/std_svc/errata_abi/errata_abi_main.c
index 0a1d4f3..0d0ecc3 100644
--- a/services/std_svc/errata_abi/errata_abi_main.c
+++ b/services/std_svc/errata_abi/errata_abi_main.c
@@ -23,7 +23,7 @@
struct em_cpu_list cpu_list[] = {
#if CORTEX_A78_H_INC
{
- .cpu_partnumber = CORTEX_A78_MIDR,
+ .cpu_midr = CORTEX_A78_MIDR,
.cpu_errata_list = {
[0] = {2712571, 0x00, 0x12},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -33,7 +33,7 @@
#if CORTEX_A78_AE_H_INC
{
- .cpu_partnumber = CORTEX_A78_AE_MIDR,
+ .cpu_midr = CORTEX_A78_AE_MIDR,
.cpu_errata_list = {
[0] = {2712574, 0x00, 0x02},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -43,7 +43,7 @@
#if CORTEX_A78C_H_INC
{
- .cpu_partnumber = CORTEX_A78C_MIDR,
+ .cpu_midr = CORTEX_A78C_MIDR,
.cpu_errata_list = {
[0] = {2712575, 0x01, 0x02},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -53,7 +53,7 @@
#if NEOVERSE_V1_H_INC
{
- .cpu_partnumber = NEOVERSE_V1_MIDR,
+ .cpu_midr = NEOVERSE_V1_MIDR,
.cpu_errata_list = {
[0] = {2701953, 0x00, 0x11},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -63,7 +63,7 @@
#if CORTEX_A710_H_INC
{
- .cpu_partnumber = CORTEX_A710_MIDR,
+ .cpu_midr = CORTEX_A710_MIDR,
.cpu_errata_list = {
[0] = {2701952, 0x00, 0x21},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -73,7 +73,7 @@
#if NEOVERSE_N2_H_INC
{
- .cpu_partnumber = NEOVERSE_N2_MIDR,
+ .cpu_midr = NEOVERSE_N2_MIDR,
.cpu_errata_list = {
[0] = {2728475, 0x00, 0x02},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -83,7 +83,7 @@
#if CORTEX_X2_H_INC
{
- .cpu_partnumber = CORTEX_X2_MIDR,
+ .cpu_midr = CORTEX_X2_MIDR,
.cpu_errata_list = {
[0] = {2701952, 0x00, 0x21},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -93,7 +93,7 @@
#if NEOVERSE_V2_H_INC
{
- .cpu_partnumber = NEOVERSE_V2_MIDR,
+ .cpu_midr = NEOVERSE_V2_MIDR,
.cpu_errata_list = {
[0] = {2719103, 0x00, 0x01},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -103,7 +103,7 @@
#if CORTEX_X3_H_INC
{
- .cpu_partnumber = CORTEX_X3_MIDR,
+ .cpu_midr = CORTEX_X3_MIDR,
.cpu_errata_list = {
[0] = {2701951, 0x00, 0x11},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -113,7 +113,7 @@
#if CORTEX_X4_H_INC
{
- .cpu_partnumber = CORTEX_X4_MIDR,
+ .cpu_midr = CORTEX_X4_MIDR,
.cpu_errata_list = {
[0] = {2701112, 0x00, 0x00},
[1 ... ERRATA_LIST_END] = UNDEF_ERRATA,
@@ -142,7 +142,7 @@
* If the cpu partnumber in the cpu list, matches the midr
* part number, check to see if the errata ID matches
*/
- if (EXTRACT_PARTNUM(midr_val) == EXTRACT_PARTNUM(cpu_ptr->cpu_partnumber)) {
+ if (EXTRACT_PARTNUM(midr_val) == EXTRACT_PARTNUM(cpu_ptr->cpu_midr)) {
struct em_cpu *ptr = NULL;