Skip to content

Commit

Permalink
Remove CONFIG_AXONE_BRING_UP from xscomtest
Browse files Browse the repository at this point in the history
Initially tried with local checkstop register,
but that register has simics actions which will
clear the set bit0. This was previously incorrectly
setting the wrong bit, but FIR action was executed
and setting bit0.  To make things cleaner a new
FIR register was chosen that doesn't have simics
actions associated with it.

Change-Id: Iae2d429b82b8c3eab94db2f46495a1b488347b15
RTC:201738
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80426
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Corey V Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
mderkse1 authored and dcrowell77 committed Jul 28, 2019
1 parent 07b0559 commit 2e406ca
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/usr/xscom/test/xscomtest.H
Expand Up @@ -71,9 +71,10 @@ const testXscomAddrData g_xscomMultiWriteTable[] =
{0x21010A89, 0x0200000000000000},
{0x22010A89, 0x0030000000000000},
{0x23010A89, 0x0004000000000000},
// Local checkstop regs
{0x10040018, 0x1000000000000000}, // ChipletID 0x10
{0x20040018, 0x1000000000000000}, // ChipletID 0x20
// Group0 Xstop mask regs, TPEQPCC.EPS.FIR.GXSTOP0_MASK_REG
// Use register without actions attached to it
{0x10040014, 0x8000000000000000}, // ChipletID 0x10, set bit0
{0x20040014, 0x8000000000000000}, // ChipletID 0x20, set bit0
};
const uint32_t g_xscomMultiWriteTableSz =
sizeof(g_xscomMultiWriteTable)/sizeof(testXscomAddrData);
Expand All @@ -85,10 +86,10 @@ const testXscomAddrData g_xscomMultiReadTable[] =
// Scratch reg 3
// Multicast OR op
{0x41010a89, 0x1234000000000000},
// Local checkstop regs
// Group0 Xstop Mask regs, TPEQPCC.EPS.FIR.GXSTOP0_MASK_REG
// ChipletID 0x10 0x20
// Multicast BITWISE op
{0x50040018, 0x0000800080000000},
{0x50040014, 0x0000800080000000},
};
const uint32_t g_xscomMultiReadTableSz =
sizeof(g_xscomMultiReadTable)/sizeof(testXscomAddrData);
Expand Down Expand Up @@ -404,8 +405,8 @@ public:
uint32_t l_num;

do {
#if defined(CONFIG_EARLY_TESTCASES) || defined(CONFIG_AXONE_BRING_UP)
TS_TRACE("testXscom4: Skipping test, multicast groups not setup yet");
#if defined(CONFIG_EARLY_TESTCASES)
TS_INFO("testXscom4: Skipping test, multicast groups not setup yet");
break;
#endif

Expand Down

0 comments on commit 2e406ca

Please sign in to comment.