cpu: split PPC64 map data into separate files

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-07-30 17:17:21 +01:00
parent 3ecbac95cd
commit 2c127947ae
9 changed files with 57 additions and 34 deletions

View File

@ -1,6 +1,13 @@
cpumapdir = $(pkgdatadir)/cpu_map
cpumap_DATA = \
cpu_map/index.xml \
cpu_map/ppc64_vendors.xml \
cpu_map/ppc64_POWER7.xml \
cpu_map/ppc64_POWER9.xml \
cpu_map/ppc64_POWERPC_e6500.xml \
cpu_map/ppc64_POWER6.xml \
cpu_map/ppc64_POWER8.xml \
cpu_map/ppc64_POWERPC_e5500.xml \
$(NULL)
EXTRA_DIST += $(cpumap_DATA)

View File

@ -2340,43 +2340,16 @@
</arch>
<arch name='ppc64'>
<!-- vendor definitions -->
<vendor name='IBM'/>
<vendor name='Freescale'/>
<include filename="ppc64_vendors.xml"/>
<!-- IBM-based CPU models -->
<model name='POWER6'>
<vendor name='IBM'/>
<pvr value='0x003e0000' mask='0xffff0000'/>
</model>
<model name='POWER7'>
<vendor name='IBM'/>
<pvr value='0x003f0000' mask='0xffff0000'/>
<pvr value='0x004a0000' mask='0xffff0000'/>
</model>
<model name='POWER8'>
<vendor name='IBM'/>
<pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/>
<pvr value='0x004d0000' mask='0xffff0000'/>
</model>
<model name='POWER9'>
<vendor name='IBM'/>
<pvr value='0x004e0000' mask='0xffff0000'/>
</model>
<include filename="ppc64_POWER6.xml"/>
<include filename="ppc64_POWER7.xml"/>
<include filename="ppc64_POWER8.xml"/>
<include filename="ppc64_POWER9.xml"/>
<!-- Freescale-based CPU models -->
<model name='POWERPC_e5500'>
<vendor name='Freescale'/>
<pvr value='0x80240000' mask='0xffff0000'/>
</model>
<model name='POWERPC_e6500'>
<vendor name='Freescale'/>
<pvr value='0x80400000' mask='0xffff0000'/>
</model>
<include filename="ppc64_POWERPC_e5500.xml"/>
<include filename="ppc64_POWERPC_e6500.xml"/>
</arch>
</cpus>

View File

@ -0,0 +1,6 @@
<cpus>
<model name='POWER6'>
<vendor name='IBM'/>
<pvr value='0x003e0000' mask='0xffff0000'/>
</model>
</cpus>

View File

@ -0,0 +1,7 @@
<cpus>
<model name='POWER7'>
<vendor name='IBM'/>
<pvr value='0x003f0000' mask='0xffff0000'/>
<pvr value='0x004a0000' mask='0xffff0000'/>
</model>
</cpus>

View File

@ -0,0 +1,8 @@
<cpus>
<model name='POWER8'>
<vendor name='IBM'/>
<pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/>
<pvr value='0x004d0000' mask='0xffff0000'/>
</model>
</cpus>

View File

@ -0,0 +1,6 @@
<cpus>
<model name='POWER9'>
<vendor name='IBM'/>
<pvr value='0x004e0000' mask='0xffff0000'/>
</model>
</cpus>

View File

@ -0,0 +1,6 @@
<cpus>
<model name='POWERPC_e5500'>
<vendor name='Freescale'/>
<pvr value='0x80240000' mask='0xffff0000'/>
</model>
</cpus>

View File

@ -0,0 +1,6 @@
<cpus>
<model name='POWERPC_e6500'>
<vendor name='Freescale'/>
<pvr value='0x80400000' mask='0xffff0000'/>
</model>
</cpus>

View File

@ -0,0 +1,4 @@
<cpus>
<vendor name='IBM'/>
<vendor name='Freescale'/>
</cpus>