Skip to content

Commit

Permalink
PRD: Reenable some CXX testcases
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@zane131
Brian Stegmiller authored and zane131 committed Jan 31, 2017
1 parent cfac9c0 commit 52bdcae
Show file tree
Hide file tree
Showing 12 changed files with 365 additions and 164 deletions.
6 changes: 2 additions & 4 deletions src/usr/diag/mdia/test/makefile
View file
Expand Up @@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2012,2016
# Contributors Listed Below - COPYRIGHT 2012,2017
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -45,8 +45,6 @@ OBJS += mdiafakecm.o

MODULE = testmdia

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

include ${ROOTPATH}/config.mk
42 changes: 22 additions & 20 deletions src/usr/diag/prdf/test/prdfTest_ABus.H
View file
Expand Up @@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down Expand Up @@ -43,44 +45,44 @@ class PBESFIR:public CxxTest::TestSuite

void TestRecoverable(void)
{
PRDS_BEGIN("PBESFIR Recoverable attention");
PRDS_BEGIN("PBIOOFIR Recoverable attention");
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0xa0570000);
// GLOBAL_RE_FIR set bit 8
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B , 0x0080000000000000);
// ABUS_CHIPLET_RE_FIR set bit 2
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08040001, 0x2000000000000000);
// set bit 0
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08010800, 0x8000000000000000);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x720C0014);
// GLOBAL_RE_FIR set bit 5
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B , 0x0400000000000000);
// NEST Chiplet (recov error) set bit 14
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040001, 0x0002000000000000);
// set bit 20 (A0 link framer error)
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013800, 0x0000080000000000);
// ACT1
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08010807, 0xFFFFFFFFFFFFFFFF);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013807, 0xFFFFFFFFFFFFFFFF);
PRDS_START_SIM();
if(!(PRDS_END()))
{
TS_FAIL("Expected Signature Failed PBESFIR Recoverable attention");
TS_FAIL("Expected Signature Failed PBIOOFIR Recoverable attention");
}
}

void TestCheckstop(void)
{
/*
PRDS_BEGIN("PBESFIR Checkstop attention");
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::CHECK_STOP);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:ABUS{1}", 0xa0570003);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x720c001c);
// GLOBAL_RE_FIR set bit 8
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001C , 0x0080000000000000);
// ABUS_CHIPLET_RE_FIR set bit 4
PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08040000, 0x0800000000000000);
// set bit 3
PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08010800, 0x1000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001C , 0x0400000000000000);
// NEST Chiplet (chkstop error) set bit 16
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040000, 0x0000800000000000);


// set bit 28 (PSR A0 even link down error)
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013800, 0x0000000800000000);
// ACT1
PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08010807, 0x0000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013807, 0x0000000000000000);
PRDS_START_SIM();
if(!(PRDS_END()))
{
TS_FAIL("Expected Signature Failed PBESFIR Checkstop attention");
}
*/
}
};
#endif
40 changes: 23 additions & 17 deletions src/usr/diag/prdf/test/prdfTest_CenTpLFir.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014 */
/* Contributors Listed Below - COPYRIGHT 2014,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -48,50 +48,56 @@ class CTPLFIR:public CxxTest::TestSuite
{
PRDS_BEGIN("Centaur PLL test");

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

PRDS_EXPECTED_SIGNATURE("NODE{0}:MEMBUF{4}",0x00ed0000 );
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );

//GLOBAL_RE_FIR
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x570F001B, 0x4000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);

//TP_CHIPLET_RE_FIR
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040001, 0x4000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);

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

//TP_LFIR_ACT1
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);

PRDS_START_SIM();

PRDS_END();
if(!(PRDS_END()))
{
TS_FAIL("Expected Signature Failed Centaur PLL test");
}
}

void TestCenPllAtThreshold(void)
{
PRDS_BEGIN("Centaur PLL test At Threshold");

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

PRDS_EXPECTED_SIGNATURE("NODE{0}:MEMBUF{4}",0x00ed0000 );
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );

//GLOBAL_RE_FIR
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x570F001B, 0x4000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);

//TP_CHIPLET_RE_FIR
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040001, 0x4000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);

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

//TP_LFIR_ACT1
PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);

PRDS_START_SIM();

PRDS_END();
if(!(PRDS_END()))
{
TS_FAIL("Centaur PLL test At Threshold");
}
}

};
Expand Down
76 changes: 47 additions & 29 deletions src/usr/diag/prdf/test/prdfTest_Ex.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2014 */
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -48,21 +48,26 @@ class ExLFIR:public CxxTest::TestSuite

