diff --git a/src/usr/errl/errlentry_consts.H b/src/usr/errl/errlentry_consts.H index d92a6939562..3f57621958d 100644 --- a/src/usr/errl/errlentry_consts.H +++ b/src/usr/errl/errlentry_consts.H @@ -96,7 +96,6 @@ const epubTargetTypeToSub_t TARGET_TO_SUBSYS_TABLE[] = { TARGETING::TYPE_MI , EPUB_MEMORY_CONTROLLER }, { TARGETING::TYPE_DMI , EPUB_MEMORY_SUBSYS }, { TARGETING::TYPE_OBUS , EPUB_PROCESSOR_BUS_CTL }, - { TARGETING::TYPE_NV , EPUB_PROCESSOR_SUBSYS }, { TARGETING::TYPE_PEC , EPUB_IO_PHB }, { TARGETING::TYPE_PHB , EPUB_IO_PHB }, }; diff --git a/src/usr/targeting/common/entitypath.C b/src/usr/targeting/common/entitypath.C index 18254187676..7dc3b927336 100644 --- a/src/usr/targeting/common/entitypath.C +++ b/src/usr/targeting/common/entitypath.C @@ -417,9 +417,6 @@ const char* EntityPath::pathElementTypeAsString( return "DMI"; case TYPE_OBUS: return "OBUS"; - //@TODO RTC:173529 -- Remove NV once it is not used anywhere - case TYPE_NV: - return "NV"; case TYPE_OBUS_BRICK: return "OBUS_BRICK"; case TYPE_NPU: diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index b9bb4f20cf3..b6236084a42 100755 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -49,7 +49,6 @@ - Attribute indicating the target's model @@ -4717,10 +4716,6 @@ OBUS 40 - - NV - 41 - SBE 42 diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml index 833d9c35db8..dbe4f30ae90 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml @@ -6560,414 +6560,6 @@ MI - - sys0node0proc0nv0 - unit-nv-cumulus - - AFFINITY_PATH - affinity:sys-0/node-0/proc-0/nv-0 - - - - - CHIP_UNIT - 0 - - - CLASS - UNIT - - - DECONFIG_GARDABLE - 1 - - - FAPI_NAME - pu.nv:k0:n0:s0:p00:c0 - - - FAPI_POS - 0 - - - HUID - 0x00290000 - - - - - - - - ORDINAL_ID - 0 - - - PHYS_PATH - physical:sys-0/node-0/proc-0/nv-0 - - - PRIMARY_CAPABILITIES - - reserved0 - supportsFsiScom1 - supportsInbandScom0 - supportsXscom1 - - - - REL_POS - 0 - - - RESOURCE_IS_CRITICAL - 0 - - - TYPE - NV - - - - sys0node0proc0nv1 - unit-nv-cumulus - - AFFINITY_PATH - affinity:sys-0/node-0/proc-0/nv-1 - - - - - CHIP_UNIT - 1 - - - CLASS - UNIT - - - DECONFIG_GARDABLE - 1 - - - FAPI_NAME - pu.nv:k0:n0:s0:p00:c1 - - - FAPI_POS - 1 - - - HUID - 0x00290001 - - - - - - - - ORDINAL_ID - 1 - - - PHYS_PATH - physical:sys-0/node-0/proc-0/nv-1 - - - PRIMARY_CAPABILITIES - - reserved0 - supportsFsiScom1 - supportsInbandScom0 - supportsXscom1 - - - - REL_POS - 1 - - - RESOURCE_IS_CRITICAL - 0 - - - TYPE - NV - - - - sys0node0proc0nv2 - unit-nv-cumulus - - AFFINITY_PATH - affinity:sys-0/node-0/proc-0/nv-2 - - - - - CHIP_UNIT - 2 - - - CLASS - UNIT - - - DECONFIG_GARDABLE - 1 - - - FAPI_NAME - pu.nv:k0:n0:s0:p00:c2 - - - FAPI_POS - 2 - - - HUID - 0x00290002 - - - - - - - - ORDINAL_ID - 2 - - - PHYS_PATH - physical:sys-0/node-0/proc-0/nv-2 - - - PRIMARY_CAPABILITIES - - reserved0 - supportsFsiScom1 - supportsInbandScom0 - supportsXscom1 - - - - REL_POS - 2 - - - RESOURCE_IS_CRITICAL - 0 - - - TYPE - NV - - - - sys0node0proc0nv3 - unit-nv-cumulus - - AFFINITY_PATH - affinity:sys-0/node-0/proc-0/nv-3 - - - - - CHIP_UNIT - 3 - - - CLASS - UNIT - - - DECONFIG_GARDABLE - 1 - - - FAPI_NAME - pu.nv:k0:n0:s0:p00:c3 - - - FAPI_POS - 3 - - - HUID - 0x00290003 - - - - - - - - ORDINAL_ID - 3 - - - PHYS_PATH - physical:sys-0/node-0/proc-0/nv-3 - - - PRIMARY_CAPABILITIES - - reserved0 - supportsFsiScom1 - supportsInbandScom0 - supportsXscom1 - - - - REL_POS - 3 - - - RESOURCE_IS_CRITICAL - 0 - - - TYPE - NV - - - - sys0node0proc0nv4 - unit-nv-cumulus - - AFFINITY_PATH - affinity:sys-0/node-0/proc-0/nv-4 - - - - - CHIP_UNIT - 4 - - - CLASS - UNIT - - - DECONFIG_GARDABLE - 1 - - - FAPI_NAME - pu.nv:k0:n0:s0:p00:c4 - - - FAPI_POS - 4 - - - HUID - 0x00290004 - - - - - - - - ORDINAL_ID - 4 - - - PHYS_PATH - physical:sys-0/node-0/proc-0/nv-4 - - - PRIMARY_CAPABILITIES - - reserved0 - supportsFsiScom1 - supportsInbandScom0 - supportsXscom1 - - - - REL_POS - 4 - - - RESOURCE_IS_CRITICAL - 0 - - - TYPE - NV - - - - sys0node0proc0nv5 - unit-nv-cumulus - - AFFINITY_PATH - affinity:sys-0/node-0/proc-0/nv-5 - - - - - CHIP_UNIT - 5 - - - CLASS - UNIT - - - DECONFIG_GARDABLE - 1 - - - FAPI_NAME - pu.nv:k0:n0:s0:p00:c5 - - - FAPI_POS - 5 - - - HUID - 0x00290005 - - - - - - - - ORDINAL_ID - 5 - - - PHYS_PATH - physical:sys-0/node-0/proc-0/nv-5 - - - PRIMARY_CAPABILITIES - - reserved0 - supportsFsiScom1 - supportsInbandScom0 - supportsXscom1 - - - - REL_POS - 5 - - - RESOURCE_IS_CRITICAL - 0 - - - TYPE - NV - - sys0node0proc0obus0 unit-obus-cumulus diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index a7d3fc44bb1..6e1d84ebe08 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -1724,50 +1724,6 @@ - - - unit-nv-power9 - unit-obus-power9 - - NV - TYPE - - - 1 - DECONFIG_GARDABLE - - HUID - - FABRIC - CDM_DOMAIN - - - PARENT_PERVASIVE - - - 0x00000001 - HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - - - - - unit-nv-nimbus - unit-nv-power9 - - NIMBUS - MODEL - - - - - unit-nv-cumulus - unit-nv-power9 - - CUMULUS - MODEL - - - unit-npu-power9 diff --git a/src/usr/targeting/xmltohb/fapi_utils.pl b/src/usr/targeting/xmltohb/fapi_utils.pl index 6cba971ef11..d2d262c9210 100644 --- a/src/usr/targeting/xmltohb/fapi_utils.pl +++ b/src/usr/targeting/xmltohb/fapi_utils.pl @@ -258,7 +258,6 @@ (\%,\%) TARGET_TYPE_CAPP => "unit-capp-power9", TARGET_TYPE_DMI => "unit-dmi-power9", TARGET_TYPE_OBUS => "unit-obus-power9", - TARGET_TYPE_NV => "unit-nv-power9", TARGET_TYPE_SBE => "unit-sbe-power9", TARGET_TYPE_PPE => "unit-ppe-power9", TARGET_TYPE_PERV => "unit-perv-power9",