Rename chip data attention types to be more descriptive
Instead of CS, UCS, RE, SPA, and HA, using CHIP_CS, UNIT_CS, RECOV,
SP_ATTN, and HOST_ATTN. This is mostly in an effort to clarify a chip
checkstop is not necessarily a system checkstop. Notice that I didn't
change any of the register names for P10 or Explorer. This is to prevent
the inevitable code level mismatches between drivers and the peltool
parsers used to parse field data.
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: I35698b7a1b9d3bbefeb1ccc7ccc242890fe221f3
diff --git a/chip_data/explorer/chip_explorer.json b/chip_data/explorer/chip_explorer.json
index 98e3320..1d6f606 100644
--- a/chip_data/explorer/chip_explorer.json
+++ b/chip_data/explorer/chip_explorer.json
@@ -2,15 +2,15 @@
"version": 1,
"model_ec": ["EXPLORER_11", "EXPLORER_20"],
"root_nodes": {
- "CS": {
+ "CHIP_CS": {
"name": "CHIPLET_OCMB_FIR",
"inst": 0
},
- "RE": {
+ "RECOV": {
"name": "CHIPLET_OCMB_FIR",
"inst": 0
},
- "SPA": {
+ "SP_ATTN": {
"name": "CHIPLET_OCMB_SPA_FIR",
"inst": 0
}
diff --git a/chip_data/explorer/node_chiplet_ocmb_fir.json b/chip_data/explorer/node_chiplet_ocmb_fir.json
index 1bd1910..9217105 100644
--- a/chip_data/explorer/node_chiplet_ocmb_fir.json
+++ b/chip_data/explorer/node_chiplet_ocmb_fir.json
@@ -23,7 +23,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -47,7 +47,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_chiplet_ocmb_spa_fir.json b/chip_data/explorer/node_chiplet_ocmb_spa_fir.json
index 0865a6e..4465e69 100644
--- a/chip_data/explorer/node_chiplet_ocmb_spa_fir.json
+++ b/chip_data/explorer/node_chiplet_ocmb_spa_fir.json
@@ -18,7 +18,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_mcbistfir.json b/chip_data/explorer/node_mcbistfir.json
index 80dde58..666e57c 100644
--- a/chip_data/explorer/node_mcbistfir.json
+++ b/chip_data/explorer/node_mcbistfir.json
@@ -43,7 +43,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -77,7 +77,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -108,7 +108,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_mmiofir.json b/chip_data/explorer/node_mmiofir.json
index 300d1e2..d0a0824 100644
--- a/chip_data/explorer/node_mmiofir.json
+++ b/chip_data/explorer/node_mmiofir.json
@@ -43,7 +43,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -77,7 +77,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -108,7 +108,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_ocmb_lfir.json b/chip_data/explorer/node_ocmb_lfir.json
index fa784af..4786883 100644
--- a/chip_data/explorer/node_ocmb_lfir.json
+++ b/chip_data/explorer/node_ocmb_lfir.json
@@ -52,7 +52,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -86,7 +86,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_omi_dl_err_rpt.json b/chip_data/explorer/node_omi_dl_err_rpt.json
index c2e38bf..b3f28e6 100644
--- a/chip_data/explorer/node_omi_dl_err_rpt.json
+++ b/chip_data/explorer/node_omi_dl_err_rpt.json
@@ -6,7 +6,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -23,7 +23,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -40,7 +40,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_omi_dl_fir.json b/chip_data/explorer/node_omi_dl_fir.json
index 989a636..3b86cbb 100644
--- a/chip_data/explorer/node_omi_dl_fir.json
+++ b/chip_data/explorer/node_omi_dl_fir.json
@@ -108,7 +108,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -142,7 +142,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -173,7 +173,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_rdffir.json b/chip_data/explorer/node_rdffir.json
index a597425..eafc663 100644
--- a/chip_data/explorer/node_rdffir.json
+++ b/chip_data/explorer/node_rdffir.json
@@ -180,7 +180,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -214,7 +214,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -245,7 +245,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_srqfir.json b/chip_data/explorer/node_srqfir.json
index c3a3cc6..c8aa095 100644
--- a/chip_data/explorer/node_srqfir.json
+++ b/chip_data/explorer/node_srqfir.json
@@ -38,7 +38,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -72,7 +72,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -103,7 +103,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_tlx_err_rpt_1.json b/chip_data/explorer/node_tlx_err_rpt_1.json
index 423071e..90c99bb 100644
--- a/chip_data/explorer/node_tlx_err_rpt_1.json
+++ b/chip_data/explorer/node_tlx_err_rpt_1.json
@@ -6,7 +6,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -30,7 +30,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -54,7 +54,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/explorer/node_tlxfir.json b/chip_data/explorer/node_tlxfir.json
index 56fb114..a159694 100644
--- a/chip_data/explorer/node_tlxfir.json
+++ b/chip_data/explorer/node_tlxfir.json
@@ -63,7 +63,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -97,7 +97,7 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -128,7 +128,7 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",