Skip to content

Commit 52bdcae

Browse files
Brian Stegmillerzane131
Brian Stegmiller
authored and
zane131
committed
PRD: Reenable some CXX testcases
Change-Id: Ieb6784976b61a64122a6aa6eaf0263da8d6ea045 RTC: 148565 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33857 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
1 parent cfac9c0 commit 52bdcae

File tree

12 files changed

+365
-164
lines changed

12 files changed

+365
-164
lines changed

‎src/usr/diag/mdia/test/makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# OpenPOWER HostBoot Project
77
#
8-
# Contributors Listed Below - COPYRIGHT 2012,2016
8+
# Contributors Listed Below - COPYRIGHT 2012,2017
99
# [+] International Business Machines Corp.
1010
#
1111
#
@@ -45,8 +45,6 @@ OBJS += mdiafakecm.o
4545

4646
MODULE = testmdia
4747

48-
#TODO RTC 148565 - reenable test cases once they are updated
49-
#TESTS = *.H
50-
TESTS = mdiatestsm.H
48+
TESTS = mdiatestsm.H mdiatesttrace.H mdiatest.H mdiatestworkitem.H mdiatestmonitor.H mdiatestmba.H
5149

5250
include ${ROOTPATH}/config.mk

‎src/usr/diag/prdf/test/prdfTest_ABus.H

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* COPYRIGHT International Business Machines Corp. 2012,2014 */
8+
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
9+
/* [+] International Business Machines Corp. */
10+
/* */
911
/* */
1012
/* Licensed under the Apache License, Version 2.0 (the "License"); */
1113
/* you may not use this file except in compliance with the License. */
@@ -43,44 +45,44 @@ class PBESFIR:public CxxTest::TestSuite
4345

4446
void TestRecoverable(void)
4547
{
46-
PRDS_BEGIN("PBESFIR Recoverable attention");
48+
PRDS_BEGIN("PBIOOFIR Recoverable attention");
4749
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
48-
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0xa0570000);
49-
// GLOBAL_RE_FIR set bit 8
50-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B , 0x0080000000000000);
51-
// ABUS_CHIPLET_RE_FIR set bit 2
52-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08040001, 0x2000000000000000);
53-
// set bit 0
54-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08010800, 0x8000000000000000);
50+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x720C0014);
51+
// GLOBAL_RE_FIR set bit 5
52+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B , 0x0400000000000000);
53+
// NEST Chiplet (recov error) set bit 14
54+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040001, 0x0002000000000000);
55+
// set bit 20 (A0 link framer error)
56+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013800, 0x0000080000000000);
5557
// ACT1
56-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08010807, 0xFFFFFFFFFFFFFFFF);
58+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013807, 0xFFFFFFFFFFFFFFFF);
5759
PRDS_START_SIM();
5860
if(!(PRDS_END()))
5961
{
60-
TS_FAIL("Expected Signature Failed PBESFIR Recoverable attention");
62+
TS_FAIL("Expected Signature Failed PBIOOFIR Recoverable attention");
6163
}
6264
}
6365

6466
void TestCheckstop(void)
6567
{
66-
/*
6768
PRDS_BEGIN("PBESFIR Checkstop attention");
6869
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::CHECK_STOP);
69-
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:ABUS{1}", 0xa0570003);
70+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x720c001c);
7071
// GLOBAL_RE_FIR set bit 8
71-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001C , 0x0080000000000000);
72-
// ABUS_CHIPLET_RE_FIR set bit 4
73-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08040000, 0x0800000000000000);
74-
// set bit 3
75-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08010800, 0x1000000000000000);
72+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001C , 0x0400000000000000);
73+
// NEST Chiplet (chkstop error) set bit 16
74+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040000, 0x0000800000000000);
75+
76+
77+
// set bit 28 (PSR A0 even link down error)
78+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013800, 0x0000000800000000);
7679
// ACT1
77-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08010807, 0x0000000000000000);
80+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013807, 0x0000000000000000);
7881
PRDS_START_SIM();
7982
if(!(PRDS_END()))
8083
{
8184
TS_FAIL("Expected Signature Failed PBESFIR Checkstop attention");
8285
}
83-
*/
8486
}
8587
};
8688
#endif

‎src/usr/diag/prdf/test/prdfTest_CenTpLFir.H

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2014 */
8+
/* Contributors Listed Below - COPYRIGHT 2014,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -48,50 +48,56 @@ class CTPLFIR:public CxxTest::TestSuite
4848
{
4949
PRDS_BEGIN("Centaur PLL test");
5050

51-
PRDS_ERROR_ENTRY("NODE{0}:MEMBUF{4}", PRDF::RECOVERABLE);
51+
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
5252

53-
PRDS_EXPECTED_SIGNATURE("NODE{0}:MEMBUF{4}",0x00ed0000 );
53+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );
5454

5555
//GLOBAL_RE_FIR
56-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x570F001B, 0x4000000000000000);
56+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
5757

5858
//TP_CHIPLET_RE_FIR
59-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040001, 0x4000000000000000);
59+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
6060

61-
//TP_LFIR
62-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x0104000a, 0x0000180000000000);
61+
//TP_LFIR -- bit 21:22 on P9
62+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000060000000000);
6363

6464
//TP_LFIR_ACT1
65-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
65+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
6666

6767
PRDS_START_SIM();
6868

69-
PRDS_END();
69+
if(!(PRDS_END()))
70+
{
71+
TS_FAIL("Expected Signature Failed Centaur PLL test");
72+
}
7073
}
7174

7275
void TestCenPllAtThreshold(void)
7376
{
7477
PRDS_BEGIN("Centaur PLL test At Threshold");
7578

76-
PRDS_ERROR_ENTRY("NODE{0}:MEMBUF{4}", PRDF::RECOVERABLE);
79+
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
7780

78-
PRDS_EXPECTED_SIGNATURE("NODE{0}:MEMBUF{4}",0x00ed0000 );
81+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );
7982

8083
//GLOBAL_RE_FIR
81-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x570F001B, 0x4000000000000000);
84+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
8285

8386
//TP_CHIPLET_RE_FIR
84-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040001, 0x4000000000000000);
87+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
8588

86-
//TP_LFIR
87-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x0104000a, 0x0000180000000000);
89+
//TP_LFIR -- bit 21:22 on P9
90+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000060000000000);
8891

8992
//TP_LFIR_ACT1
90-
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
93+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
9194

9295
PRDS_START_SIM();
9396

94-
PRDS_END();
97+
if(!(PRDS_END()))
98+
{
99+
TS_FAIL("Centaur PLL test At Threshold");
100+
}
95101
}
96102

97103
};

‎src/usr/diag/prdf/test/prdfTest_Ex.H

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2012,2014 */
8+
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -48,21 +48,26 @@ class ExLFIR:public CxxTest::TestSuite
4848

