Zaius.py: Fix sensor numbers

Change the sensor numbers to match what hostboot is using.
The correct BootProgressSensor is required for the checkstop
reboot monitor to work.

This also involved adding some new inventory objects for the
additional cores on P9 so that all cores can have their presence
property correctly set on their corresponding inventory objects.

Change-Id: I509b14abcf6bf28ffb5b3d96b342394e159f3090
Signed-off-by: Matt Spinler <spinler@us.ibm.com>

1 files changed, 119 insertions, 71 deletions

diff --git a/configs/Zaius.py b/configs/Zaius.py
index 1a3af4e..a44b24c 100644
--- a/configs/Zaius.py
+++ b/configs/Zaius.py
@@ -59,6 +59,18 @@ FRU_INSTANCES = {
     '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core22': { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core23': { 'fru_type' : 'CORE', 'is_fru' : False, },
 
     '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
@@ -72,6 +84,18 @@ FRU_INSTANCES = {
     '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core22' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core23' : { 'fru_type' : 'CORE', 'is_fru' : False, },
 
     '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
     '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
@@ -192,74 +216,98 @@ ID_LOOKUP = {
         'PRODUCT_47'   : '<inventory_root>/system/misc',
     },
     'SENSOR' : {
-        0x04 : '/org/openbmc/sensors/host/HostStatus',
-        0x05 : '/org/openbmc/sensors/host/BootProgress',
-        0x0c : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x0e : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x2c : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x2d : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x2e : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x2f : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x30 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x31 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x32 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x33 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x34 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x35 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x36 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x37 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x38 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x39 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x3a : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0x3b : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x3c : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x3d : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x43 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x45 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x46 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x48 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x49 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x5f : '/org/openbmc/sensors/host/BootCount',
-        0x60 : '<inventory_root>/system/chassis/motherboard',
-        0x61 : '<inventory_root>/system/systemevent',
-        0x63 : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x64 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0xb1 : '<inventory_root>/system/chassis/motherboard/todclock',
-        0xb5 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0xb6 : '<inventory_root>/system/chassis/motherboard/pcielink',
+        0x02 : '/org/openbmc/sensors/host/HostStatus',
+        0x03 : '/org/openbmc/sensors/host/BootProgress',
+        0x21 : '<inventory_root>/system/chassis/motherboard/cpu0',
+        0x71 : '<inventory_root>/system/chassis/motherboard/cpu1',
+        0xc7 : '<inventory_root>/system/chassis/motherboard/dimm3',
+        0xc5 : '<inventory_root>/system/chassis/motherboard/dimm2',
+        0xc3 : '<inventory_root>/system/chassis/motherboard/dimm1',
+        0xc1 : '<inventory_root>/system/chassis/motherboard/dimm0',
+        0xcf : '<inventory_root>/system/chassis/motherboard/dimm7',
+        0xcd : '<inventory_root>/system/chassis/motherboard/dimm6',
+        0xcb : '<inventory_root>/system/chassis/motherboard/dimm5',
+        0xc9 : '<inventory_root>/system/chassis/motherboard/dimm4',
+        0xd7 : '<inventory_root>/system/chassis/motherboard/dimm11',
+        0xd5 : '<inventory_root>/system/chassis/motherboard/dimm10',
+        0xd3 : '<inventory_root>/system/chassis/motherboard/dimm9',
+        0xd1 : '<inventory_root>/system/chassis/motherboard/dimm8',
+        0xdf : '<inventory_root>/system/chassis/motherboard/dimm15',
+        0xdd : '<inventory_root>/system/chassis/motherboard/dimm14',
+        0xdb : '<inventory_root>/system/chassis/motherboard/dimm13',
+        0xd9 : '<inventory_root>/system/chassis/motherboard/dimm12',
+        0xe7 : '<inventory_root>/system/chassis/motherboard/dimm19',
+        0xe5 : '<inventory_root>/system/chassis/motherboard/dimm18',
+        0xe3 : '<inventory_root>/system/chassis/motherboard/dimm17',
+        0xe1 : '<inventory_root>/system/chassis/motherboard/dimm16',
+        0xef : '<inventory_root>/system/chassis/motherboard/dimm23',
+        0xed : '<inventory_root>/system/chassis/motherboard/dimm22',
+        0xeb : '<inventory_root>/system/chassis/motherboard/dimm21',
+        0xe9 : '<inventory_root>/system/chassis/motherboard/dimm20',
+        0xf7 : '<inventory_root>/system/chassis/motherboard/dimm27',
+        0xf5 : '<inventory_root>/system/chassis/motherboard/dimm26',
+        0xf3 : '<inventory_root>/system/chassis/motherboard/dimm25',
+        0xf1 : '<inventory_root>/system/chassis/motherboard/dimm24',
+        0xff : '<inventory_root>/system/chassis/motherboard/dimm31',
+        0xfd : '<inventory_root>/system/chassis/motherboard/dimm30',
+        0xfb : '<inventory_root>/system/chassis/motherboard/dimm29',
+        0xf9 : '<inventory_root>/system/chassis/motherboard/dimm28',
+        0x23 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
+        0x26 : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
+        0x29 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
+        0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
+        0x2f : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
+        0x32 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
+        0x35 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
+        0x38 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
+        0x3b : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
+        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
+        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
+        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
+        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core12',
+        0x4a : '<inventory_root>/system/chassis/motherboard/cpu0/core13',
+        0x4d : '<inventory_root>/system/chassis/motherboard/cpu0/core14',
+        0x50 : '<inventory_root>/system/chassis/motherboard/cpu0/core15',
+        0x53 : '<inventory_root>/system/chassis/motherboard/cpu0/core16',
+        0x56 : '<inventory_root>/system/chassis/motherboard/cpu0/core17',
+        0x59 : '<inventory_root>/system/chassis/motherboard/cpu0/core18',
+        0x5c : '<inventory_root>/system/chassis/motherboard/cpu0/core19',
+        0x5f : '<inventory_root>/system/chassis/motherboard/cpu0/core20',
+        0x62 : '<inventory_root>/system/chassis/motherboard/cpu0/core21',
+        0x65 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
+        0x68 : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
+        0x73 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
+        0x76 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
+        0x79 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
+        0x7c : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
+        0x7f : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
+        0x82 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
+        0x85 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
+        0x88 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
+        0x8b : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
+        0x8e : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
+        0x91 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
+        0x94 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
+        0x97 : '<inventory_root>/system/chassis/motherboard/cpu1/core12',
+        0x9a : '<inventory_root>/system/chassis/motherboard/cpu1/core13',
+        0x9d : '<inventory_root>/system/chassis/motherboard/cpu1/core14',
+        0xa0 : '<inventory_root>/system/chassis/motherboard/cpu1/core15',
+        0xa3 : '<inventory_root>/system/chassis/motherboard/cpu1/core16',
+        0xa6 : '<inventory_root>/system/chassis/motherboard/cpu1/core17',
+        0xa9 : '<inventory_root>/system/chassis/motherboard/cpu1/core18',
+        0xac : '<inventory_root>/system/chassis/motherboard/cpu1/core19',
+        0xaf : '<inventory_root>/system/chassis/motherboard/cpu1/core20',
+        0xb2 : '<inventory_root>/system/chassis/motherboard/cpu1/core21',
+        0xb5 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
+        0xb8 : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
+        0x07 : '/org/openbmc/sensors/host/BootCount',
+        0x10 : '<inventory_root>/system/chassis/motherboard',
+        0x01 : '<inventory_root>/system/systemevent',
+        0x11 : '<inventory_root>/system/chassis/motherboard/refclock',
+        0x12 : '<inventory_root>/system/chassis/motherboard/pcieclock',
+        0x13 : '<inventory_root>/system/chassis/motherboard/todclock',
+        0x02 : '/org/openbmc/sensors/host/OperatingSystemStatus',
+        0x04 : '<inventory_root>/system/chassis/motherboard/pcielink',
     },
     'GPIO_PRESENT' : {}
 }
@@ -328,9 +376,9 @@ GPIO_CONFIGS = {
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {
-    0x5f : { 'class' : 'BootCountSensor' },
-    0x05 : { 'class' : 'BootProgressSensor' },
-    0xb5 : { 'class' : 'OperatingSystemStatusSensor' },
+    0x07 : { 'class' : 'BootCountSensor' },
+    0x03 : { 'class' : 'BootProgressSensor' },
+    0x02 : { 'class' : 'OperatingSystemStatusSensor' },
 }
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4