summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsrc/usr/targeting/common/genHwsvMrwXml.pl84
-rw-r--r--src/usr/targeting/common/processMrw.pl8
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types.xml100
-rw-r--r--src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml40
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/target_types.xml8
-rw-r--r--src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml40
6 files changed, 0 insertions, 280 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index e01d2db78..2341e0773 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -3914,84 +3914,6 @@ sub generate_proc
printf( " <default>0x%016X</default>\n", $psiBase );
printf( " </attribute>\n" );
- #PHB 64 bit MMIO address (PHB0-PHB5)
- printf( " <attribute><id>PHB_MMIO_ADDRS_64</id>\n" );
- printf( " <default>\n" );
- printf( " 0x%016X,0x%016X,\n",
- 0x0006000000000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x0006002000000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x0006004000000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x0006006000000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x0006008000000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600A000000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " </default>\n" );
- printf( " </attribute>\n" );
-
- #PHB 32 Bit MMIO address (PHB0-PHB5)
- printf( " <attribute><id>PHB_MMIO_ADDRS_32</id>\n" );
- printf( " <default>\n" );
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C000000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C080000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C100000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C180000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C200000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C280000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " </default>\n" );
- printf( " </attribute>\n" );
-
- #PHB XIVE ESB address (PHB0-PHB5)
- printf( " <attribute><id>PHB_XIVE_ESB_ADDRS</id>\n" );
- printf( " <default>\n" );
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C300000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C320000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C340000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C360000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C380000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C3A0000000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " </default>\n" );
- printf( " </attribute>\n" );
-
- #PHB Register Space address (PHB0-PHB5)
- printf( " <attribute><id>PHB_REG_ADDRS</id>\n" );
- printf( " <default>\n" );
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C3C0000000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C3C0100000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C3C0200000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C3C0300000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " 0x%016X,0x%016X,\n",
- 0x000600C3C0400000 + $nodeSize*$lognode + $chipSize*$logid,
- 0x000600C3C0500000 + $nodeSize*$lognode + $chipSize*$logid);
- printf( " </default>\n" );
- printf( " </attribute>\n" );
-
- #XIVE Routing ESB address
- printf( " <attribute><id>XIVE_ROUTING_ESB_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0006010000000000 + $nodeSize*$lognode + $chipSize*$logid );
- printf( " </attribute>\n" );
-
- #XIVE Routing END address
- printf( " <attribute><id>XIVE_ROUTING_END_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0006011000000000 + $nodeSize*$lognode + $chipSize*$logid );
- printf( " </attribute>\n" );
-
- #XIVE Presentation NVT address
- printf( " <attribute><id>XIVE_PRESENTATION_NVT_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0006012000000000 + $nodeSize*$lognode + $chipSize*$logid );
- printf( " </attribute>\n" );
-
#VAS Hypervisor Window Contexts address
printf( " <attribute><id>VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR</id>\n" );
printf( " <default>0x%016X</default>\n",
@@ -4040,12 +3962,6 @@ sub generate_proc
0x0006030203100000 + $nodeSize*$lognode + $chipSize*$logid );
printf( " </attribute>\n" );
- #XIVE - Presentation Bar address
- printf( " <attribute><id>XIVE_PRESENTATION_BAR_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0006030203180000 + $nodeSize*$lognode + $chipSize*$logid );
- printf( " </attribute>\n" );
-
#XIVE - Thread Management Bar Address register 1
printf( " <attribute><id>XIVE_THREAD_MGMT1_BAR_ADDR</id>\n" );
printf( " <default>0x%016X</default>\n",
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index 97d9901a5..8ae25699c 100644
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -745,13 +745,6 @@ sub setupBars
my @bars=( "FSP_BASE_ADDR",
"PSI_BRIDGE_BASE_ADDR",
"INTP_BASE_ADDR",
- "PHB_MMIO_ADDRS_64",
- "PHB_MMIO_ADDRS_32",
- "PHB_XIVE_ESB_ADDRS",
- "PHB_REG_ADDRS",
- "XIVE_ROUTING_ESB_ADDR",
- "XIVE_ROUTING_END_ADDR",
- "XIVE_PRESENTATION_NVT_ADDR",
"VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR",
"VAS_USER_WINDOW_CONTEXT_ADDR",
"LPC_BUS_ADDR",
@@ -761,7 +754,6 @@ sub setupBars
"NVIDIA_PHY1_REG_ADDR",
"PSI_HB_ESB_ADDR",
"XIVE_CONTROLLER_BAR_ADDR",
- "XIVE_PRESENTATION_BAR_ADDR",
"XSCOM_BASE_ADDRESS",
"NX_RNG_ADDR");
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index e18eeab28..1f9f693e6 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -18859,94 +18859,6 @@ Measured in GB</description>
</attribute>
<attribute>
- <id>PHB_MMIO_ADDRS_64</id>
- <description>PHB0-PHB5 64 bits addresses
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- <array>6</array>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
- <id>PHB_MMIO_ADDRS_32</id>
- <description>PHB0-PHB5 32 bit addresses
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- <array>6</array>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>`
-
-<attribute>
- <id>PHB_XIVE_ESB_ADDRS</id>
- <description>PHB0-PHB5 XIVE ESB addresses
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- <array>6</array>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
- <id>PHB_REG_ADDRS</id>
- <description>PHB0-PHB5 Register Space addresses
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- <array>6</array>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
- <id>XIVE_ROUTING_ESB_ADDR</id>
- <description>XIVE Routing ESB address
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
- <id>XIVE_ROUTING_END_ADDR</id>
- <description>XIVE Routing END address
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
- <id>XIVE_PRESENTATION_NVT_ADDR</id>
- <description>XIVE Presentation NVT address
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
<id>VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR</id>
<description>VAS - Hypervisor Window Contexts address
MMIO consumed by PHYP
@@ -19041,18 +18953,6 @@ Measured in GB</description>
</attribute>
<attribute>
- <id>XIVE_PRESENTATION_BAR_ADDR</id>
- <description>XIVE - Presentation Bar address
- MMIO consumed by PHYP
- </description>
- <simpleType>
- <uint64_t></uint64_t>
- </simpleType>
- <persistency>non-volatile</persistency>
- <readable/>
-</attribute>
-
-<attribute>
<id>XIVE_THREAD_MGMT1_BAR_ADDR</id>
<description>XIVE - Thread Management Bar address register 1
MMIO consumed by HB/PHYP
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 5ec3dab3b..24a71bd3c 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -5379,43 +5379,6 @@
<attribute><id>INTP_BASE_ADDR</id>
<default>0x0003FFFF80100000</default>
</attribute>
- <attribute><id>PHB_MMIO_ADDRS_64</id>
- <default>
- 0x0006040000000000,0x0006042000000000,
- 0x0006044000000000,0x0006046000000000,
- 0x0006048000000000,0x000604A000000000,
- </default>
- </attribute>
- <attribute><id>PHB_MMIO_ADDRS_32</id>
- <default>
- 0x000604C000000000,0x000604C080000000,
- 0x000604C100000000,0x000604C180000000,
- 0x000604C200000000,0x000604C280000000,
- </default>
- </attribute>
- <attribute><id>PHB_XIVE_ESB_ADDRS</id>
- <default>
- 0x000604C300000000,0x000604C320000000,
- 0x000604C340000000,0x000604C360000000,
- 0x000604C380000000,0x000604C3A0000000,
- </default>
- </attribute>
- <attribute><id>PHB_REG_ADDRS</id>
- <default>
- 0x000604C3C0000000,0x000604C3C0100000,
- 0x000604C3C0200000,0x000604C3C0300000,
- 0x000604C3C0400000,0x000604C3C0500000,
- </default>
- </attribute>
- <attribute><id>XIVE_ROUTING_ESB_ADDR</id>
- <default>0x0006050000000000</default>
- </attribute>
- <attribute><id>XIVE_ROUTING_END_ADDR</id>
- <default>0x0006051000000000</default>
- </attribute>
- <attribute><id>XIVE_PRESENTATION_NVT_ADDR</id>
- <default>0x0006052000000000</default>
- </attribute>
<attribute><id>VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR</id>
<default>0x0006053000000000</default>
</attribute>
@@ -5440,9 +5403,6 @@
<attribute><id>XIVE_CONTROLLER_BAR_ADDR</id>
<default>0x0006070201100000</default>
</attribute>
- <attribute><id>XIVE_PRESENTATION_BAR_ADDR</id>
- <default>0x0006070203180000</default>
- </attribute>
<!-- <attribute><id>XIVE_THREAD_MGMT1_BAR_ADDR</id>
<default>0x0006060000000000</default>
</attribute>-->
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 469f92620..c8ba6b39f 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -1030,13 +1030,6 @@
<attribute><id>RNG_BAR_SIZE</id></attribute>
<attribute><id>IMT_BASE_ADDR</id></attribute>
<attribute><id>IMT_BAR_SIZE</id></attribute>
- <attribute><id>PHB_MMIO_ADDRS_64</id></attribute>
- <attribute><id>PHB_MMIO_ADDRS_32</id></attribute>
- <attribute><id>PHB_XIVE_ESB_ADDRS</id></attribute>
- <attribute><id>PHB_REG_ADDRS</id></attribute>
- <attribute><id>XIVE_ROUTING_ESB_ADDR</id></attribute>
- <attribute><id>XIVE_ROUTING_END_ADDR</id></attribute>
- <attribute><id>XIVE_PRESENTATION_NVT_ADDR</id></attribute>
<attribute><id>VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR</id></attribute>
<attribute><id>VAS_USER_WINDOW_CONTEXT_ADDR</id></attribute>
<attribute><id>LPC_BUS_ADDR</id></attribute>
@@ -1045,7 +1038,6 @@
<attribute><id>NVIDIA_PHY0_REG_ADDR</id></attribute>
<attribute><id>NVIDIA_PHY1_REG_ADDR</id></attribute>
<attribute><id>XIVE_CONTROLLER_BAR_ADDR</id></attribute>
- <attribute><id>XIVE_PRESENTATION_BAR_ADDR</id></attribute>
<attribute><id>PSI_HB_ESB_ADDR</id></attribute>
<attribute><id>XIVE_THREAD_MGMT1_BAR_ADDR</id></attribute>
<attribute><id>NX_RNG_ADDR</id></attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
index 15146e720..4514eed35 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -5306,43 +5306,6 @@
<attribute><id>INTP_BASE_ADDR</id>
<default>0x0003FFFF80100000</default>
</attribute>
- <attribute><id>PHB_MMIO_ADDRS_64</id>
- <default>
- 0x0006040000000000,0x0006042000000000,
- 0x0006044000000000,0x0006046000000000,
- 0x0006048000000000,0x000604A000000000,
- </default>
- </attribute>
- <attribute><id>PHB_MMIO_ADDRS_32</id>
- <default>
- 0x000604C000000000,0x000604C080000000,
- 0x000604C100000000,0x000604C180000000,
- 0x000604C200000000,0x000604C280000000,
- </default>
- </attribute>
- <attribute><id>PHB_XIVE_ESB_ADDRS</id>
- <default>
- 0x000604C300000000,0x000604C320000000,
- 0x000604C340000000,0x000604C360000000,
- 0x000604C380000000,0x000604C3A0000000,
- </default>
- </attribute>
- <attribute><id>PHB_REG_ADDRS</id>
- <default>
- 0x000604C3C0000000,0x000604C3C0100000,
- 0x000604C3C0200000,0x000604C3C0300000,
- 0x000604C3C0400000,0x000604C3C0500000,
- </default>
- </attribute>
- <attribute><id>XIVE_ROUTING_ESB_ADDR</id>
- <default>0x0006050000000000</default>
- </attribute>
- <attribute><id>XIVE_ROUTING_END_ADDR</id>
- <default>0x0006051000000000</default>
- </attribute>
- <attribute><id>XIVE_PRESENTATION_NVT_ADDR</id>
- <default>0x0006052000000000</default>
- </attribute>
<attribute><id>VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR</id>
<default>0x0006053000000000</default>
</attribute>
@@ -5367,9 +5330,6 @@
<attribute><id>XIVE_CONTROLLER_BAR_ADDR</id>
<default>0x0006070201100000</default>
</attribute>
- <attribute><id>XIVE_PRESENTATION_BAR_ADDR</id>
- <default>0x0006070203180000</default>
- </attribute>
<!-- <attribute><id>XIVE_THREAD_MGMT1_BAR_ADDR</id>
<default>0x0006060000000000</default>
</attribute>-->
OpenPOWER on IntegriCloud