diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2018-02-27 16:51:48 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-08-30 11:14:24 -0500 |
| commit | 1c4ad2c91e38bdd3795533c6992d5604bfa5c7b5 (patch) | |
| tree | 6ec0702c9f2fac47ee6c20dc748488e8a2176749 | |
| parent | 022bd8f4c321040604ce0b2ab453c1b5308f001a (diff) | |
| download | talos-hostboot-1c4ad2c91e38bdd3795533c6992d5604bfa5c7b5.tar.gz talos-hostboot-1c4ad2c91e38bdd3795533c6992d5604bfa5c7b5.zip | |
Remove XSCOM and LPC BARs from MRW processing
ATTR_LPC_BUS_ADDR and ATTR_XSCOM_BASE_ADDRESS are both computed
by Hostboot code during boot. We don't want the MRW to provide
the values.
Change-Id: If5d8d898fa455e13c4114705adf12f5abacb2052
RTC: 174616
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/54806
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
| -rwxr-xr-x | src/usr/targeting/common/processMrw.pl | 18 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/attribute_types.xml | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl index 3d1a04759..b6eac4e5f 100755 --- a/src/usr/targeting/common/processMrw.pl +++ b/src/usr/targeting/common/processMrw.pl @@ -448,12 +448,10 @@ sub processSystem $targetObj->{NUM_PROCS_PER_NODE}); parseBitwise($targetObj,$target,"CDM_POLICIES"); - #@fixme-RTC:174616-Remove deprecated support + #Delete this attribute if it is leftover from an old format if (!$targetObj->isBadAttribute($target,"XSCOM_BASE_ADDRESS") ) { - my ($num,$base,$group_offset,$proc_offset,$offset) = split(/,/, - $targetObj->getAttribute($target,"XSCOM_BASE_ADDRESS")); - $targetObj->setAttribute($target, "XSCOM_BASE_ADDRESS", $base); + $targetObj->deleteAttribute($target,"XSCOM_BASE_ADDRESS"); } # TODO RTC:170860 - Remove this after dimm connector defines VDDR_ID @@ -1314,12 +1312,20 @@ sub setupBars #Each chip in the group has its own 4TB space, #which each group being 32TB of space. my %bars=( "FSP_BASE_ADDR" => 0x0006030100000000, - "LPC_BUS_ADDR" => 0x0006030000000000, - "XSCOM_BASE_ADDRESS" => 0x000603FC00000000, "PSI_BRIDGE_BASE_ADDR" => 0x0006030203000000, "INTP_BASE_ADDR" => 0x0003FFFF80300000, "PSI_HB_ESB_ADDR" => 0x00060302031C0000, "XIVE_CONTROLLER_BAR_ADDR" => 0x0006030203100000); + #Note - Not including XSCOM_BASE_ADDRESS and LPC_BUS_ADDR in here + # because Hostboot code itself writes those on every boot + if (!$targetObj->isBadAttribute($target,"XSCOM_BASE_ADDRESS") ) + { + $targetObj->deleteAttribute($target,"XSCOM_BASE_ADDRESS"); + } + if (!$targetObj->isBadAttribute($target,"LPC_BUS_ADDR") ) + { + $targetObj->deleteAttribute($target,"LPC_BUS_ADDR"); + } my $groupOffset = 0x200000000000; my $procOffset = 0x40000000000; diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 7606491a5..ab6b41e2f 100755 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -1567,7 +1567,7 @@ </attribute> <attribute> - <description>System XSCOM base address</description> + <description>XSCOM base address</description> <id>XSCOM_BASE_ADDRESS</id> <persistency>volatile</persistency> <readable></readable> @@ -1575,6 +1575,7 @@ <simpleType> <uint64_t></uint64_t> </simpleType> + <no_export/> </attribute> <attribute> @@ -4154,6 +4155,7 @@ <simpleType> <uint64_t></uint64_t> </simpleType> + <no_export/> </attribute> <attribute> |