4949
void TestRecoverable(void)
5050
{
51-
PRDS_BEGIN("EXLFIR recoverable attention");
51+
PRDS_BEGIN("ECLFIR recoverable attention");
5252
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
53-
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{5}", 0xb53a0007);
54-
// GLOBAL_RE_FIR set bit 21
55-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000040000000000);
56-
// EX_CHIPLET_RE_FIR[1] Attention from EXLFIR
57-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040001, 0x4000000000000000);
58-
// set EXLFIR[7]
59-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x1004000a, 0x0100000000000000);
60-
// EXLFIR_ACT1
61-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040011, 0xFFFFFFFFFFFFFFFF);
53+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
54+
0x33e70007);
55+
// GLOBAL_RE_FIR set bit 32
56+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000000080000000);
57+
// EC_CHIPLET_RE_FIR[1] Attention from ECLFIR
58+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
59+
0x20040001, 0x4000000000000000);
60+
// set ECLFIR[7]
61+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
62+
0x2004000a, 0x0100000000000000);
63+
// ECLFIR_ACT1
64+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
65+
0x20040011, 0xFFFFFFFFFFFFFFFF);
66+
6267
PRDS_START_SIM();
6368
if(!(PRDS_END()))
6469
{
65-
TS_FAIL("Expected Signature Failed EXLFIR recoverable attention");
70+
TS_FAIL("Expected Signature Failed ECLFIR recoverable attention");
6671
}
6772
}
6873

@@ -71,15 +76,18 @@ class ExLFIR:public CxxTest::TestSuite
7176

7277
PRDS_BEGIN("L3CE Test");
7378
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
74-
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{4}", 0xc6b00004);
75-
// GLOBAL_RE_FIR bit 20
76-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000080000000000);
79+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}", 0xf08d0004);
80+
// GLOBAL_RE_FIR bit 16
81+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000800000000000);
7782
// EX_CHIPLET_RE_FIR[4] - Analyze L3FIR
78-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10040001, 0x0800000000000000);
83+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}", 0x10040001,
84+
0x2000000000000000);
7985
// EX_L3FIR
80-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10010800, 0x0800000000000000);
86+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}",
87+
0x10011800, 0x0800000000000000);
8188
// EX_L3FIR_ACT1
82-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10010807, 0x0800000000000000);
89+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}",
90+
0x10011807, 0x0800000000000000);
8391
PRDS_START_SIM();
8492
if(!(PRDS_END()))
8593
{
@@ -91,27 +99,37 @@ class ExLFIR:public CxxTest::TestSuite
9199
{
92100
PRDS_BEGIN("COREFIR recoverable attention");
93101
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
94-
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{5}", 0xc8e9003c);
102+
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
103+
0xdd3f003c);
104+
95105
// GLOBAL_RE_FIR
96-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000040000000000);
106+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000000080000000);
97107
// GLOBALUNITXSTPFIR
98-
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x51040001, 0x0000000000000000);
108+
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x50040018, 0x0000000000000000);
99109
// EX_CHIPLET_RE_FIR
100-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040001, 0x2000000000000000);
110+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
111+
0x20040001, 0x2000000000000000);
101112
// EX_CHIPLET_RE_FIR_MASK
102-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040002, 0x20ffffc000000000);
113+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
114+
0x20040002, 0x20ffffc000000000);
103115
// COREFIR bit 60 on
104-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013100, 0x0000000000000008);
116+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
117+
0x20010a40, 0x0000000000000008);
105118
// COREFIR WOF bit 60 on
106-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013108, 0x0000000000000008);
119+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
120+
0x20010A48, 0x0000000000000008);
107121
// COREFIR_ACT0
108-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013106, 0x15a20c688a448b01);
122+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
123+
0x20010A46, 0x15a20c688a448b01);
109124
// COREFIR_ACT1
110-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013107, 0xfefc17f7ff9c8a09);
125+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
126+
0x20010A47, 0xfefc17f7ff9c8a09);
111127
// COREHMEER
112-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x1001329B, 0xac10080000000000);
128+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
129+
0x20010A96, 0xac10080000000000);
113130
// SPATTN_0
114-
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013007, 0x0000000000000000);
131+
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
132+
0x20010A99, 0x0000000000000000);
115133

116134
PRDS_START_SIM();
117135
if(!(PRDS_END()))

0 commit comments

Comments
 (0)