PRD: fixed issues with secondary registers

Removed secondary type from all MASK registers because we will need to
keep track of which FIR bits PRD has masked.

Removed secondary type from all MBA registers. When PRD is called to do
analysis on an MEMBUF, it will capture all FIRs for the attached MCS and
MBAs in addition to capturing the default registers for the MEMBUF. If
PRD is then called to analyze an attached MBA, PRD will capture all
non-FIR registers on that MBA. However, all previously captured MBA
registers that are marked as secondary will be lost. Therefore, it was
best to remove the secondary type from all MBA registers to avoid the
loss of data.

Change-Id: I41813a538f79b743b49908f8db42369ed2024c00
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4976
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5020

11 files changed, 0 insertions, 94 deletions

diff --git a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
index e598e3b50..7e9a7a746 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
@@ -91,7 +91,6 @@ chip Ex
     {
         name        "EX00.TP.ECO_DOM.FIR_MASK";
         scomaddr    0x10040002;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -122,7 +121,6 @@ chip Ex
     {
         name        "EX00.TP.ECO_DOM.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x1004000d;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -159,7 +157,6 @@ chip Ex
     {
         name        "EX00.EC.PC.PC_NE.FIR.CORE_FIRMASK";
         scomaddr    0x10013103;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -196,7 +193,6 @@ chip Ex
     {
         name        "EX00.L2.L2MISC.L2CERRS.FIR_MASK_REG";
         scomaddr    0x10012803;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -233,7 +229,6 @@ chip Ex
     {
         name        "EX00.L3.L3_MISC.L3CERRS.FIR_MASK_REG";
         scomaddr    0x10010803;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -270,7 +265,6 @@ chip Ex
     {
         name        "EX00.NC.NCMISC.NCSCOMS.FIR_MASK_REG";
         scomaddr    0x10010c03;
-        capture     type secondary;
         capture     group default;
     };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Mba.rule b/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
index 528fce23d..cca4aa0b0 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
@@ -75,7 +75,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_MCBIST.SCOMFIR.MBAFIRMASK";
         scomaddr    0x03010603;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -83,7 +82,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_MCBIST.SCOMFIR.MBAFIRACT0";
         scomaddr    0x03010606;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -91,7 +89,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_MCBIST.SCOMFIR.MBAFIRACT1";
         scomaddr    0x03010607;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -133,7 +130,6 @@ chip Mba
     {
         name        "DPHY01.PHY01_DDRPHY_FIR_MASK_REG";
         scomaddr    0x800200930301143F;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -141,7 +137,6 @@ chip Mba
     {
         name        "DPHY01.PHY01_DDRPHY_FIR_ACTION0_REG";
         scomaddr    0x800200960301143F;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -149,7 +144,6 @@ chip Mba
     {
         name        "DPHY01.PHY01_DDRPHY_FIR_ACTION1_REG";
         scomaddr    0x800200970301143F;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -170,7 +164,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_SRQ.MBACALFIR_MASK";
         scomaddr    0x03010403;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -178,7 +171,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_SRQ.MBACALFIR_ACTION0";
         scomaddr    0x03010406;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -186,7 +178,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_SRQ.MBACALFIR_ACTION1";
         scomaddr    0x03010407;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
@@ -214,7 +205,6 @@ chip Mba
     {
         name        "MBU.MBA01.MBA_MCBIST.SCOMFIR.MBSPAMSKQ";
         scomaddr    0x03010614;
-        capture     type secondary;
         capture     group FirRegs;
     };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
index 3c9ee41dd..721e5ae50 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
@@ -88,7 +88,6 @@ chip Mcs
     {
         name        "MC0.MCS0.RIGHT.MCI.SCOMFIR.MCIFIRMASK";
         scomaddr    0x02011843;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule
index 381f85f97..19362cdf4 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule
@@ -45,7 +45,6 @@
     {
         name        "TCM.FIR_MASK";
         scomaddr    0x03040002;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -62,7 +61,6 @@
     {
         name        "TCM.EPS.FIR.SPA_MASK";
         scomaddr    0x03040007;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -85,7 +83,6 @@
     {
         name        "TCM.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0304000d;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule
index fe0c0dbb8..39b086022 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule
@@ -45,7 +45,6 @@
     {
         name        "TCN.FIR_MASK";
         scomaddr    0x02040002;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -68,7 +67,6 @@
     {
         name        "TCN.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0204000d;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -109,7 +107,6 @@
     {
         name        "DMI.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x02010403;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -150,7 +147,6 @@
     {
         name        "MBU.MBI.MBI.SCOMFIR.MBIFIRMASK";
         scomaddr    0x02010803;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -191,7 +187,6 @@
     {
         name        "MBU.MBS.MBS_FIR_MASK_REG";
         scomaddr    0x02011403;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -239,7 +234,6 @@
     {
         name        "MBU.MBS.ECC01.MBECCFIR_MASK";
         scomaddr    0x02011443;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -287,7 +281,6 @@
     {
         name        "MBU.MBS.ECC23.MBECCFIR_MASK";
         scomaddr    0x02011483;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -328,7 +321,6 @@
     {
         name        "MBU.MBS.MCBISTS01.SCOMFIR.MBSFIRMASK";
         scomaddr    0x02011603;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -369,7 +361,6 @@
     {
         name        "MBU.MBS.MCBISTS23.SCOMFIR.MBSFIRMASK";
         scomaddr    0x02011703;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -424,7 +415,6 @@
     {
         name        "SCAC.SCAC_FIRMASK";
         scomaddr    0x020115c3;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule
index be8218e30..8f1da5752 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule
@@ -45,7 +45,6 @@
     {
         name        "TPTOP.TPC.FIR_MASK";
         scomaddr    0x01040002;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
@@ -68,7 +67,6 @@
     {
         name        "TPTOP.TPC.LOCAL_FIR_AND";
         scomaddr    0x0104000b;
-        capture     type secondary;
         capture     group never;
     };
 
@@ -76,18 +74,10 @@
     {
         name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0104000d;
-        capture     type secondary;
         capture     group default;
         capture     group FirRegs;
     };
 
-    register TP_LFIR_MASK_AND
-    {
-        name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_MASK_AND";
-        scomaddr    0x0104000e;
-        capture     group never;
-    };
-
     register TP_LFIR_MASK_OR
     {
         name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_MASK_OR";
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule
index 2fd3e26ed..ccf46e0ce 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule
@@ -43,7 +43,6 @@
     {
         name        "ES.PBES_WRAP_TOP.TPC.FIR_MASK";
         scomaddr    0x08040002;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -64,7 +63,6 @@
     {
         name        "ES.PBES_WRAP_TOP.TPC.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0804000d;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -101,7 +99,6 @@
     {
         name        "ES.PBES_WRAP_TOP.PBES_TOP.MISC_IO.SCOM.PB_IOA_FIR_MASK_REG";
         scomaddr    0x08010803;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -138,7 +135,6 @@
     {
         name        "ABUS.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x08010c03;
-        capture     type secondary;
         capture     group default;
     };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule
index 9ade9335b..3d0be49de 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule
@@ -43,7 +43,6 @@
     {
         name        "EH.TPC.FIR_MASK";
         scomaddr    0x02040002;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -58,7 +57,6 @@
     {
         name        "EH.TPC.EPS.FIR.SPA_MASK";
         scomaddr    0x02040007;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -79,7 +77,6 @@
     {
         name        "EH.TPC.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0204000d;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -116,7 +113,6 @@
     {
         name        "EN.NX.DBG.NX_DMA_ENG_FIR_MASK";
         scomaddr    0x02013103;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -153,7 +149,6 @@
     {
         name        "EN.NX.PBI.CQ_WRAP.NXCQ_SCOM.NX_CQ_FIR_MASK_REG";
         scomaddr    0x02013083;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -190,7 +185,6 @@
     {
         name        "EN.NX.AS.FIR_MASK_REG";
         scomaddr    0x020130c3;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -227,7 +221,6 @@
     {
         name        "EN.NX.CXA.CXA_XPT.XPT_SCOMFIR.FIR_MASK_REG";
         scomaddr    0x02013003;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -264,7 +257,6 @@
     {
         name        "EH.PB.MCD.MCDCTL.FIR_MASK_REG";
         scomaddr    0x02013403;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -301,7 +293,6 @@
     {
         name        "EH.PB.MISC.PB_WEST_FIR_MASK_REG";
         scomaddr    0x02010c03;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -338,7 +329,6 @@
     {
         name        "EH.PB.MISC.PB_CENT_FIR_MASK_REG";
         scomaddr    0x02010c43;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -375,7 +365,6 @@
     {
         name        "EH.PB.MISC.PB_EAST_FIR_MASK_REG";
         scomaddr    0x02010c83;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -430,7 +419,6 @@
     {
         name        "EN.TPC.PSIHB.PSIHB_FIR_MASK_REG";
         scomaddr    0x02010903;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -467,7 +455,6 @@
     {
         name        "EN.TPC.INTP.SYNC_FIR_MASK_REG";
         scomaddr    0x020109c3;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -504,7 +491,6 @@
     {
         name        "EN.TPC.PBA.PBAFIRMASK";
         scomaddr    0x02010843;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -541,7 +527,6 @@
     {
         name        "EH.TPC.HCA.EHHCA_FIR_MASK_REG";
         scomaddr    0x02010983;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -578,7 +563,6 @@
     {
         name        "EN.TPC.BRIDGE.HCA.ENHCA_FIR_MASK_REG";
         scomaddr    0x02010943;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -615,7 +599,6 @@
     {
         name        "ES.PE_WRAP_TOP.PE0.PEPBCQ.PBCQ.FIR_MASK_REG";
         scomaddr    0x02012003;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -652,7 +635,6 @@
     {
         name        "ES.PE_WRAP_TOP.PE1.PEPBCQ.PBCQ.FIR_MASK_REG";
         scomaddr    0x02012403;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -689,7 +671,6 @@
     {
         name        "ES.PE_WRAP_TOP.PE2.PEPBCQ.PBCQ.FIR_MASK_REG";
         scomaddr    0x02012803;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -732,7 +713,6 @@
     {
         name        "IOMC1.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x02011E03;
-        capture     type secondary;
         capture     group default;
     };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule
index cdd0eb01b..5d2b440d6 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule
@@ -43,7 +43,6 @@
     {
         name        "ES.PE_WRAP_TOP.TPC.FIR_MASK";
         scomaddr    0x09040002;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -58,7 +57,6 @@
     {
         name        "ES.PE_WRAP_TOP.TPC.EPS.FIR.SPA_MASK";
         scomaddr    0x09040007;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -79,7 +77,6 @@
     {
         name        "ES.PE_WRAP_TOP.TPC.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0904000d;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -121,7 +118,6 @@
     {
         name        "ES.PE_WRAP_TOP.PE0.PH3_TOP.ETU.RSB.PR_REGS.LEM.FIR_MASK_REG";
         scomaddr    0x09012003;
-        capture     type secondary;
         capture     group never; #FIXME: RTC 67200
     };
 
@@ -158,7 +154,6 @@
     {
         name        "ES.PE_WRAP_TOP.PE1.PH3_TOP.ETU.RSB.PR_REGS.LEM.FIR_MASK_REG";
         scomaddr    0x09012403;
-        capture     type secondary;
         capture     group never; #FIXME: RTC 67200
     };
 
@@ -195,7 +190,6 @@
     {
         name        "ES.PE_WRAP_TOP.PE2.PH3_TOP.ETU.RSB.PR_REGS.LEM.FIR_MASK_REG";
         scomaddr    0x09012803;
-        capture     type secondary;
         capture     group never; #FIXME: RTC 67200
     };
 
@@ -232,7 +226,6 @@
     {
         name        "ES.PBES_WRAP_TOP.PBES_TOP.MISC_IOF.SCOM.PB_IOF_FIR_MASK_REG";
         scomaddr    0x09010803;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -269,7 +262,6 @@
     {
         name        "IOP.IOP_X880.IOP_PMA0.IOP_PMA_PLL0.IOP_PMA_PLL_RLM.IOP_PMA_PLL_REG_CONTROL.FIR_MASK_REG";
         scomaddr    0x09011403;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -306,7 +298,6 @@
     {
         name        "IOP.IOP_X881.IOP_PMA0.IOP_PMA_PLL0.IOP_PMA_PLL_RLM.IOP_PMA_PLL_REG_CONTROL.FIR_MASK_REG";
         scomaddr    0x09011843;
-        capture     type secondary;
         capture     group default;
     };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
index 4c6be886c..957313790 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
@@ -43,7 +43,6 @@
     {
         name        "EH.TPCHIP.TPC.FIR_MASK";
         scomaddr    0x01040002;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -58,7 +57,6 @@
     {
         name        "EH.TPCHIP.TPC.EPS.FIR.SPA_MASK";
         scomaddr    0x01040007;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -79,7 +77,6 @@
     {
         name        "EH.TPCHIP.TPC.LOCAL_FIR_AND";
         scomaddr    0x0104000b;
-        capture     type secondary;
         capture     group never;
     };
 
@@ -87,17 +84,9 @@
     {
         name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0104000d;
-        capture     type secondary;
         capture     group default;
     };
 
-    register TP_LFIR_MASK_AND
-    {
-        name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_MASK_AND";
-        scomaddr    0x0104000e;
-        capture     group never;
-    };
-
     register TP_LFIR_MASK_OR
     {
         name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_MASK_OR";
@@ -138,7 +127,6 @@
     {
         name        "EH.TPCHIP.OCC.OCI.SCOM.OCC_SCOM_OCCLFIRMASK";
         scomaddr    0x01010803;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -175,7 +163,6 @@
     {
         name        "EH.TPCHIP.PIB.LPCM.LPC.SYNC_FIR_MASK_REG";
         scomaddr    0x01010c03;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -212,7 +199,6 @@
     {
         name        "EH.TPCHIP.OCC.PMC.PMC_LFIR_ERR_MASK_REG";
         scomaddr    0x01010843;
-        capture     type secondary;
         capture     group default;
     };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule
index 43279dd30..b879435ab 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule
@@ -43,7 +43,6 @@
     {
         name        "EN.PB.TPC.FIR_MASK";
         scomaddr    0x04040002;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -64,7 +63,6 @@
     {
         name        "EN.PB.TPC.EPS.FIR.LOCAL_FIR_MASK";
         scomaddr    0x0404000d;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -101,7 +99,6 @@
     {
         name        "EN.PB.PBEN.MISC_IO.SCOM.FIR_MASK_REG";
         scomaddr    0x04010c03;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -138,7 +135,6 @@
     {
         name        "XBUS01.X0.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x04011003;
-        capture     type secondary;
         capture     group never; #FIXME: RTC 67200
     };
 
@@ -175,7 +171,6 @@
     {
         name        "XBUS01.X1.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x04011403;
-        capture     type secondary;
         capture     group default;
     };
 
@@ -212,7 +207,6 @@
     {
         name        "XBUS23.X0.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x04011803;
-        capture     type secondary;
         capture     group never; #FIXME: RTC 67200
     };
 
@@ -249,7 +243,6 @@
     {
         name        "XBUS23.X1.XBUS1.BUSCTL.SCOM.FIR_MASK_REG";
         scomaddr    0x04011c03;
-        capture     type secondary;
         capture     group never; #FIXME: RTC 67200
     };