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/odyssey/chip_odyssey.json b/chip_data/odyssey/chip_odyssey.json
index 4e8f3c0..7cbd04a 100644
--- a/chip_data/odyssey/chip_odyssey.json
+++ b/chip_data/odyssey/chip_odyssey.json
@@ -2,19 +2,19 @@
"version": 1,
"model_ec": ["ODYSSEY_10"],
"root_nodes": {
- "CS": {
+ "CHIP_CS": {
"name": "GFIR",
"inst": 0
},
- "RE": {
+ "RECOV": {
"name": "GFIR",
"inst": 0
},
- "SPA": {
+ "SP_ATTN": {
"name": "GFIR",
"inst": 0
},
- "UCS": {
+ "UNIT_CS": {
"name": "GFIR",
"inst": 0
}
diff --git a/chip_data/odyssey/node_cfir_mem.json b/chip_data/odyssey/node_cfir_mem.json
index d8c38ca..d87e6b7 100644
--- a/chip_data/odyssey/node_cfir_mem.json
+++ b/chip_data/odyssey/node_cfir_mem.json
@@ -2,42 +2,42 @@
"version": 1,
"model_ec": ["ODYSSEY_10"],
"registers": {
- "CFIR_MEM_CS": {
+ "CFIR_MEM_CHIP_CS": {
"instances": {
"0": "0x08040000"
}
},
- "CFIR_MEM_RE": {
+ "CFIR_MEM_RECOV": {
"instances": {
"0": "0x08040001"
}
},
- "CFIR_MEM_SPA": {
+ "CFIR_MEM_SP_ATTN": {
"instances": {
"0": "0x08040002"
}
},
- "CFIR_MEM_UCS": {
+ "CFIR_MEM_UNIT_CS": {
"instances": {
"0": "0x08040003"
}
},
- "CFIR_MEM_CS_MASK": {
+ "CFIR_MEM_CHIP_CS_MASK": {
"instances": {
"0": "0x08040040"
}
},
- "CFIR_MEM_RE_MASK": {
+ "CFIR_MEM_RECOV_MASK": {
"instances": {
"0": "0x08040041"
}
},
- "CFIR_MEM_SPA_MASK": {
+ "CFIR_MEM_SP_ATTN_MASK": {
"instances": {
"0": "0x08040042"
}
},
- "CFIR_MEM_UCS_MASK": {
+ "CFIR_MEM_UNIT_CS_MASK": {
"instances": {
"0": "0x08040043"
}
@@ -48,20 +48,20 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_MEM_CS"
+ "reg_name": "CFIR_MEM_CHIP_CS"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_MEM_CS_MASK"
+ "reg_name": "CFIR_MEM_CHIP_CS_MASK"
}
},
{
@@ -72,20 +72,20 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_MEM_RE"
+ "reg_name": "CFIR_MEM_RECOV"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_MEM_RE_MASK"
+ "reg_name": "CFIR_MEM_RECOV_MASK"
}
},
{
@@ -96,20 +96,20 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_MEM_SPA"
+ "reg_name": "CFIR_MEM_SP_ATTN"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_MEM_SPA_MASK"
+ "reg_name": "CFIR_MEM_SP_ATTN_MASK"
}
},
{
@@ -120,20 +120,20 @@
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_MEM_UCS"
+ "reg_name": "CFIR_MEM_UNIT_CS"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_MEM_UCS_MASK"
+ "reg_name": "CFIR_MEM_UNIT_CS_MASK"
}
},
{
diff --git a/chip_data/odyssey/node_cfir_tp.json b/chip_data/odyssey/node_cfir_tp.json
index eca635b..aabdb6c 100644
--- a/chip_data/odyssey/node_cfir_tp.json
+++ b/chip_data/odyssey/node_cfir_tp.json
@@ -2,42 +2,42 @@
"version": 1,
"model_ec": ["ODYSSEY_10"],
"registers": {
- "CFIR_TP_CS": {
+ "CFIR_TP_CHIP_CS": {
"instances": {
"0": "0x01040000"
}
},
- "CFIR_TP_RE": {
+ "CFIR_TP_RECOV": {
"instances": {
"0": "0x01040001"
}
},
- "CFIR_TP_SPA": {
+ "CFIR_TP_SP_ATTN": {
"instances": {
"0": "0x01040002"
}
},
- "CFIR_TP_UCS": {
+ "CFIR_TP_UNIT_CS": {
"instances": {
"0": "0x01040003"
}
},
- "CFIR_TP_CS_MASK": {
+ "CFIR_TP_CHIP_CS_MASK": {
"instances": {
"0": "0x01040040"
}
},
- "CFIR_TP_RE_MASK": {
+ "CFIR_TP_RECOV_MASK": {
"instances": {
"0": "0x01040041"
}
},
- "CFIR_TP_SPA_MASK": {
+ "CFIR_TP_SP_ATTN_MASK": {
"instances": {
"0": "0x01040042"
}
},
- "CFIR_TP_UCS_MASK": {
+ "CFIR_TP_UNIT_CS_MASK": {
"instances": {
"0": "0x01040043"
}
@@ -48,20 +48,20 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_TP_CS"
+ "reg_name": "CFIR_TP_CHIP_CS"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_TP_CS_MASK"
+ "reg_name": "CFIR_TP_CHIP_CS_MASK"
}
},
{
@@ -72,20 +72,20 @@
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_TP_RE"
+ "reg_name": "CFIR_TP_RECOV"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_TP_RE_MASK"
+ "reg_name": "CFIR_TP_RECOV_MASK"
}
},
{
@@ -96,20 +96,20 @@
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_TP_SPA"
+ "reg_name": "CFIR_TP_SP_ATTN"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_TP_SPA_MASK"
+ "reg_name": "CFIR_TP_SP_ATTN_MASK"
}
},
{
@@ -120,20 +120,20 @@
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
"exprs": [
{
"expr_type": "reg",
- "reg_name": "CFIR_TP_UCS"
+ "reg_name": "CFIR_TP_UNIT_CS"
},
{
"expr_type": "not",
"expr": {
"expr_type": "reg",
- "reg_name": "CFIR_TP_UCS_MASK"
+ "reg_name": "CFIR_TP_UNIT_CS_MASK"
}
},
{
diff --git a/chip_data/odyssey/node_dlx_err_rpt.json b/chip_data/odyssey/node_dlx_err_rpt.json
index 4554c54..e452de6 100644
--- a/chip_data/odyssey/node_dlx_err_rpt.json
+++ b/chip_data/odyssey/node_dlx_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",
@@ -57,7 +57,7 @@
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
diff --git a/chip_data/odyssey/node_dlx_fir.json b/chip_data/odyssey/node_dlx_fir.json
index 539db3b..4efd5c4 100644
--- a/chip_data/odyssey/node_dlx_fir.json
+++ b/chip_data/odyssey/node_dlx_fir.json
@@ -12,22 +12,22 @@
"0": "0x08012402"
}
},
- "DLX_FIR_CFG_CS": {
+ "DLX_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08012404"
}
},
- "DLX_FIR_CFG_RE": {
+ "DLX_FIR_CFG_RECOV": {
"instances": {
"0": "0x08012405"
}
},
- "DLX_FIR_CFG_SPA": {
+ "DLX_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08012406"
}
},
- "DLX_FIR_CFG_UCS": {
+ "DLX_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08012407"
}
@@ -128,7 +128,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -146,13 +146,13 @@
},
{
"expr_type": "reg",
- "reg_name": "DLX_FIR_CFG_CS"
+ "reg_name": "DLX_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -170,13 +170,13 @@
},
{
"expr_type": "reg",
- "reg_name": "DLX_FIR_CFG_RE"
+ "reg_name": "DLX_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -194,13 +194,13 @@
},
{
"expr_type": "reg",
- "reg_name": "DLX_FIR_CFG_SPA"
+ "reg_name": "DLX_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -218,7 +218,7 @@
},
{
"expr_type": "reg",
- "reg_name": "DLX_FIR_CFG_UCS"
+ "reg_name": "DLX_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_gfir.json b/chip_data/odyssey/node_gfir.json
index 86e36ca..cead761 100644
--- a/chip_data/odyssey/node_gfir.json
+++ b/chip_data/odyssey/node_gfir.json
@@ -2,22 +2,22 @@
"version": 1,
"model_ec": ["ODYSSEY_10"],
"registers": {
- "GFIR_CS": {
+ "GFIR_CHIP_CS": {
"instances": {
"0": "0x570F001C"
}
},
- "GFIR_RE": {
+ "GFIR_RECOV": {
"instances": {
"0": "0x570F001B"
}
},
- "GFIR_SPA": {
+ "GFIR_SP_ATTN": {
"instances": {
"0": "0x570F001A"
}
},
- "GFIR_UCS": {
+ "GFIR_UNIT_CS": {
"instances": {
"0": "0x570F002A"
}
@@ -28,35 +28,35 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "reg",
- "reg_name": "GFIR_CS"
+ "reg_name": "GFIR_CHIP_CS"
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "reg",
- "reg_name": "GFIR_RE"
+ "reg_name": "GFIR_RECOV"
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "reg",
- "reg_name": "GFIR_SPA"
+ "reg_name": "GFIR_SP_ATTN"
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "reg",
- "reg_name": "GFIR_UCS"
+ "reg_name": "GFIR_UNIT_CS"
}
}
],
diff --git a/chip_data/odyssey/node_mcbist_fir.json b/chip_data/odyssey/node_mcbist_fir.json
index bc658f7..cc2f457 100644
--- a/chip_data/odyssey/node_mcbist_fir.json
+++ b/chip_data/odyssey/node_mcbist_fir.json
@@ -12,22 +12,22 @@
"0": "0x08011402"
}
},
- "MCBIST_FIR_CFG_CS": {
+ "MCBIST_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08011404"
}
},
- "MCBIST_FIR_CFG_RE": {
+ "MCBIST_FIR_CFG_RECOV": {
"instances": {
"0": "0x08011405"
}
},
- "MCBIST_FIR_CFG_SPA": {
+ "MCBIST_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08011406"
}
},
- "MCBIST_FIR_CFG_UCS": {
+ "MCBIST_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08011407"
}
@@ -178,7 +178,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -196,13 +196,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MCBIST_FIR_CFG_CS"
+ "reg_name": "MCBIST_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -220,13 +220,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MCBIST_FIR_CFG_RE"
+ "reg_name": "MCBIST_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -244,13 +244,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MCBIST_FIR_CFG_SPA"
+ "reg_name": "MCBIST_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -268,7 +268,7 @@
},
{
"expr_type": "reg",
- "reg_name": "MCBIST_FIR_CFG_UCS"
+ "reg_name": "MCBIST_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_mem_local_fir.json b/chip_data/odyssey/node_mem_local_fir.json
index 26bb13c..c919250 100644
--- a/chip_data/odyssey/node_mem_local_fir.json
+++ b/chip_data/odyssey/node_mem_local_fir.json
@@ -12,22 +12,22 @@
"0": "0x08040102"
}
},
- "MEM_LOCAL_FIR_CFG_CS": {
+ "MEM_LOCAL_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08040104"
}
},
- "MEM_LOCAL_FIR_CFG_RE": {
+ "MEM_LOCAL_FIR_CFG_RECOV": {
"instances": {
"0": "0x08040105"
}
},
- "MEM_LOCAL_FIR_CFG_SPA": {
+ "MEM_LOCAL_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08040106"
}
},
- "MEM_LOCAL_FIR_CFG_UCS": {
+ "MEM_LOCAL_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08040107"
}
@@ -43,7 +43,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -61,13 +61,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MEM_LOCAL_FIR_CFG_CS"
+ "reg_name": "MEM_LOCAL_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -85,13 +85,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MEM_LOCAL_FIR_CFG_RE"
+ "reg_name": "MEM_LOCAL_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -109,13 +109,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MEM_LOCAL_FIR_CFG_SPA"
+ "reg_name": "MEM_LOCAL_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -133,7 +133,7 @@
},
{
"expr_type": "reg",
- "reg_name": "MEM_LOCAL_FIR_CFG_UCS"
+ "reg_name": "MEM_LOCAL_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_mmio_fir.json b/chip_data/odyssey/node_mmio_fir.json
index 99e8e49..b2a2de0 100644
--- a/chip_data/odyssey/node_mmio_fir.json
+++ b/chip_data/odyssey/node_mmio_fir.json
@@ -12,22 +12,22 @@
"0": "0x08010872"
}
},
- "MMIO_FIR_CFG_CS": {
+ "MMIO_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08010874"
}
},
- "MMIO_FIR_CFG_RE": {
+ "MMIO_FIR_CFG_RECOV": {
"instances": {
"0": "0x08010875"
}
},
- "MMIO_FIR_CFG_SPA": {
+ "MMIO_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08010876"
}
},
- "MMIO_FIR_CFG_UCS": {
+ "MMIO_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08010877"
}
@@ -53,7 +53,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -71,13 +71,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MMIO_FIR_CFG_CS"
+ "reg_name": "MMIO_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -95,13 +95,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MMIO_FIR_CFG_RE"
+ "reg_name": "MMIO_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -119,13 +119,13 @@
},
{
"expr_type": "reg",
- "reg_name": "MMIO_FIR_CFG_SPA"
+ "reg_name": "MMIO_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -143,7 +143,7 @@
},
{
"expr_type": "reg",
- "reg_name": "MMIO_FIR_CFG_UCS"
+ "reg_name": "MMIO_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_ocmb_phy_fir.json b/chip_data/odyssey/node_ocmb_phy_fir.json
index 6ba1560..7a17bdb 100644
--- a/chip_data/odyssey/node_ocmb_phy_fir.json
+++ b/chip_data/odyssey/node_ocmb_phy_fir.json
@@ -12,22 +12,22 @@
"0": "0x08010C02"
}
},
- "OCMB_PHY_FIR_CFG_CS": {
+ "OCMB_PHY_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08010C04"
}
},
- "OCMB_PHY_FIR_CFG_RE": {
+ "OCMB_PHY_FIR_CFG_RECOV": {
"instances": {
"0": "0x08010C05"
}
},
- "OCMB_PHY_FIR_CFG_SPA": {
+ "OCMB_PHY_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08010C06"
}
},
- "OCMB_PHY_FIR_CFG_UCS": {
+ "OCMB_PHY_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08010C07"
}
@@ -43,7 +43,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -61,13 +61,13 @@
},
{
"expr_type": "reg",
- "reg_name": "OCMB_PHY_FIR_CFG_CS"
+ "reg_name": "OCMB_PHY_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -85,13 +85,13 @@
},
{
"expr_type": "reg",
- "reg_name": "OCMB_PHY_FIR_CFG_RE"
+ "reg_name": "OCMB_PHY_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -109,13 +109,13 @@
},
{
"expr_type": "reg",
- "reg_name": "OCMB_PHY_FIR_CFG_SPA"
+ "reg_name": "OCMB_PHY_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -133,7 +133,7 @@
},
{
"expr_type": "reg",
- "reg_name": "OCMB_PHY_FIR_CFG_UCS"
+ "reg_name": "OCMB_PHY_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_odp_fir.json b/chip_data/odyssey/node_odp_fir.json
index 28935be..85e4d82 100644
--- a/chip_data/odyssey/node_odp_fir.json
+++ b/chip_data/odyssey/node_odp_fir.json
@@ -14,25 +14,25 @@
"1": "0x08013402"
}
},
- "ODP_FIR_CFG_CS": {
+ "ODP_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08013004",
"1": "0x08013404"
}
},
- "ODP_FIR_CFG_RE": {
+ "ODP_FIR_CFG_RECOV": {
"instances": {
"0": "0x08013005",
"1": "0x08013405"
}
},
- "ODP_FIR_CFG_SPA": {
+ "ODP_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08013006",
"1": "0x08013406"
}
},
- "ODP_FIR_CFG_UCS": {
+ "ODP_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08013007",
"1": "0x08013407"
@@ -267,7 +267,7 @@
"instances": [0, 1],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -285,13 +285,13 @@
},
{
"expr_type": "reg",
- "reg_name": "ODP_FIR_CFG_CS"
+ "reg_name": "ODP_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -309,13 +309,13 @@
},
{
"expr_type": "reg",
- "reg_name": "ODP_FIR_CFG_RE"
+ "reg_name": "ODP_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -333,13 +333,13 @@
},
{
"expr_type": "reg",
- "reg_name": "ODP_FIR_CFG_SPA"
+ "reg_name": "ODP_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -357,7 +357,7 @@
},
{
"expr_type": "reg",
- "reg_name": "ODP_FIR_CFG_UCS"
+ "reg_name": "ODP_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_rdf_fir.json b/chip_data/odyssey/node_rdf_fir.json
index f326b41..821335f 100644
--- a/chip_data/odyssey/node_rdf_fir.json
+++ b/chip_data/odyssey/node_rdf_fir.json
@@ -14,25 +14,25 @@
"1": "0x08012802"
}
},
- "RDF_FIR_CFG_CS": {
+ "RDF_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08011804",
"1": "0x08012804"
}
},
- "RDF_FIR_CFG_RE": {
+ "RDF_FIR_CFG_RECOV": {
"instances": {
"0": "0x08011805",
"1": "0x08012805"
}
},
- "RDF_FIR_CFG_SPA": {
+ "RDF_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08011806",
"1": "0x08012806"
}
},
- "RDF_FIR_CFG_UCS": {
+ "RDF_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08011807",
"1": "0x08012807"
@@ -164,7 +164,7 @@
"instances": [0, 1],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -182,13 +182,13 @@
},
{
"expr_type": "reg",
- "reg_name": "RDF_FIR_CFG_CS"
+ "reg_name": "RDF_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -206,13 +206,13 @@
},
{
"expr_type": "reg",
- "reg_name": "RDF_FIR_CFG_RE"
+ "reg_name": "RDF_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -230,13 +230,13 @@
},
{
"expr_type": "reg",
- "reg_name": "RDF_FIR_CFG_SPA"
+ "reg_name": "RDF_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0, 1],
"expr": {
"expr_type": "and",
@@ -254,7 +254,7 @@
},
{
"expr_type": "reg",
- "reg_name": "RDF_FIR_CFG_UCS"
+ "reg_name": "RDF_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_srq_fir.json b/chip_data/odyssey/node_srq_fir.json
index e579719..a6da7a1 100644
--- a/chip_data/odyssey/node_srq_fir.json
+++ b/chip_data/odyssey/node_srq_fir.json
@@ -12,22 +12,22 @@
"0": "0x08011002"
}
},
- "SRQ_FIR_CFG_CS": {
+ "SRQ_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08011004"
}
},
- "SRQ_FIR_CFG_RE": {
+ "SRQ_FIR_CFG_RECOV": {
"instances": {
"0": "0x08011005"
}
},
- "SRQ_FIR_CFG_SPA": {
+ "SRQ_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08011006"
}
},
- "SRQ_FIR_CFG_UCS": {
+ "SRQ_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08011007"
}
@@ -78,7 +78,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -96,13 +96,13 @@
},
{
"expr_type": "reg",
- "reg_name": "SRQ_FIR_CFG_CS"
+ "reg_name": "SRQ_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -120,13 +120,13 @@
},
{
"expr_type": "reg",
- "reg_name": "SRQ_FIR_CFG_RE"
+ "reg_name": "SRQ_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -144,13 +144,13 @@
},
{
"expr_type": "reg",
- "reg_name": "SRQ_FIR_CFG_SPA"
+ "reg_name": "SRQ_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -168,7 +168,7 @@
},
{
"expr_type": "reg",
- "reg_name": "SRQ_FIR_CFG_UCS"
+ "reg_name": "SRQ_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_tlx_fir.json b/chip_data/odyssey/node_tlx_fir.json
index 3a73707..a9fde05 100644
--- a/chip_data/odyssey/node_tlx_fir.json
+++ b/chip_data/odyssey/node_tlx_fir.json
@@ -12,22 +12,22 @@
"0": "0x08012002"
}
},
- "TLX_FIR_CFG_CS": {
+ "TLX_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x08012004"
}
},
- "TLX_FIR_CFG_RE": {
+ "TLX_FIR_CFG_RECOV": {
"instances": {
"0": "0x08012005"
}
},
- "TLX_FIR_CFG_SPA": {
+ "TLX_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x08012006"
}
},
- "TLX_FIR_CFG_UCS": {
+ "TLX_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x08012007"
}
@@ -83,7 +83,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -101,13 +101,13 @@
},
{
"expr_type": "reg",
- "reg_name": "TLX_FIR_CFG_CS"
+ "reg_name": "TLX_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -125,13 +125,13 @@
},
{
"expr_type": "reg",
- "reg_name": "TLX_FIR_CFG_RE"
+ "reg_name": "TLX_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -149,13 +149,13 @@
},
{
"expr_type": "reg",
- "reg_name": "TLX_FIR_CFG_SPA"
+ "reg_name": "TLX_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -173,7 +173,7 @@
},
{
"expr_type": "reg",
- "reg_name": "TLX_FIR_CFG_UCS"
+ "reg_name": "TLX_FIR_CFG_UNIT_CS"
}
]
}
diff --git a/chip_data/odyssey/node_tp_local_fir.json b/chip_data/odyssey/node_tp_local_fir.json
index 469fbc7..f8e1a50 100644
--- a/chip_data/odyssey/node_tp_local_fir.json
+++ b/chip_data/odyssey/node_tp_local_fir.json
@@ -12,22 +12,22 @@
"0": "0x01040102"
}
},
- "TP_LOCAL_FIR_CFG_CS": {
+ "TP_LOCAL_FIR_CFG_CHIP_CS": {
"instances": {
"0": "0x01040104"
}
},
- "TP_LOCAL_FIR_CFG_RE": {
+ "TP_LOCAL_FIR_CFG_RECOV": {
"instances": {
"0": "0x01040105"
}
},
- "TP_LOCAL_FIR_CFG_SPA": {
+ "TP_LOCAL_FIR_CFG_SP_ATTN": {
"instances": {
"0": "0x01040106"
}
},
- "TP_LOCAL_FIR_CFG_UCS": {
+ "TP_LOCAL_FIR_CFG_UNIT_CS": {
"instances": {
"0": "0x01040107"
}
@@ -43,7 +43,7 @@
"instances": [0],
"rules": [
{
- "attn_type": ["CS"],
+ "attn_type": ["CHIP_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -61,13 +61,13 @@
},
{
"expr_type": "reg",
- "reg_name": "TP_LOCAL_FIR_CFG_CS"
+ "reg_name": "TP_LOCAL_FIR_CFG_CHIP_CS"
}
]
}
},
{
- "attn_type": ["RE"],
+ "attn_type": ["RECOV"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -85,13 +85,13 @@
},
{
"expr_type": "reg",
- "reg_name": "TP_LOCAL_FIR_CFG_RE"
+ "reg_name": "TP_LOCAL_FIR_CFG_RECOV"
}
]
}
},
{
- "attn_type": ["SPA"],
+ "attn_type": ["SP_ATTN"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -109,13 +109,13 @@
},
{
"expr_type": "reg",
- "reg_name": "TP_LOCAL_FIR_CFG_SPA"
+ "reg_name": "TP_LOCAL_FIR_CFG_SP_ATTN"
}
]
}
},
{
- "attn_type": ["UCS"],
+ "attn_type": ["UNIT_CS"],
"node_inst": [0],
"expr": {
"expr_type": "and",
@@ -133,7 +133,7 @@
},
{
"expr_type": "reg",
- "reg_name": "TP_LOCAL_FIR_CFG_UCS"
+ "reg_name": "TP_LOCAL_FIR_CFG_UNIT_CS"
}
]
}