void TestRecoverable(void)
{
PRDS_BEGIN("EXLFIR recoverable attention");
PRDS_BEGIN("ECLFIR recoverable attention");
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{5}", 0xb53a0007);
// GLOBAL_RE_FIR set bit 21
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000040000000000);
// EX_CHIPLET_RE_FIR[1] Attention from EXLFIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040001, 0x4000000000000000);
// set EXLFIR[7]
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x1004000a, 0x0100000000000000);
// EXLFIR_ACT1
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040011, 0xFFFFFFFFFFFFFFFF);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x33e70007);
// GLOBAL_RE_FIR set bit 32
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000000080000000);
// EC_CHIPLET_RE_FIR[1] Attention from ECLFIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20040001, 0x4000000000000000);
// set ECLFIR[7]
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x2004000a, 0x0100000000000000);
// ECLFIR_ACT1
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20040011, 0xFFFFFFFFFFFFFFFF);

PRDS_START_SIM();
if(!(PRDS_END()))
{
TS_FAIL("Expected Signature Failed EXLFIR recoverable attention");
TS_FAIL("Expected Signature Failed ECLFIR recoverable attention");
}
}

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

PRDS_BEGIN("L3CE Test");
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{4}", 0xc6b00004);
// GLOBAL_RE_FIR bit 20
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000080000000000);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}", 0xf08d0004);
// GLOBAL_RE_FIR bit 16
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000800000000000);
// EX_CHIPLET_RE_FIR[4] - Analyze L3FIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10040001, 0x0800000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}", 0x10040001,
0x2000000000000000);
// EX_L3FIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10010800, 0x0800000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}",
0x10011800, 0x0800000000000000);
// EX_L3FIR_ACT1
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10010807, 0x0800000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}",
0x10011807, 0x0800000000000000);
PRDS_START_SIM();
if(!(PRDS_END()))
{
Expand All @@ -91,27 +99,37 @@ class ExLFIR:public CxxTest::TestSuite
{
PRDS_BEGIN("COREFIR recoverable attention");
PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{5}", 0xc8e9003c);
PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0xdd3f003c);

// GLOBAL_RE_FIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000040000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000000080000000);
// GLOBALUNITXSTPFIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x51040001, 0x0000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x50040018, 0x0000000000000000);
// EX_CHIPLET_RE_FIR
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040001, 0x2000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20040001, 0x2000000000000000);
// EX_CHIPLET_RE_FIR_MASK
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040002, 0x20ffffc000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20040002, 0x20ffffc000000000);
// COREFIR bit 60 on
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013100, 0x0000000000000008);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20010a40, 0x0000000000000008);
// COREFIR WOF bit 60 on
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013108, 0x0000000000000008);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20010A48, 0x0000000000000008);
// COREFIR_ACT0
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013106, 0x15a20c688a448b01);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20010A46, 0x15a20c688a448b01);
// COREFIR_ACT1
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013107, 0xfefc17f7ff9c8a09);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20010A47, 0xfefc17f7ff9c8a09);
// COREHMEER
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x1001329B, 0xac10080000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20010A96, 0xac10080000000000);
// SPATTN_0
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013007, 0x0000000000000000);
PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
0x20010A99, 0x0000000000000000);

PRDS_START_SIM();
if(!(PRDS_END()))
Expand Down

0 comments on commit 52bdcae

Please sign in to comment.