diff options
Diffstat (limited to 'src/usr/targeting')
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_MURANO.system.xml | 8 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_VENICE.system.xml | 28 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/TULETA.mrw.xml | 8 | ||||
-rwxr-xr-x | src/usr/targeting/xmltohb/genHwsvMrwXml.pl | 19 |
4 files changed, 37 insertions, 26 deletions
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index f154fb129..60b92a9fe 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -821,10 +821,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>1</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0003FFE100000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80100000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80100000</default> @@ -2026,10 +2026,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>3</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0003FFE300000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80300000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80300000</default> diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml index 32bab9ce8..c0ab6578f 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -1132,10 +1132,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>1</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0003FFF000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80100000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80100000</default> @@ -2068,10 +2068,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>2</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0004000000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80200000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80200000</default> @@ -3004,10 +3004,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>3</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0004001000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80300000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80300000</default> @@ -3938,10 +3938,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>4</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0004002000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80400000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80400000</default> @@ -4874,10 +4874,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>5</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0004003000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80500000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80500000</default> @@ -5808,10 +5808,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>6</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0004004000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80600000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80600000</default> @@ -6743,10 +6743,10 @@ </attribute> <attribute><id>VPD_REC_NUM</id><default>7</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0004005000000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80700000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80700000</default> diff --git a/src/usr/targeting/xmltohb/TULETA.mrw.xml b/src/usr/targeting/xmltohb/TULETA.mrw.xml index 0bdc726cc..62f349292 100644 --- a/src/usr/targeting/xmltohb/TULETA.mrw.xml +++ b/src/usr/targeting/xmltohb/TULETA.mrw.xml @@ -759,10 +759,10 @@ </attribute> <!-- Data from PHYP Memory Map --> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0003FFE100000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80100000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80100000</default> @@ -1899,10 +1899,10 @@ </attribute> <!-- Data from PHYP Memory Map --> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0003FFE300000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80300000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80300000</default> diff --git a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl index 3fbd4be28..5fff50462 100755 --- a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl +++ b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl @@ -1299,16 +1299,27 @@ sub generate_proc print "\n"; print " <!-- Data from PHYP Memory Map -->\n"; + # Calculate the FSP and PSI BRIGDE BASE ADDR + my $fspBase = 0; + my $psiBase = 0; + foreach my $i (@{$psiBus->{'psi-bus'}}) + { + if ( $i->{'processor'}->{target}->{position} eq $proc ) + { + $fspBase = 0x0003FFE000000000 + 0x100000000*$proc; + $psiBase = 0x0003FFFE80000000 + 0x100000*$proc; + last; + } + } + # Starts at 1024TB - 128GB, 4GB per proc printf( " <attribute><id>FSP_BASE_ADDR</id>\n" ); - printf( " <default>0x%016X</default>\n", - 0x0003FFE000000000 + 0x100000000*$proc ); + printf( " <default>0x%016X</default>\n", $fspBase ); printf( " </attribute>\n" ); # Starts at 1024TB - 6GB, 1MB per link/proc printf( " <attribute><id>PSI_BRIDGE_BASE_ADDR</id>\n" ); - printf( " <default>0x%016X</default>\n", - 0x0003FFFE80000000 + 0x100000*$proc ); + printf( " <default>0x%016X</default>\n", $psiBase ); printf( " </attribute>\n" ); # Starts at 1024TB - 2GB, 1MB per proc |