From ea02ebaa03ef01969dbd93d3203aaa2d97e6341c Mon Sep 17 00:00:00 2001 From: crgeddes Date: Tue, 9 May 2017 08:53:31 -0500 Subject: Remove depricated interrupt BAR attributes We were supported attributes that are not getting used anywhere. To reduce confusion I am removing them Change-Id: I166c1295494707ae5c9c49fff922a11121bbc9f6 RTC:174000 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40277 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Wade B. Ouren Reviewed-by: William G. Hoffa Reviewed-by: Daniel M. Crowell --- src/usr/targeting/common/genHwsvMrwXml.pl | 84 ----------------- src/usr/targeting/common/processMrw.pl | 8 -- .../targeting/common/xmltohb/attribute_types.xml | 100 --------------------- .../common/xmltohb/simics_NIMBUS.system.xml | 40 --------- src/usr/targeting/common/xmltohb/target_types.xml | 8 -- .../targeting/common/xmltohb/vbu_NIMBUS.system.xml | 40 --------- 6 files changed, 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( " 0x%016X\n", $psiBase ); printf( " \n" ); - #PHB 64 bit MMIO address (PHB0-PHB5) - printf( " PHB_MMIO_ADDRS_64\n" ); - printf( " \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( " \n" ); - printf( " \n" ); - - #PHB 32 Bit MMIO address (PHB0-PHB5) - printf( " PHB_MMIO_ADDRS_32\n" ); - printf( " \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( " \n" ); - printf( " \n" ); - - #PHB XIVE ESB address (PHB0-PHB5) - printf( " PHB_XIVE_ESB_ADDRS\n" ); - printf( " \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( " \n" ); - printf( " \n" ); - - #PHB Register Space address (PHB0-PHB5) - printf( " PHB_REG_ADDRS\n" ); - printf( " \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( " \n" ); - printf( " \n" ); - - #XIVE Routing ESB address - printf( " XIVE_ROUTING_ESB_ADDR\n" ); - printf( " 0x%016X\n", - 0x0006010000000000 + $nodeSize*$lognode + $chipSize*$logid ); - printf( " \n" ); - - #XIVE Routing END address - printf( " XIVE_ROUTING_END_ADDR\n" ); - printf( " 0x%016X\n", - 0x0006011000000000 + $nodeSize*$lognode + $chipSize*$logid ); - printf( " \n" ); - - #XIVE Presentation NVT address - printf( " XIVE_PRESENTATION_NVT_ADDR\n" ); - printf( " 0x%016X\n", - 0x0006012000000000 + $nodeSize*$lognode + $chipSize*$logid ); - printf( " \n" ); - #VAS Hypervisor Window Contexts address printf( " VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR\n" ); printf( " 0x%016X\n", @@ -4040,12 +3962,6 @@ sub generate_proc 0x0006030203100000 + $nodeSize*$lognode + $chipSize*$logid ); printf( " \n" ); - #XIVE - Presentation Bar address - printf( " XIVE_PRESENTATION_BAR_ADDR\n" ); - printf( " 0x%016X\n", - 0x0006030203180000 + $nodeSize*$lognode + $chipSize*$logid ); - printf( " \n" ); - #XIVE - Thread Management Bar Address register 1 printf( " XIVE_THREAD_MGMT1_BAR_ADDR\n" ); printf( " 0x%016X\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 @@ -18858,94 +18858,6 @@ Measured in GB - - PHB_MMIO_ADDRS_64 - PHB0-PHB5 64 bits addresses - MMIO consumed by PHYP - - - - 6 - - non-volatile - - - - - PHB_MMIO_ADDRS_32 - PHB0-PHB5 32 bit addresses - MMIO consumed by PHYP - - - - 6 - - non-volatile - -` - - - PHB_XIVE_ESB_ADDRS - PHB0-PHB5 XIVE ESB addresses - MMIO consumed by PHYP - - - - 6 - - non-volatile - - - - - PHB_REG_ADDRS - PHB0-PHB5 Register Space addresses - MMIO consumed by PHYP - - - - 6 - - non-volatile - - - - - XIVE_ROUTING_ESB_ADDR - XIVE Routing ESB address - MMIO consumed by PHYP - - - - - non-volatile - - - - - XIVE_ROUTING_END_ADDR - XIVE Routing END address - MMIO consumed by PHYP - - - - - non-volatile - - - - - XIVE_PRESENTATION_NVT_ADDR - XIVE Presentation NVT address - MMIO consumed by PHYP - - - - - non-volatile - - - VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR VAS - Hypervisor Window Contexts address @@ -19040,18 +18952,6 @@ Measured in GB - - XIVE_PRESENTATION_BAR_ADDR - XIVE - Presentation Bar address - MMIO consumed by PHYP - - - - - non-volatile - - - XIVE_THREAD_MGMT1_BAR_ADDR XIVE - Thread Management Bar address register 1 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 @@ INTP_BASE_ADDR 0x0003FFFF80100000 - PHB_MMIO_ADDRS_64 - - 0x0006040000000000,0x0006042000000000, - 0x0006044000000000,0x0006046000000000, - 0x0006048000000000,0x000604A000000000, - - - PHB_MMIO_ADDRS_32 - - 0x000604C000000000,0x000604C080000000, - 0x000604C100000000,0x000604C180000000, - 0x000604C200000000,0x000604C280000000, - - - PHB_XIVE_ESB_ADDRS - - 0x000604C300000000,0x000604C320000000, - 0x000604C340000000,0x000604C360000000, - 0x000604C380000000,0x000604C3A0000000, - - - PHB_REG_ADDRS - - 0x000604C3C0000000,0x000604C3C0100000, - 0x000604C3C0200000,0x000604C3C0300000, - 0x000604C3C0400000,0x000604C3C0500000, - - - XIVE_ROUTING_ESB_ADDR - 0x0006050000000000 - - XIVE_ROUTING_END_ADDR - 0x0006051000000000 - - XIVE_PRESENTATION_NVT_ADDR - 0x0006052000000000 - VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR 0x0006053000000000 @@ -5440,9 +5403,6 @@ XIVE_CONTROLLER_BAR_ADDR 0x0006070201100000 - XIVE_PRESENTATION_BAR_ADDR - 0x0006070203180000 - 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 @@ RNG_BAR_SIZE IMT_BASE_ADDR IMT_BAR_SIZE - 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 @@ -1045,7 +1038,6 @@ NVIDIA_PHY0_REG_ADDR NVIDIA_PHY1_REG_ADDR XIVE_CONTROLLER_BAR_ADDR - XIVE_PRESENTATION_BAR_ADDR PSI_HB_ESB_ADDR XIVE_THREAD_MGMT1_BAR_ADDR NX_RNG_ADDR 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 @@ INTP_BASE_ADDR 0x0003FFFF80100000 - PHB_MMIO_ADDRS_64 - - 0x0006040000000000,0x0006042000000000, - 0x0006044000000000,0x0006046000000000, - 0x0006048000000000,0x000604A000000000, - - - PHB_MMIO_ADDRS_32 - - 0x000604C000000000,0x000604C080000000, - 0x000604C100000000,0x000604C180000000, - 0x000604C200000000,0x000604C280000000, - - - PHB_XIVE_ESB_ADDRS - - 0x000604C300000000,0x000604C320000000, - 0x000604C340000000,0x000604C360000000, - 0x000604C380000000,0x000604C3A0000000, - - - PHB_REG_ADDRS - - 0x000604C3C0000000,0x000604C3C0100000, - 0x000604C3C0200000,0x000604C3C0300000, - 0x000604C3C0400000,0x000604C3C0500000, - - - XIVE_ROUTING_ESB_ADDR - 0x0006050000000000 - - XIVE_ROUTING_END_ADDR - 0x0006051000000000 - - XIVE_PRESENTATION_NVT_ADDR - 0x0006052000000000 - VAS_HYPERVISOR_WINDOW_CONTEXT_ADDR 0x0006053000000000 @@ -5367,9 +5330,6 @@ XIVE_CONTROLLER_BAR_ADDR 0x0006070201100000 - XIVE_PRESENTATION_BAR_ADDR - 0x0006070203180000 - -- cgit v1.2.3