From eeed7e762030c6df704da7dd92f650ebdf412ebf Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Fri, 10 Feb 2017 13:12:53 +1100 Subject: hdata_to_dt: Specify PVR on command line Current tests cases are just P8E chips, so specify that. An exercise for the reader is to grab POWER7 and POWER9 dumps. [Minor fixups for the blob patch - Oliver] Signed-off-by: Stewart Smith --- hdata/test/Makefile.check | 15 ++--- hdata/test/hdata_to_dt.c | 12 ++++ hdata/test/p8-840-spira.dts | 44 +++++++------- hdata/test/p81-811.spira.dts | 136 +++++++++++++++++++++---------------------- 4 files changed, 110 insertions(+), 97 deletions(-) diff --git a/hdata/test/Makefile.check b/hdata/test/Makefile.check index 45c0a4e..465d110 100644 --- a/hdata/test/Makefile.check +++ b/hdata/test/Makefile.check @@ -12,22 +12,23 @@ coverage: hdata-coverage LCOV_EXCLUDE += $(HDATA_TEST:%=%.c) hdata/test/stubs.c LCOV_EXCLUDE += /usr/include/valgrind/memcheck.h -hdata/test/hdata_to_dt-check: hdata/test/hdata_to_dt-check-q hdata/test/hdata_to_dt-check-dt +hdata/test/hdata_to_dt-check: hdata/test/hdata_to_dt-check-q +hdata/test/hdata_to_dt-check: hdata/test/hdata_to_dt-check-dt # Add some test ntuples for open source version... hdata/test/hdata_to_dt-check-q: hdata/test/hdata_to_dt - $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -q hdata/test/p81-811.spira hdata/test/p81-811.spira.heap, $<) - $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -s -q hdata/test/p8-840-spira.spirah hdata/test/p8-840-spira.spiras, $<) + $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -8E -q hdata/test/p81-811.spira hdata/test/p81-811.spira.heap, $<) + $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -8E -s -q hdata/test/p8-840-spira.spirah hdata/test/p8-840-spira.spiras, $<) hdata/test/hdata_to_dt-check-dt: hdata/test/hdata_to_dt - $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt hdata/test/p81-811.spira hdata/test/p81-811.spira.heap 2>/dev/null |dtc -I dtb -O dts |diff -u hdata/test/p81-811.spira.dts -, $< device-tree) - $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -s hdata/test/p8-840-spira.spirah hdata/test/p8-840-spira.spiras 2>/dev/null |dtc -I dtb -O dts |diff -u hdata/test/p8-840-spira.dts -, $< device-tree) + $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -8E hdata/test/p81-811.spira hdata/test/p81-811.spira.heap 2>/dev/null |dtc -I dtb -O dts |diff -u hdata/test/p81-811.spira.dts -, $< device-tree) + $(call Q, TEST , $(VALGRIND) hdata/test/hdata_to_dt -8E -s hdata/test/p8-840-spira.spirah hdata/test/p8-840-spira.spiras 2>/dev/null |dtc -I dtb -O dts |diff -u hdata/test/p8-840-spira.dts -, $< device-tree) hdata/test/hdata_to_dt-gcov-run: hdata/test/hdata_to_dt-check-dt-gcov-run hdata/test/hdata_to_dt-check-dt-gcov-run: hdata/test/hdata_to_dt-gcov - $(call Q, TEST-COVERAGE , ./hdata/test/hdata_to_dt-gcov hdata/test/p81-811.spira hdata/test/p81-811.spira.heap 2>/dev/null |dtc -I dtb -O dts|diff -u hdata/test/p81-811.spira.dts -, $< device-tree) - $(call Q, TEST-COVERAGE , ./hdata/test/hdata_to_dt-gcov -s hdata/test/p8-840-spira.spirah hdata/test/p8-840-spira.spiras 2>/dev/null |dtc -I dtb -O dts|diff -u hdata/test/p8-840-spira.dts -, $< device-tree) + $(call Q, TEST-COVERAGE , ./hdata/test/hdata_to_dt-gcov -8E hdata/test/p81-811.spira hdata/test/p81-811.spira.heap 2>/dev/null |dtc -I dtb -O dts|diff -u hdata/test/p81-811.spira.dts -, $< device-tree) + $(call Q, TEST-COVERAGE , ./hdata/test/hdata_to_dt-gcov -8E -s hdata/test/p8-840-spira.spirah hdata/test/p8-840-spira.spiras 2>/dev/null |dtc -I dtb -O dts|diff -u hdata/test/p8-840-spira.dts -, $< device-tree) hdata/test/stubs.o: hdata/test/stubs.c $(call Q, HOSTCC , $(HOSTCC) $(HOSTCFLAGS) -g -c -o $@ $<, $<) diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c index 8573319..2f343e2 100644 --- a/hdata/test/hdata_to_dt.c +++ b/hdata/test/hdata_to_dt.c @@ -231,6 +231,18 @@ int main(int argc, char *argv[]) } else if (strcmp(argv[i], "-b") == 0) { blobs = true; opt_count++; + } else if (strcmp(argv[i], "-7") == 0) { + fake_pvr_type = PVR_TYPE_P7; + opt_count++; + } else if (strcmp(argv[i], "-8E") == 0) { + fake_pvr_type = PVR_TYPE_P8; + opt_count++; + } else if (strcmp(argv[i], "-8") == 0) { + fake_pvr_type = PVR_TYPE_P8; + opt_count++; + } else if (strcmp(argv[i], "-9") == 0) { + fake_pvr_type = PVR_TYPE_P9; + opt_count++; } } diff --git a/hdata/test/p8-840-spira.dts b/hdata/test/p8-840-spira.dts index d961266..c0236dd 100644 --- a/hdata/test/p8-840-spira.dts +++ b/hdata/test/p8-840-spira.dts @@ -25,12 +25,12 @@ #address-cells = <0x1>; #size-cells = <0x0>; - PowerPC,POWER7@28 { + PowerPC,POWER8@28 { phandle = <0x6>; device_type = "cpu"; status = "okay"; reg = <0x28>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -38,7 +38,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -68,12 +68,12 @@ ibm,ppc-interrupt-server#s = <0x28 0x29 0x2a 0x2b 0x2c 0x2d 0x2e 0x2f>; }; - PowerPC,POWER7@60 { + PowerPC,POWER8@60 { phandle = <0xa>; device_type = "cpu"; status = "okay"; reg = <0x60>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -81,7 +81,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -111,12 +111,12 @@ ibm,ppc-interrupt-server#s = <0x60 0x61 0x62 0x63 0x64 0x65 0x66 0x67>; }; - PowerPC,POWER7@68 { + PowerPC,POWER8@68 { phandle = <0xe>; device_type = "cpu"; status = "okay"; reg = <0x68>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -124,7 +124,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -154,12 +154,12 @@ ibm,ppc-interrupt-server#s = <0x68 0x69 0x6a 0x6b 0x6c 0x6d 0x6e 0x6f>; }; - PowerPC,POWER7@b0 { + PowerPC,POWER8@b0 { phandle = <0x12>; device_type = "cpu"; status = "okay"; reg = <0xb0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -167,7 +167,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -197,12 +197,12 @@ ibm,ppc-interrupt-server#s = <0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xb6 0xb7>; }; - PowerPC,POWER7@e8 { + PowerPC,POWER8@e8 { phandle = <0x16>; device_type = "cpu"; status = "okay"; reg = <0xe8>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -210,7 +210,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -240,12 +240,12 @@ ibm,ppc-interrupt-server#s = <0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef>; }; - PowerPC,POWER7@f0 { + PowerPC,POWER8@f0 { phandle = <0x1a>; device_type = "cpu"; status = "okay"; reg = <0xf0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -253,7 +253,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -827,7 +827,7 @@ }; }; - xscom@3c0000000000 { + xscom@3fc0000000000 { phandle = <0x43>; ibm,chip-id = <0x0>; ibm,proc-chip-id = <0x0>; @@ -835,7 +835,7 @@ #size-cells = <0x1>; scom-controller; compatible = "ibm,xscom", "ibm,power7-xscom"; - reg = <0x3c00 0x0 0x8 0x0>; + reg = <0x3fc00 0x0 0x8 0x0>; bus-frequency = <0x0 0x1dcd6500>; ibm,dbob-id = <0x0>; ibm,occ-functional-state = <0x1>; @@ -889,7 +889,7 @@ }; }; - xscom@3c0800000000 { + xscom@3fc0800000000 { phandle = <0x45>; ibm,chip-id = <0x1>; ibm,proc-chip-id = <0x1>; @@ -897,7 +897,7 @@ #size-cells = <0x1>; scom-controller; compatible = "ibm,xscom", "ibm,power7-xscom"; - reg = <0x3c08 0x0 0x8 0x0>; + reg = <0x3fc08 0x0 0x8 0x0>; bus-frequency = <0x0 0x1dcd6500>; ibm,dbob-id = <0x0>; ibm,occ-functional-state = <0x1>; diff --git a/hdata/test/p81-811.spira.dts b/hdata/test/p81-811.spira.dts index ad2551b..2a06cfa 100644 --- a/hdata/test/p81-811.spira.dts +++ b/hdata/test/p81-811.spira.dts @@ -25,12 +25,12 @@ #address-cells = <0x1>; #size-cells = <0x0>; - PowerPC,POWER7@20 { + PowerPC,POWER8@20 { phandle = <0x6>; device_type = "cpu"; status = "okay"; reg = <0x20>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -38,7 +38,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -68,12 +68,12 @@ ibm,ppc-interrupt-server#s = <0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27>; }; - PowerPC,POWER7@30 { + PowerPC,POWER8@30 { phandle = <0xa>; device_type = "cpu"; status = "okay"; reg = <0x30>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -81,7 +81,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -111,12 +111,12 @@ ibm,ppc-interrupt-server#s = <0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37>; }; - PowerPC,POWER7@60 { + PowerPC,POWER8@60 { phandle = <0xe>; device_type = "cpu"; status = "okay"; reg = <0x60>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -124,7 +124,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -154,12 +154,12 @@ ibm,ppc-interrupt-server#s = <0x60 0x61 0x62 0x63 0x64 0x65 0x66 0x67>; }; - PowerPC,POWER7@68 { + PowerPC,POWER8@68 { phandle = <0x12>; device_type = "cpu"; status = "okay"; reg = <0x68>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -167,7 +167,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -197,12 +197,12 @@ ibm,ppc-interrupt-server#s = <0x68 0x69 0x6a 0x6b 0x6c 0x6d 0x6e 0x6f>; }; - PowerPC,POWER7@70 { + PowerPC,POWER8@70 { phandle = <0x16>; device_type = "cpu"; status = "okay"; reg = <0x70>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -210,7 +210,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -240,12 +240,12 @@ ibm,ppc-interrupt-server#s = <0x70 0x71 0x72 0x73 0x74 0x75 0x76 0x77>; }; - PowerPC,POWER7@a8 { + PowerPC,POWER8@a8 { phandle = <0x1a>; device_type = "cpu"; status = "okay"; reg = <0xa8>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -253,7 +253,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -283,12 +283,12 @@ ibm,ppc-interrupt-server#s = <0xa8 0xa9 0xaa 0xab 0xac 0xad 0xae 0xaf>; }; - PowerPC,POWER7@b0 { + PowerPC,POWER8@b0 { phandle = <0x1e>; device_type = "cpu"; status = "okay"; reg = <0xb0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -296,7 +296,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -326,12 +326,12 @@ ibm,ppc-interrupt-server#s = <0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xb6 0xb7>; }; - PowerPC,POWER7@e0 { + PowerPC,POWER8@e0 { phandle = <0x22>; device_type = "cpu"; status = "okay"; reg = <0xe0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -339,7 +339,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -369,12 +369,12 @@ ibm,ppc-interrupt-server#s = <0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 0xe7>; }; - PowerPC,POWER7@e8 { + PowerPC,POWER8@e8 { phandle = <0x26>; device_type = "cpu"; status = "okay"; reg = <0xe8>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -382,7 +382,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -412,12 +412,12 @@ ibm,ppc-interrupt-server#s = <0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef>; }; - PowerPC,POWER7@f0 { + PowerPC,POWER8@f0 { phandle = <0x2a>; device_type = "cpu"; status = "okay"; reg = <0xf0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -425,7 +425,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -455,12 +455,12 @@ ibm,ppc-interrupt-server#s = <0xf0 0xf1 0xf2 0xf3 0xf4 0xf5 0xf6 0xf7>; }; - PowerPC,POWER7@828 { + PowerPC,POWER8@828 { phandle = <0x2e>; device_type = "cpu"; status = "okay"; reg = <0x828>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -468,7 +468,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -498,12 +498,12 @@ ibm,ppc-interrupt-server#s = <0x828 0x829 0x82a 0x82b 0x82c 0x82d 0x82e 0x82f>; }; - PowerPC,POWER7@830 { + PowerPC,POWER8@830 { phandle = <0x32>; device_type = "cpu"; status = "okay"; reg = <0x830>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -511,7 +511,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -541,12 +541,12 @@ ibm,ppc-interrupt-server#s = <0x830 0x831 0x832 0x833 0x834 0x835 0x836 0x837>; }; - PowerPC,POWER7@860 { + PowerPC,POWER8@860 { phandle = <0x36>; device_type = "cpu"; status = "okay"; reg = <0x860>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -554,7 +554,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -584,12 +584,12 @@ ibm,ppc-interrupt-server#s = <0x860 0x861 0x862 0x863 0x864 0x865 0x866 0x867>; }; - PowerPC,POWER7@868 { + PowerPC,POWER8@868 { phandle = <0x3a>; device_type = "cpu"; status = "okay"; reg = <0x868>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -597,7 +597,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -627,12 +627,12 @@ ibm,ppc-interrupt-server#s = <0x868 0x869 0x86a 0x86b 0x86c 0x86d 0x86e 0x86f>; }; - PowerPC,POWER7@870 { + PowerPC,POWER8@870 { phandle = <0x3e>; device_type = "cpu"; status = "okay"; reg = <0x870>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -640,7 +640,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -670,12 +670,12 @@ ibm,ppc-interrupt-server#s = <0x870 0x871 0x872 0x873 0x874 0x875 0x876 0x877>; }; - PowerPC,POWER7@8a0 { + PowerPC,POWER8@8a0 { phandle = <0x42>; device_type = "cpu"; status = "okay"; reg = <0x8a0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -683,7 +683,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -713,12 +713,12 @@ ibm,ppc-interrupt-server#s = <0x8a0 0x8a1 0x8a2 0x8a3 0x8a4 0x8a5 0x8a6 0x8a7>; }; - PowerPC,POWER7@8a8 { + PowerPC,POWER8@8a8 { phandle = <0x46>; device_type = "cpu"; status = "okay"; reg = <0x8a8>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -726,7 +726,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -756,12 +756,12 @@ ibm,ppc-interrupt-server#s = <0x8a8 0x8a9 0x8aa 0x8ab 0x8ac 0x8ad 0x8ae 0x8af>; }; - PowerPC,POWER7@8b0 { + PowerPC,POWER8@8b0 { phandle = <0x4a>; device_type = "cpu"; status = "okay"; reg = <0x8b0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -769,7 +769,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -799,12 +799,12 @@ ibm,ppc-interrupt-server#s = <0x8b0 0x8b1 0x8b2 0x8b3 0x8b4 0x8b5 0x8b6 0x8b7>; }; - PowerPC,POWER7@8e8 { + PowerPC,POWER8@8e8 { phandle = <0x4e>; device_type = "cpu"; status = "okay"; reg = <0x8e8>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -812,7 +812,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -842,12 +842,12 @@ ibm,ppc-interrupt-server#s = <0x8e8 0x8e9 0x8ea 0x8eb 0x8ec 0x8ed 0x8ee 0x8ef>; }; - PowerPC,POWER7@8f0 { + PowerPC,POWER8@8f0 { phandle = <0x52>; device_type = "cpu"; status = "okay"; reg = <0x8f0>; - cpu-version = <0x3f>; + cpu-version = <0x4d>; 64-bit; 32-64-bridge; graphics; @@ -855,7 +855,7 @@ ibm,processor-segment-sizes = <0x1c 0x28 0xffffffff 0xffffffff>; ibm,processor-page-sizes = <0xc 0x10 0x18 0x22>; ibm,segment-page-sizes = <0xc 0x0 0x3 0xc 0x0 0x10 0x7 0x18 0x38 0x10 0x110 0x2 0x10 0x1 0x18 0x8 0x18 0x100 0x1 0x18 0x0 0x22 0x120 0x1 0x22 0x3>; - ibm,pa-features = <0x600f63f 0xc70080c0>; + ibm,pa-features = [18 00 f6 3f c7 c0 80 d0 80 00 00 00 00 00 00 00 00 00 80 00 80 00 80 00 80 00]; ibm,slb-size = <0x20>; ibm,vmx = <0x2>; ibm,dfp = <0x2>; @@ -2006,7 +2006,7 @@ }; }; - xscom@3c0000000000 { + xscom@3fc0000000000 { phandle = <0x84>; ibm,chip-id = <0x0>; ibm,proc-chip-id = <0x0>; @@ -2014,7 +2014,7 @@ #size-cells = <0x1>; scom-controller; compatible = "ibm,xscom", "ibm,power7-xscom"; - reg = <0x3c00 0x0 0x8 0x0>; + reg = <0x3fc00 0x0 0x8 0x0>; bus-frequency = <0x0 0x1dcd6500>; ibm,dbob-id = <0x0>; ibm,occ-functional-state = <0x1>; @@ -2068,7 +2068,7 @@ }; }; - xscom@3c0800000000 { + xscom@3fc0800000000 { phandle = <0x86>; ibm,chip-id = <0x1>; ibm,proc-chip-id = <0x1>; @@ -2076,7 +2076,7 @@ #size-cells = <0x1>; scom-controller; compatible = "ibm,xscom", "ibm,power7-xscom"; - reg = <0x3c08 0x0 0x8 0x0>; + reg = <0x3fc08 0x0 0x8 0x0>; bus-frequency = <0x0 0x1dcd6500>; ibm,dbob-id = <0x0>; ibm,occ-functional-state = <0x1>; @@ -2127,7 +2127,7 @@ }; }; - xscom@3c8000000000 { + xscom@3fc8000000000 { phandle = <0x88>; ibm,chip-id = <0x10>; ibm,proc-chip-id = <0x2>; @@ -2135,7 +2135,7 @@ #size-cells = <0x1>; scom-controller; compatible = "ibm,xscom", "ibm,power7-xscom"; - reg = <0x3c80 0x0 0x8 0x0>; + reg = <0x3fc80 0x0 0x8 0x0>; bus-frequency = <0x0 0x1dcd6500>; ibm,dbob-id = <0x0>; ibm,occ-functional-state = <0x1>; @@ -2177,7 +2177,7 @@ }; }; - xscom@3c8800000000 { + xscom@3fc8800000000 { phandle = <0x8a>; ibm,chip-id = <0x11>; ibm,proc-chip-id = <0x3>; @@ -2185,7 +2185,7 @@ #size-cells = <0x1>; scom-controller; compatible = "ibm,xscom", "ibm,power7-xscom"; - reg = <0x3c88 0x0 0x8 0x0>; + reg = <0x3fc88 0x0 0x8 0x0>; bus-frequency = <0x0 0x1dcd6500>; ibm,dbob-id = <0x0>; ibm,occ-functional-state = <0x1>; -- cgit v1.1