diff options
Diffstat (limited to 'src/usr/targeting/common')
7 files changed, 59 insertions, 171 deletions
diff --git a/src/usr/targeting/common/targetservice.C b/src/usr/targeting/common/targetservice.C index f208d9e24..c38bb5cbf 100644 --- a/src/usr/targeting/common/targetservice.C +++ b/src/usr/targeting/common/targetservice.C @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/targeting/targetservice.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/targeting/common/targetservice.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2011-2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ /** * @file targeting/common/targetservice.C * @@ -512,13 +512,18 @@ void TargetService::dump() const TARG_INF("XSCOM Base Address = 0x%016llX",l_xscomBaseAddr); } - XscomChipInfo l_xscomChipInfo = {0}; - if ( (*iv_targets)[i].tryGetAttr<ATTR_XSCOM_CHIP_INFO>( - l_xscomChipInfo) ) + uint8_t l_Node_Id = 0; + if ( (*iv_targets)[i].tryGetAttr<ATTR_FABRIC_NODE_ID>(l_Node_Id)) { - TARG_INF("XSCOM Node ID = 0x%X",l_xscomChipInfo.nodeId); - TARG_INF("XSCOM Chip ID = 0x%X",l_xscomChipInfo.chipId); + TARG_INF("XSCOM Node ID = 0x%X",l_Node_Id); } + + uint8_t l_Chip_Id = 0; + if ( (*iv_targets)[i].tryGetAttr<ATTR_FABRIC_CHIP_ID>(l_Chip_Id)) + { + TARG_INF("XSCOM Chip ID = 0x%X",l_Chip_Id); + } + } return; diff --git a/src/usr/targeting/common/test/testcommontargeting.H b/src/usr/targeting/common/test/testcommontargeting.H index 37430fdb2..13cd07418 100644 --- a/src/usr/targeting/common/test/testcommontargeting.H +++ b/src/usr/targeting/common/test/testcommontargeting.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/targeting/test/targetingtest.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/targeting/common/test/testcommontargeting.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2011-2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __TARGETING_COMMON_TESTCOMMONTARGETING_H #define __TARGETING_COMMON_TESTCOMMONTARGETING_H @@ -1067,10 +1067,10 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite uint64_t l_xscom = l_pTarget->getAttr<TARGETING::ATTR_XSCOM_BASE_ADDRESS>(); - if(l_xscom != 0x300000000000ULL) + if(l_xscom != 0x0003FC0000000000) { TARG_TS_FAIL("l_xscom value is 0x%016llX, not 0x%016llX as expected in direct " - "attribute access",l_xscom,0x300000000000ULL); + "attribute access",l_xscom,0x0003FC00000000ULL); } TARG_TS_TRACE(INF_MRK "Now using FAPI get macros"); diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index c08772264..1fdc6bdb0 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -677,36 +677,13 @@ <description>System XSCOM base address</description> <simpleType> <uint64_t> - <default>0x300000000000</default> + <default>0x0003FC0000000000</default> </uint64_t> </simpleType> <persistency>non-volatile</persistency> <readable/> </attribute> -<attribute> - <id>XSCOM_CHIP_INFO</id> - <description>Attribute which describes XSCOM chip info</description> - <complexType> - <description>Structure which defines chip info necessary for XSCOM. - Only applicable for chip targets which support XSCOM. Structure is - read-only</description> - <field> - <name>nodeId</name> - <description>Unique ID of node containing the chip</description> - <type>uint8_t</type> - <default>0</default> - </field> - <field> - <name>chipId</name> - <description>Unique ID of chip, relative to node</description> - <type>uint8_t</type> - <default>0</default> - </field> - </complexType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> <attribute> <id>XSCOM_VIRTUAL_ADDR</id> diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index 3b5fdbc4d..5d993d7e2 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -158,13 +158,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0</default> </attribute> @@ -724,13 +717,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1</default> </attribute> @@ -1312,13 +1298,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2</default> </attribute> @@ -1901,13 +1880,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3</default> </attribute> diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml index d5d98eda1..16ce8936c 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -164,13 +164,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0</default> </attribute> @@ -1011,13 +1004,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1</default> </attribute> @@ -1878,13 +1864,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2</default> </attribute> @@ -2747,13 +2726,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> <!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3</default> </attribute> @@ -3613,13 +3585,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4</default> </attribute> @@ -4481,13 +4446,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5</default> </attribute> @@ -5347,13 +5305,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6</default> </attribute> @@ -6214,13 +6165,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7</default> </attribute> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index c1a3c833f..e7092b4a0 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -195,9 +195,6 @@ <targetType> <id>chip-processor-power8</id> <parent>chip-processor</parent> - <attribute> - <id>XSCOM_CHIP_INFO</id> - </attribute> <attribute><id>DUMMY_RW</id></attribute> <attribute><id>DUMMY_HEAP_ZERO_DEFAULT</id></attribute> <attribute> diff --git a/src/usr/targeting/common/xmltohb/vbu.system.xml b/src/usr/targeting/common/xmltohb/vbu.system.xml index cd7bcb19b..1e152b22a 100644 --- a/src/usr/targeting/common/xmltohb/vbu.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu.system.xml @@ -153,13 +153,6 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0</default> </attribute> |
