summaryrefslogtreecommitdiffstats
path: root/src/usr/hwpf
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/hwpf')
-rw-r--r--src/usr/hwpf/hwp/fapiTestHwp.C5
-rwxr-xr-xsrc/usr/hwpf/hwp/initfiles/sample.initfile20
-rw-r--r--src/usr/hwpf/test/hwpftest.H23
3 files changed, 26 insertions, 22 deletions
diff --git a/src/usr/hwpf/hwp/fapiTestHwp.C b/src/usr/hwpf/hwp/fapiTestHwp.C
index 6dc4ef853..4f63e8c02 100644
--- a/src/usr/hwpf/hwp/fapiTestHwp.C
+++ b/src/usr/hwpf/hwp/fapiTestHwp.C
@@ -39,7 +39,7 @@
* mjjones 09/14/2011 Update to scom function name
* camvanng 09/28/2011 Added test for initfile
* camvanng 11/16/2011 Change function name
- * fapiHwpExecInitFile()
+ * fapiHwpExecInitFile()
* mjjones 01/13/2012 Use new ReturnCode interfaces
* mjjones 02/21/2012 Use new Target toEcmdString
* camvanng 05/07/2012 Suppport for associated
@@ -73,7 +73,8 @@ fapi::ReturnCode hwpInitialTest(const std::vector<fapi::Target> & i_target)
do
{
// Use this SCOM register for testing
- const uint64_t l_addr = 0x14010002;
+ //@TODO via RTC: 60769 -- base 15XXXXXX addr on master core
+ const uint64_t l_addr = 0x15010002;
ecmdDataBufferBase l_ScomData(64);
uint64_t l_originalScomData = 0;
diff --git a/src/usr/hwpf/hwp/initfiles/sample.initfile b/src/usr/hwpf/hwp/initfiles/sample.initfile
index 32ffc7d08..1110664d2 100755
--- a/src/usr/hwpf/hwp/initfiles/sample.initfile
+++ b/src/usr/hwpf/hwp/initfiles/sample.initfile
@@ -64,10 +64,12 @@ define MBA0 = TGT1;
define MBA1 = TGT2;
+#@TODO via RTC: 60769 -- base 15XXXXXX addr on master core
+
#--******************************************************************************
#-- Basic SCOM
#--******************************************************************************
-scom 0x0000000014010002 {
+scom 0x0000000015010002 {
scom_data ;
0xAABBC00000000000 ;
}
@@ -76,7 +78,7 @@ scom 0x0000000014010002 {
#-- Basic SCOM with Expression and Attribute
#--******************************************************************************
-scom 0x0000000014030007 {
+scom 0x0000000015030007 {
scom_data, expr ;
0x00000CDE00000000, SYS.ATTR_SCRATCH_UINT8_1 == SYS.ATTR_SCRATCH_UINT8_2 ;
}
@@ -139,7 +141,7 @@ scom 0x000000000006800c {
#--******************************************************************************
#-- Basic SCOM with bits
#--******************************************************************************
-scom 0x0000000014013283 {
+scom 0x0000000015013283 {
bits , scom_data ;
0:11 , 0b001111001001 ;
12 , 0b1 ;
@@ -152,7 +154,7 @@ scom 0x0000000014013283 {
#-- Complext SCOM with Bit Support, define, and attributes
#--******************************************************************************
-scom 0x0000000014013284 {
+scom 0x0000000015013284 {
bits , scom_data, expr ;
0:11 , 0b001111001001, ANY ;
12 , 0b1, def_equal_test ;
@@ -165,7 +167,7 @@ scom 0x0000000014013284 {
#-- Complex SCOM with Bit Support, and logical operators
#--******************************************************************************
-scom 0x0000000014013285 {
+scom 0x0000000015013285 {
bits , scom_data, expr ;
12 , 0b1, def_equal_test && def_not_equal_test ;
12 , 0b0, def_equal_test || def_not_equal_test ;
@@ -183,7 +185,7 @@ scom 0x0000000014013285 {
#-- SCOM with 'ec' column - Use scratch for now since all attributes work
#--******************************************************************************
-scom 0x0000000014013286 {
+scom 0x0000000015013286 {
scom_data, SYS.ATTR_SCRATCH_UINT32_1, SYS.ATTR_SCRATCH_UINT32_2 ;
0x0000000000000192, != 0, >= ENUM_ATTR_SCRATCH_UINT64_ARRAY_2_VAL_B ;
}
@@ -191,7 +193,7 @@ scom 0x0000000014013286 {
#--******************************************************************************
#-- Basic SCOM with an array
#--******************************************************************************
-scom 0x0000000014013287 {
+scom 0x0000000015013287 {
scom_data, expr ;
0x0000000000000182, SYS.ATTR_SCRATCH_UINT8_ARRAY_1[2] == SYS.ATTR_SCRATCH_UINT8_1 ;
}
@@ -199,7 +201,7 @@ scom 0x0000000014013287 {
#--******************************************************************************
#-- SCOM with 'ec' & expr column - Use scratch for now since all attributes work
#--******************************************************************************
-scom 0x0000000014013288 {
+scom 0x0000000015013288 {
scom_data, SYS.ATTR_SCRATCH_UINT32_1, expr;
0x0000000000000192, 3, SYS.ATTR_SCRATCH_UINT8_ARRAY_2[1][2][3] == 0x00000000000000BE;
}
@@ -207,7 +209,7 @@ scom 0x0000000014013288 {
#--******************************************************************************
#-- Complex SCOM with Bit Support, associated attributes and logical operators
#--******************************************************************************
-scom 0x0000000014013289 {
+scom 0x0000000015013289 {
bits, scom_data, MBA1.ATTR_CHIP_UNIT_POS, expr;
23, 0b0, 1, MBA0.ATTR_CHIP_UNIT_POS == 1;
23, MBA1.ATTR_CHIP_UNIT_POS, 1, MBA0.ATTR_CHIP_UNIT_POS == 0;
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index 2f8ce4195..f589c4eac 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -327,6 +327,7 @@ public:
//Note: this data is based on the sample.initfile.
//If the initfile changes, this data will also need to be changed.
+ //@TODO via RTC: 60769 -- base 15XXXXXX addr on master core
ifScom_t l_ifScomData[] =
{
{0x000000000006002b, 0, 0x0000000000000000 |
@@ -337,22 +338,22 @@ public:
{0x000000000006800c, 0, (0x8000000000000000 >> 0x17) |
(0x0000000000000060ll << (64 - (24 + 8))) |
0x0000000000003000},
- {0x0000000014010002, 0, 0xAABBC00000000000},
- {0x0000000014030007, 0, 0x00000CDE00000000},
- {0x0000000014013283, 0, 0x3c90000000000000 |
+ {0x0000000015010002, 0, 0xAABBC00000000000},
+ {0x0000000015030007, 0, 0x00000CDE00000000},
+ {0x0000000015013283, 0, 0x3c90000000000000 |
(0x8000000000000000 >> 0x0c) |
(0x8000000000000000 >> 0x0d) |
(0x0306400412000000 >> 0x0e) |
0x000000000000000D},
- {0x0000000014013284, 0, 0x3c90000000000000},
- {0x0000000014013285, 0, (0x8000000000000000 >> 0x0f) |
+ {0x0000000015013284, 0, 0x3c90000000000000},
+ {0x0000000015013285, 0, (0x8000000000000000 >> 0x0f) |
(0x8000000000000000 >> 0x10) |
(0x8000000000000000 >> 0x13) |
(0x0306400412000000 >> 0x15) },
- {0x0000000014013286, 0, 0x0000000000000192},
- {0x0000000014013287, 0, 0x0000000000000182},
- {0x0000000014013288, 0, 0x0000000000000192},
- {0x0000000014013289, 0, (0x8000000000000000 >> 0x17) |
+ {0x0000000015013286, 0, 0x0000000000000192},
+ {0x0000000015013287, 0, 0x0000000000000182},
+ {0x0000000015013288, 0, 0x0000000000000192},
+ {0x0000000015013289, 0, (0x8000000000000000 >> 0x17) |
(0x4000000000000000 >> 0x18)}
};
@@ -683,8 +684,8 @@ public:
{0x000000000006002c, 0x0000000000000183},
{0x000000000006800b, 0},
{0x000000000006800c, 0x8000000000000000 >> 0x17},
- {0x0000000014010002, 0xAABBC00000000000},
- {0x0000000014030007, 0x00000CDE00000000},
+ {0x0000000015010002, 0xAABBC00000000000},
+ {0x0000000015030007, 0x00000CDE00000000},
};
// Get the master processor chip
OpenPOWER on IntegriCloud