hdata/vpd: Rework vpd node creation logic

Presently we traverse SLCA structure to create various FRU nodes under /vpd
node. We assumed that children are always contiguous. It happened to be
contiguous in P8 and worked fine, but failed in P9 system. So it ended up
populating duplicate node under wrong parent. Also failed to populate some
of the nodes.

Unfortunately there is no way to reach all the children of a given parent
from parent node :-( Hence we have to rework vpd creation logic.

This patch goes through all the SLCA entries serially and creates vpd node.
Assumptions:
  - SLCA index is always serial (0..n)
  - When we traverse serially parent entry comes before child
  - Redundant resources are always consecutive
  - Populate node if SLCA has 'installed' and 'VPD collected' bit set

CC: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

1 files changed, 89 insertions, 95 deletions

diff --git a/hdata/test/p8-840-spira.dts b/hdata/test/p8-840-spira.dts
index dbb36183..a3844345 100644
--- a/hdata/test/p8-840-spira.dts
+++ b/hdata/test/p8-840-spira.dts
@@ -23,12 +23,12 @@
 	ibm,enabled-idle-states = "nap", "fast-sleep", "rvwinkle";
 
 	cpus {
-		phandle = <0x5>;
+		phandle = <0x22>;
 		#address-cells = <0x1>;
 		#size-cells = <0x0>;
 
 		PowerPC,POWER8@28 {
-			phandle = <0x6>;
+			phandle = <0x23>;
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x28>;
@@ -64,14 +64,14 @@
 			i-cache-sets = <0x4>;
 			d-cache-sets = <0x8>;
 			performance-monitor = <0x0 0x1>;
-			l2-cache = <0x7>;
+			l2-cache = <0x24>;
 			ibm,pir = <0x28>;
 			ibm,chip-id = <0x0>;
 			ibm,ppc-interrupt-server#s = <0x28 0x29 0x2a 0x2b 0x2c 0x2d 0x2e 0x2f>;
 		};
 
 		PowerPC,POWER8@60 {
-			phandle = <0xa>;
+			phandle = <0x27>;
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x60>;
@@ -107,14 +107,14 @@
 			i-cache-sets = <0x4>;
 			d-cache-sets = <0x8>;
 			performance-monitor = <0x0 0x1>;
-			l2-cache = <0xb>;
+			l2-cache = <0x28>;
 			ibm,pir = <0x60>;
 			ibm,chip-id = <0x0>;
 			ibm,ppc-interrupt-server#s = <0x60 0x61 0x62 0x63 0x64 0x65 0x66 0x67>;
 		};
 
 		PowerPC,POWER8@68 {
-			phandle = <0xe>;
+			phandle = <0x2b>;
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x68>;
@@ -150,14 +150,14 @@
 			i-cache-sets = <0x4>;
 			d-cache-sets = <0x8>;
 			performance-monitor = <0x0 0x1>;
-			l2-cache = <0xf>;
+			l2-cache = <0x2c>;
 			ibm,pir = <0x68>;
 			ibm,chip-id = <0x0>;
 			ibm,ppc-interrupt-server#s = <0x68 0x69 0x6a 0x6b 0x6c 0x6d 0x6e 0x6f>;
 		};
 
 		PowerPC,POWER8@b0 {
-			phandle = <0x12>;
+			phandle = <0x2f>;
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xb0>;
@@ -193,14 +193,14 @@
 			i-cache-sets = <0x4>;
 			d-cache-sets = <0x8>;
 			performance-monitor = <0x0 0x1>;
-			l2-cache = <0x13>;
+			l2-cache = <0x30>;
 			ibm,pir = <0xb0>;
 			ibm,chip-id = <0x1>;
 			ibm,ppc-interrupt-server#s = <0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xb6 0xb7>;
 		};
 
 		PowerPC,POWER8@e8 {
-			phandle = <0x16>;
+			phandle = <0x33>;
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xe8>;
@@ -236,14 +236,14 @@
 			i-cache-sets = <0x4>;
 			d-cache-sets = <0x8>;
 			performance-monitor = <0x0 0x1>;
-			l2-cache = <0x17>;
+			l2-cache = <0x34>;
 			ibm,pir = <0xe8>;
 			ibm,chip-id = <0x1>;
 			ibm,ppc-interrupt-server#s = <0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef>;
 		};
 
 		PowerPC,POWER8@f0 {
-			phandle = <0x1a>;
+			phandle = <0x37>;
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xf0>;
@@ -279,14 +279,14 @@
 			i-cache-sets = <0x4>;
 			d-cache-sets = <0x8>;
 			performance-monitor = <0x0 0x1>;
-			l2-cache = <0x1b>;
+			l2-cache = <0x38>;
 			ibm,pir = <0xf0>;
 			ibm,chip-id = <0x1>;
 			ibm,ppc-interrupt-server#s = <0xf0 0xf1 0xf2 0xf3 0xf4 0xf5 0xf6 0xf7>;
 		};
 
 		l2-cache@20000028 {
-			phandle = <0x7>;
+			phandle = <0x24>;
 			device_type = "cache";
 			reg = <0x20000028>;
 			status = "okay";
@@ -295,11 +295,11 @@
 			i-cache-sets = <0x8>;
 			d-cache-size = <0x80000>;
 			i-cache-size = <0x80000>;
-			l2-cache = <0x8>;
+			l2-cache = <0x25>;
 		};
 
 		l2-cache@20000060 {
-			phandle = <0xb>;
+			phandle = <0x28>;
 			device_type = "cache";
 			reg = <0x20000060>;
 			status = "okay";
@@ -308,11 +308,11 @@
 			i-cache-sets = <0x8>;
 			d-cache-size = <0x80000>;
 			i-cache-size = <0x80000>;
-			l2-cache = <0xc>;
+			l2-cache = <0x29>;
 		};
 
 		l2-cache@20000068 {
-			phandle = <0xf>;
+			phandle = <0x2c>;
 			device_type = "cache";
 			reg = <0x20000068>;
 			status = "okay";
@@ -321,11 +321,11 @@
 			i-cache-sets = <0x8>;
 			d-cache-size = <0x80000>;
 			i-cache-size = <0x80000>;
-			l2-cache = <0x10>;
+			l2-cache = <0x2d>;
 		};
 
 		l2-cache@200000b0 {
-			phandle = <0x13>;
+			phandle = <0x30>;
 			device_type = "cache";
 			reg = <0x200000b0>;
 			status = "okay";
@@ -334,11 +334,11 @@
 			i-cache-sets = <0x8>;
 			d-cache-size = <0x80000>;
 			i-cache-size = <0x80000>;
-			l2-cache = <0x14>;
+			l2-cache = <0x31>;
 		};
 
 		l2-cache@200000e8 {
-			phandle = <0x17>;
+			phandle = <0x34>;
 			device_type = "cache";
 			reg = <0x200000e8>;
 			status = "okay";
@@ -347,11 +347,11 @@
 			i-cache-sets = <0x8>;
 			d-cache-size = <0x80000>;
 			i-cache-size = <0x80000>;
-			l2-cache = <0x18>;
+			l2-cache = <0x35>;
 		};
 
 		l2-cache@200000f0 {
-			phandle = <0x1b>;
+			phandle = <0x38>;
 			device_type = "cache";
 			reg = <0x200000f0>;
 			status = "okay";
@@ -360,11 +360,11 @@
 			i-cache-sets = <0x8>;
 			d-cache-size = <0x80000>;
 			i-cache-size = <0x80000>;
-			l2-cache = <0x1c>;
+			l2-cache = <0x39>;
 		};
 
 		l3-cache@30000028 {
-			phandle = <0x8>;
+			phandle = <0x25>;
 			device_type = "cache";
 			reg = <0x30000028>;
 			status = "okay";
@@ -376,7 +376,7 @@
 		};
 
 		l3-cache@30000060 {
-			phandle = <0xc>;
+			phandle = <0x29>;
 			device_type = "cache";
 			reg = <0x30000060>;
 			status = "okay";
@@ -388,7 +388,7 @@
 		};
 
 		l3-cache@30000068 {
-			phandle = <0x10>;
+			phandle = <0x2d>;
 			device_type = "cache";
 			reg = <0x30000068>;
 			status = "okay";
@@ -400,7 +400,7 @@
 		};
 
 		l3-cache@300000b0 {
-			phandle = <0x14>;
+			phandle = <0x31>;
 			device_type = "cache";
 			reg = <0x300000b0>;
 			status = "okay";
@@ -412,7 +412,7 @@
 		};
 
 		l3-cache@300000e8 {
-			phandle = <0x18>;
+			phandle = <0x35>;
 			device_type = "cache";
 			reg = <0x300000e8>;
 			status = "okay";
@@ -424,7 +424,7 @@
 		};
 
 		l3-cache@300000f0 {
-			phandle = <0x1c>;
+			phandle = <0x39>;
 			device_type = "cache";
 			reg = <0x300000f0>;
 			status = "okay";
@@ -437,12 +437,12 @@
 	};
 
 	fsps {
-		phandle = <0x47>;
+		phandle = <0x46>;
 		#address-cells = <0x1>;
 		#size-cells = <0x0>;
 
 		fsp@0 {
-			phandle = <0x48>;
+			phandle = <0x47>;
 			reg = <0x0>;
 			compatible = "ibm,fsp", "ibm,fsp2";
 			reg-offset = <0xb0011000>;
@@ -454,10 +454,10 @@
 	};
 
 	ibm,opal {
-		phandle = <0x3>;
+		phandle = <0x20>;
 
 		leds {
-			phandle = <0x4>;
+			phandle = <0x21>;
 			led-mode = "lightpath";
 
 			U78C9.001.WZS0CWX-D1 {
@@ -468,7 +468,7 @@
 	};
 
 	interrupt-controller@3ffff80028000 {
-		phandle = <0x9>;
+		phandle = <0x26>;
 		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x28 0x8>;
 		interrupt-controller;
@@ -478,7 +478,7 @@
 	};
 
 	interrupt-controller@3ffff80060000 {
-		phandle = <0xd>;
+		phandle = <0x2a>;
 		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x60 0x8>;
 		interrupt-controller;
@@ -488,7 +488,7 @@
 	};
 
 	interrupt-controller@3ffff80068000 {
-		phandle = <0x11>;
+		phandle = <0x2e>;
 		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x68 0x8>;
 		interrupt-controller;
@@ -498,7 +498,7 @@
 	};
 
 	interrupt-controller@3ffff80130000 {
-		phandle = <0x15>;
+		phandle = <0x32>;
 		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xb0 0x8>;
 		interrupt-controller;
@@ -508,7 +508,7 @@
 	};
 
 	interrupt-controller@3ffff80168000 {
-		phandle = <0x19>;
+		phandle = <0x36>;
 		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xe8 0x8>;
 		interrupt-controller;
@@ -518,7 +518,7 @@
 	};
 
 	interrupt-controller@3ffff80170000 {
-		phandle = <0x1d>;
+		phandle = <0x3a>;
 		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xf0 0x8>;
 		interrupt-controller;
@@ -528,17 +528,17 @@
 	};
 
 	ipl-params {
-		phandle = <0x1e>;
+		phandle = <0x3b>;
 		#address-cells = <0x0>;
 		#size-cells = <0x0>;
 
 		fsp-serial {
-			phandle = <0x21>;
+			phandle = <0x3e>;
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 
 			serial@2a00 {
-				phandle = <0x22>;
+				phandle = <0x3f>;
 				reg = <0x2a00>;
 				ibm,loc-code = "U78C9.001.WZS0CWX-P1-C1-T1";
 				compatible = "ibm,fsp-serial";
@@ -546,7 +546,7 @@
 		};
 
 		ipl-params {
-			phandle = <0x20>;
+			phandle = <0x3d>;
 			#address-cells = <0x0>;
 			#size-cells = <0x0>;
 			cec-ipl-side = "temp";
@@ -556,11 +556,11 @@
 		};
 
 		platform-dump {
-			phandle = <0x23>;
+			phandle = <0x40>;
 		};
 
 		sys-params {
-			phandle = <0x1f>;
+			phandle = <0x3c>;
 			#address-cells = <0x0>;
 			#size-cells = <0x0>;
 			ibm,sys-model = " 41A";
@@ -568,7 +568,7 @@
 	};
 
 	memory@0 {
-		phandle = <0x42>;
+		phandle = <0x41>;
 		device_type = "memory";
 		ibm,chip-id = <0x0>;
 		reg = <0x0 0x0 0x8 0x0>;
@@ -581,12 +581,12 @@
 		ibm,loc-code = "U8286.41A.TU00163";
 
 		root-node-vpd@a000 {
-			phandle = <0x24>;
+			phandle = <0x3>;
 			ibm,loc-code = "U8286.41A.TU00163";
 			fru-type = [56 56];
 
 			enclosure@1e00 {
-				phandle = <0x27>;
+				phandle = <0x5>;
 				ibm,loc-code = "U78C9.001.WZS0CWX";
 				fru-type = [45 56];
 				ibm,vpd = <0x848c0052 0x54045649 0x4e494452 0x10492f4f 0x20424143 0x4b504c41 0x4e452020 0x20434501 0x31565a02 0x3031464e 0x7373459 0x34333434 0x504e0730 0x30453432 0x3431534e 0xc594c33 0x30554635 0x354e3030 0x36434304 0x32434435 0x50520821 0x0 0x48 0x45043030 0x30324354 0x480f300 0x26485702 0x74233 0x6000000 0x142 0x34010042 0x370c0000 0x0 0x0 0x5046 0x2000078 0x841c0052 0x54044c58 0x5230565a 0x230314c 0x58083100 0x4010030 0x435046 0x2000078 0x84440052 0x54045643 0x454e4452 0x6434543 0x20202053 0x4507575a 0x53304357 0x58544d08 0x20202020 0x20202020 0x46430837 0x3843392d 0x30303152 0x470400a0 0xb32c5242 0x4202020 0x20504603 0x78 0x0>;
@@ -601,19 +601,19 @@
 				description = "System planar 1S4U";
 
 				air-mover@3a00 {
-					phandle = <0x3e>;
+					phandle = <0xd>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-A1";
 					fru-type = [41 4d];
 				};
 
 				air-mover@3a01 {
-					phandle = <0x3f>;
+					phandle = <0xe>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-A2";
 					fru-type = [41 4d];
 				};
 
 				backplane@800 {
-					phandle = <0x28>;
+					phandle = <0x6>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-P1";
 					fru-type = [42 50];
 					ibm,vpd = <0x848c0052 0x54045649 0x4e494452 0x10492f4f 0x20424143 0x4b504c41 0x4e452020 0x20434501 0x31565a02 0x3031464e 0x7373459 0x34333434 0x504e0730 0x30453432 0x3431534e 0xc594c33 0x30554635 0x354e3030 0x36434304 0x32434435 0x50520821 0x0 0x48 0x45043030 0x30324354 0x480f300 0x26485702 0x74233 0x6000000 0x142 0x34010042 0x370c0000 0x0 0x0 0x5046 0x2000078 0x841c0052 0x54044c58 0x5230565a 0x230314c 0x58083100 0x4010030 0x435046 0x2000078 0x0>;
@@ -628,7 +628,7 @@
 					description = "System planar 1S4U";
 
 					anchor-card@500 {
-						phandle = <0x2f>;
+						phandle = <0x14>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-C13";
 						fru-type = [41 56];
 						ibm,vpd = <0x84cc0052 0x54045649 0x4e494452 0x10414e43 0x484f5220 0x20202020 0x20202020 0x20434501 0x31565a02 0x3031464e 0x7303045 0x32313532 0x504e0730 0x30453231 0x3438534e 0xc594c31 0x30424733 0x3132314e 0x4a434304 0x35324632 0x50520881 0x300000 0x48 0x45043030 0x31304354 0x440b400 0x485702 0x14233 0x6000000 0x142 0x34010042 0x370c0000 0x0 0x0 0x4239 0x3c435331 0x58150757 0x4e705f53 0x50f139a0 0xbf7efeb7 0x44d314d 0xd7cd74f2 0x862d884d 0x327cb552 0x79809378 0xa24d333e 0x6aed1eb8 0x49dab34d 0x344e1745 0x9bf468e9 0xa1504603 0x78 0x0>;
@@ -644,7 +644,7 @@
 					};
 
 					backplane-extender@900 {
-						phandle = <0x29>;
+						phandle = <0x11>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-C1";
 						fru-type = [42 58];
 						ibm,vpd = <0x84800052 0x54045649 0x4e494452 0x104e4154 0x49564520 0x492f4f20 0x43415244 0x20434501 0x31565a02 0x3031464e 0x7303045 0x31393630 0x504e0730 0x30453338 0x3039534e 0xc594c31 0x30554635 0x3537304c 0x39434304 0x32423042 0x48450430 0x30303143 0x540480b5 0x4857 0x2000142 0x33060000 0x0 0x42340100 0x42370c00 0x0 0x0 0x50 0x46010078 0x0>;
@@ -659,38 +659,38 @@
 						description = "Native I/O Card";
 
 						serial-connector@2a00 {
-							phandle = <0x2c>;
+							phandle = <0x1f>;
 							ibm,loc-code = "U78C9.001.WZS0CWX-P1-C1-T1";
 							fru-type = [43 53];
 						};
 
 						usb-connector@2900 {
-							phandle = <0x2a>;
+							phandle = <0x1d>;
 							ibm,loc-code = "U78C9.001.WZS0CWX-P1-C1-T3";
 							fru-type = [43 55];
 						};
 
 						usb-connector@2901 {
-							phandle = <0x2b>;
+							phandle = <0x1e>;
 							ibm,loc-code = "U78C9.001.WZS0CWX-P1-C1-T2";
 							fru-type = [43 55];
 						};
 					};
 
 					hmc-connector@2d00 {
-						phandle = <0x34>;
+						phandle = <0x19>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-T3";
 						fru-type = [48 4d];
 					};
 
 					hmc-connector@2d01 {
-						phandle = <0x35>;
+						phandle = <0x1a>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-T4";
 						fru-type = [48 4d];
 					};
 
 					ms-dimm@d000 {
-						phandle = <0x36>;
+						phandle = <0x1b>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-C16";
 						fru-type = [4d 53];
 						ibm,vpd = <0x84940052 0x54045649 0x4e494452 0x1049424d 0x20313647 0x42204d53 0x20202020 0x20434501 0x31565a02 0x3034464e 0x7343154 0x39353735 0x504e0734 0x31543935 0x3735534e 0xc594833 0x314d5333 0x41343031 0x31434304 0x33314530 0x50520849 0x0 0x1000053 0x5a073030 0x31363338 0x34484504 0x30303031 0x43540400 0x48 0x57020090 0x42330600 0x0 0x423401 0x42370c 0x0 0x0 0x0 0x50460078 0x0>;
@@ -709,7 +709,7 @@
 					};
 
 					ms-dimm@d002 {
-						phandle = <0x37>;
+						phandle = <0x1c>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-C18";
 						fru-type = [4d 53];
 						ibm,vpd = <0x84940052 0x54045649 0x4e494452 0x1049424d 0x20313647 0x42204d53 0x20202020 0x20434501 0x31565a02 0x3034464e 0x7343154 0x39353735 0x504e0734 0x31543935 0x3735534e 0xc594833 0x314d5533 0x41433143 0x50434304 0x33314530 0x50520849 0x0 0x1000053 0x5a073030 0x31363338 0x34484504 0x30303031 0x43540400 0x48 0x57020090 0x42330600 0x0 0x423401 0x42370c 0x0 0x0 0x0 0x50460078 0x0>;
@@ -728,7 +728,7 @@
 					};
 
 					processor@1000 {
-						phandle = <0x2d>;
+						phandle = <0x12>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-C32";
 						fru-type = [50 46];
 						ibm,vpd = [84 8c 00 52 54 04 56 49 4e 49 44 52 10 30 36 2d 57 41 59 20 50 52 4f 43 20 43 55 4f 44 46 4e 07 30 30 46 58 35 32 33 50 4e 07 30 30 46 58 37 34 38 53 4e 0c 59 41 31 39 33 32 30 36 33 35 36 32 43 43 04 35 34 45 31 48 45 04 30 30 30 31 43 54 04 00 00 00 00 48 57 02 00 01 42 33 06 00 00 00 00 00 00 42 34 01 00 42 37 0c 00 00 00 00 00 00 00 00 00 00 00 00 50 52 08 35 00 30 01 44 00 80 01 56 5a 02 30 31 43 45 01 31 50 46 02 00 00 78 00];
@@ -745,7 +745,7 @@
 					};
 
 					processor@1001 {
-						phandle = <0x2e>;
+						phandle = <0x13>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-C32";
 						fru-type = [50 46];
 						ibm,vpd = [84 8c 00 52 54 04 56 49 4e 49 44 52 10 30 36 2d 57 41 59 20 50 52 4f 43 20 43 55 4f 44 46 4e 07 30 30 46 58 35 32 33 50 4e 07 30 30 46 58 37 34 38 53 4e 0c 59 41 31 39 33 32 30 36 33 35 36 32 43 43 04 35 34 45 31 48 45 04 30 30 30 31 43 54 04 00 00 00 00 48 57 02 00 01 42 33 06 00 00 00 00 00 00 42 34 01 00 42 37 0c 00 00 00 00 00 00 00 00 00 00 00 00 50 52 08 35 00 30 01 44 00 80 01 56 5a 02 30 31 43 45 01 31 50 46 02 00 00 78 00];
@@ -762,56 +762,56 @@
 					};
 
 					usb-connector@2902 {
-						phandle = <0x30>;
+						phandle = <0x15>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-T1";
 						fru-type = [43 55];
 					};
 
 					usb-connector@2903 {
-						phandle = <0x31>;
+						phandle = <0x16>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-T2";
 						fru-type = [43 55];
 					};
 
 					usb-connector@2904 {
-						phandle = <0x32>;
+						phandle = <0x17>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-T5";
 						fru-type = [43 55];
 					};
 
 					usb-connector@2905 {
-						phandle = <0x33>;
+						phandle = <0x18>;
 						ibm,loc-code = "U78C9.001.WZS0CWX-P1-T6";
 						fru-type = [43 55];
 					};
 				};
 
 				dasd-backplane@2400 {
-					phandle = <0x3a>;
+					phandle = <0x9>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-P2";
 					fru-type = [44 42];
 				};
 
 				dasd-backplane@2401 {
-					phandle = <0x3b>;
+					phandle = <0xa>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-P2";
 					fru-type = [44 42];
 				};
 
 				enclosure-fault-led@a300 {
-					phandle = <0x41>;
+					phandle = <0x10>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-D1";
 					fru-type = [45 46];
 				};
 
 				enclosure-led@a200 {
-					phandle = <0x40>;
+					phandle = <0xf>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-D1";
 					fru-type = [45 49];
 				};
 
 				op-panel@300 {
-					phandle = <0x39>;
+					phandle = <0x8>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-D1";
 					fru-type = [4f 50];
 					ibm,vpd = <0x84800052 0x54045649 0x4e494452 0x10434543 0x204f5020 0x50414e45 0x4c202020 0x20434501 0x31565a02 0x3032464e 0x7303045 0x31393636 0x504e0730 0x30453239 0x3532534e 0xc594c33 0x30554633 0x38453033 0x52434304 0x32423038 0x48450430 0x30303143 0x540480b5 0x4857 0x2000242 0x33060000 0x0 0x42340100 0x42370c00 0x0 0x0 0x50 0x46010078 0x0>;
@@ -827,19 +827,19 @@
 				};
 
 				power-supply@3102 {
-					phandle = <0x3c>;
+					phandle = <0xb>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-E3";
 					fru-type = [50 53];
 				};
 
 				power-supply@3103 {
-					phandle = <0x3d>;
+					phandle = <0xc>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-E4";
 					fru-type = [50 53];
 				};
 
 				service-processor@200 {
-					phandle = <0x38>;
+					phandle = <0x7>;
 					ibm,loc-code = "U78C9.001.WZS0CWX-P1";
 					fru-type = [53 50];
 					ibm,vpd = <0x848c0052 0x54045649 0x4e494452 0x10492f4f 0x20424143 0x4b504c41 0x4e452020 0x20434501 0x31565a02 0x3031464e 0x7373459 0x34333434 0x504e0730 0x30453432 0x3431534e 0xc594c33 0x30554635 0x354e3030 0x36434304 0x32434435 0x50520821 0x0 0x48 0x45043030 0x30324354 0x480f300 0x26485702 0x74233 0x6000000 0x142 0x34010042 0x370c0000 0x0 0x0 0x5046 0x2000078 0x841c0052 0x54044c58 0x5230565a 0x230314c 0x58083100 0x4010030 0x435046 0x2000078 0x84500052 0x54045652 0x31304452 0x10465350 0x20202020 0x20202020 0x20202020 0x20464704 0x564e5350 0x44430f42 0x44203230 0x31323032 0x32303038 0x3030464c 0x14503120 0x20202020 0x20202020 0x20202020 0x20202020 0x20504603 0x78 0x84400052 0x54045657 0x31304452 0x10465350 0x20565731 0x30202020 0x20202020 0x20474420 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x50460078 0x0>;
@@ -855,14 +855,8 @@
 				};
 			};
 
-			root-node-vpd@a001 {
-				phandle = <0x25>;
-				ibm,loc-code = "U8286.41A.TU00163";
-				fru-type = [56 56];
-			};
-
 			system-vpd@1c00 {
-				phandle = <0x26>;
+				phandle = <0x4>;
 				ibm,loc-code = "U8286.41A.TU00163";
 				fru-type = [53 56];
 			};
@@ -870,7 +864,7 @@
 	};
 
 	xscom@3fc0000000000 {
-		phandle = <0x43>;
+		phandle = <0x42>;
 		ibm,chip-id = <0x0>;
 		ibm,proc-chip-id = <0x0>;
 		#address-cells = <0x1>;
@@ -888,20 +882,20 @@
 		ibm,mem-interleave-scope = <0x0>;
 
 		chiptod@40000 {
-			phandle = <0x49>;
+			phandle = <0x48>;
 			reg = <0x40000 0x34>;
 			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 			primary;
 		};
 
 		nx@2010000 {
-			phandle = <0x4b>;
+			phandle = <0x4a>;
 			compatible = "ibm,power-nx", "ibm,power8-nx";
 			reg = <0x2010000 0x4000>;
 		};
 
 		pbcq@2012000 {
-			phandle = <0x4d>;
+			phandle = <0x4c>;
 			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
@@ -912,7 +906,7 @@
 		};
 
 		pbcq@2012400 {
-			phandle = <0x4e>;
+			phandle = <0x4d>;
 			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
@@ -923,7 +917,7 @@
 		};
 
 		psihb@2010900 {
-			phandle = <0x44>;
+			phandle = <0x43>;
 			reg = <0x2010900 0x20>;
 			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 			boot-link;
@@ -932,7 +926,7 @@
 	};
 
 	xscom@3fc0800000000 {
-		phandle = <0x45>;
+		phandle = <0x44>;
 		ibm,chip-id = <0x1>;
 		ibm,proc-chip-id = <0x1>;
 		#address-cells = <0x1>;
@@ -950,20 +944,20 @@
 		ibm,mem-interleave-scope = <0x0>;
 
 		chiptod@40000 {
-			phandle = <0x4a>;
+			phandle = <0x49>;
 			reg = <0x40000 0x34>;
 			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 			secondary;
 		};
 
 		nx@2010000 {
-			phandle = <0x4c>;
+			phandle = <0x4b>;
 			compatible = "ibm,power-nx", "ibm,power8-nx";
 			reg = <0x2010000 0x4000>;
 		};
 
 		pbcq@2012000 {
-			phandle = <0x4f>;
+			phandle = <0x4e>;
 			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
@@ -974,7 +968,7 @@
 		};
 
 		pbcq@2012400 {
-			phandle = <0x50>;
+			phandle = <0x4f>;
 			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
@@ -985,7 +979,7 @@
 		};
 
 		psihb@2010900 {
-			phandle = <0x46>;
+			phandle = <0x45>;
 			reg = <0x2010900 0x20>;
 			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 		};