Romulus.py: Fix some sensor numbers

Sync sensor numbers with hostboot.

Note:
* Some sensors are not avaialbe yet so commented;
* OCC is not enabled yet so they are unchanged.

Change-Id: I51373f73e5e399dbfe2c3fbdcd1abadd84b669d3
Signed-off-by: Lei YU <mine260309@gmail.com>

1 files changed, 133 insertions, 82 deletions

diff --git a/configs/Romulus.py b/configs/Romulus.py
index 6307226..bb124ce 100644
--- a/configs/Romulus.py
+++ b/configs/Romulus.py
@@ -58,8 +58,20 @@ FRU_INSTANCES = {
     '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
     '<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/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, },
@@ -73,6 +85,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,},
@@ -97,22 +121,22 @@ ID_LOOKUP = {
         0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
         0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
         0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
+        0x04 : '<inventory_root>/system/chassis/motherboard/dimm0',
+        0x05 : '<inventory_root>/system/chassis/motherboard/dimm1',
+        0x06 : '<inventory_root>/system/chassis/motherboard/dimm2',
+        0x07 : '<inventory_root>/system/chassis/motherboard/dimm3',
+        0x08 : '<inventory_root>/system/chassis/motherboard/dimm4',
+        0x09 : '<inventory_root>/system/chassis/motherboard/dimm5',
+        0x0a : '<inventory_root>/system/chassis/motherboard/dimm6',
+        0x0b : '<inventory_root>/system/chassis/motherboard/dimm7',
+        0x0c : '<inventory_root>/system/chassis/motherboard/dimm8',
+        0x0d : '<inventory_root>/system/chassis/motherboard/dimm9',
+        0x0e : '<inventory_root>/system/chassis/motherboard/dimm10',
+        0x0f : '<inventory_root>/system/chassis/motherboard/dimm11',
+        0x10 : '<inventory_root>/system/chassis/motherboard/dimm12',
+        0x11 : '<inventory_root>/system/chassis/motherboard/dimm13',
+        0x12 : '<inventory_root>/system/chassis/motherboard/dimm14',
+        0x13 : '<inventory_root>/system/chassis/motherboard/dimm15',
     },
     'FRU_STR' : {
         'PRODUCT_0'  : '<inventory_root>/system/bios',
@@ -139,63 +163,87 @@ ID_LOOKUP = {
         'PRODUCT_47'   : '<inventory_root>/system/misc',
     },
     'SENSOR' : {
-        0x04 : '/org/openbmc/sensors/host/HostStatus',
-        0x05 : '/org/openbmc/sensors/host/BootProgress',
-        0x08 : '/org/openbmc/sensors/host/cpu0/OccStatus',
-        0x09 : '/org/openbmc/sensors/host/cpu1/OccStatus',
-        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',
-        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',
-        0x62 : '<inventory_root>/system/powerlimit',
-        0x63 : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x64 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0xb1 : '<inventory_root>/system/chassis/motherboard/todclock',
-        0xb2 : '<inventory_root>/system/chassis/motherboard/apss',
-        0xb3 : '/org/openbmc/sensors/host/powercap',
-        0xb5 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0xb6 : '<inventory_root>/system/chassis/motherboard/pcielink',
+        0x01 : '/org/openbmc/sensors/host/HostStatus',
+        0x02 : '/org/openbmc/sensors/host/BootProgress',
+        0x03 : '/org/openbmc/sensors/host/cpu0/OccStatus',
+        0x04 : '/org/openbmc/sensors/host/cpu1/OccStatus',
+        0x08 : '<inventory_root>/system/chassis/motherboard/cpu0',
+        0x09 : '<inventory_root>/system/chassis/motherboard/cpu1',
+        0x0b : '<inventory_root>/system/chassis/motherboard/dimm0',
+        0x0c : '<inventory_root>/system/chassis/motherboard/dimm1',
+        0x0d : '<inventory_root>/system/chassis/motherboard/dimm2',
+        0x0e : '<inventory_root>/system/chassis/motherboard/dimm3',
+        0x0f : '<inventory_root>/system/chassis/motherboard/dimm4',
+        0x10 : '<inventory_root>/system/chassis/motherboard/dimm5',
+        0x11 : '<inventory_root>/system/chassis/motherboard/dimm6',
+        0x12 : '<inventory_root>/system/chassis/motherboard/dimm7',
+        0x13 : '<inventory_root>/system/chassis/motherboard/dimm8',
+        0x14 : '<inventory_root>/system/chassis/motherboard/dimm9',
+        0x15 : '<inventory_root>/system/chassis/motherboard/dimm10',
+        0x16 : '<inventory_root>/system/chassis/motherboard/dimm11',
+        0x17 : '<inventory_root>/system/chassis/motherboard/dimm12',
+        0x18 : '<inventory_root>/system/chassis/motherboard/dimm13',
+        0x19 : '<inventory_root>/system/chassis/motherboard/dimm14',
+        0x1a : '<inventory_root>/system/chassis/motherboard/dimm15',
+        0x2b : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
+        0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
+        0x2d : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
+        0x2e : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
+        0x2f : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
+        0x30 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
+        0x31 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
+        0x32 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
+        0x33 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
+        0x34 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
+        0x35 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
+        0x36 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
+        0x37 : '<inventory_root>/system/chassis/motherboard/cpu0/core12',
+        0x38 : '<inventory_root>/system/chassis/motherboard/cpu0/core13',
+        0x39 : '<inventory_root>/system/chassis/motherboard/cpu0/core14',
+        0x3a : '<inventory_root>/system/chassis/motherboard/cpu0/core15',
+        0x3b : '<inventory_root>/system/chassis/motherboard/cpu0/core16',
+        0x3c : '<inventory_root>/system/chassis/motherboard/cpu0/core17',
+        0x3d : '<inventory_root>/system/chassis/motherboard/cpu0/core18',
+        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core19',
+        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core20',
+        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core21',
+        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core22',
+        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core23',
+        0x43 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
+        0x44 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
+        0x45 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
+        0x46 : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
+        0x47 : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
+        0x48 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
+        0x49 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
+        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
+        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
+        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
+        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
+        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
+        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core12',
+        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core13',
+        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core14',
+        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core15',
+        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core16',
+        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core17',
+        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core18',
+        0x56 : '<inventory_root>/system/chassis/motherboard/cpu1/core19',
+        0x57 : '<inventory_root>/system/chassis/motherboard/cpu1/core20',
+        0x58 : '<inventory_root>/system/chassis/motherboard/cpu1/core21',
+        0x59 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
+        0x5a : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
+        0x8b : '/org/openbmc/sensors/host/BootCount',
+        0x8c : '<inventory_root>/system/chassis/motherboard',
+        0x8d : '<inventory_root>/system/chassis/motherboard/refclock',
+        0x8e : '<inventory_root>/system/chassis/motherboard/pcieclock',
+        0x8f : '<inventory_root>/system/chassis/motherboard/todclock',
+        0x90 : '<inventory_root>/system/systemevent',
+        0x91 : '/org/openbmc/sensors/host/OperatingSystemStatus',
+        0x92 : '<inventory_root>/system/chassis/motherboard/pcielink',
+#        0x08 : '<inventory_root>/system/powerlimit',
+#        0x10 : '<inventory_root>/system/chassis/motherboard/apss',
+#        0x06 : '/org/openbmc/sensors/host/powercap',
     },
     'GPIO_PRESENT' : {}
 }
@@ -321,6 +369,7 @@ HWMON_CONFIG = {
     },
 }
 
+
 GPIO_CONFIGS = {
     'power_config' : {
         'power_good_in' : 'SYS_PWROK_BUFF',
@@ -343,18 +392,20 @@ 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' },
-    0x08 : { 'class' : 'OccStatusSensor',
+    0x8b : { 'class' : 'BootCountSensor' },
+    0x02 : { 'class' : 'BootProgressSensor' },
+    #OCC active sensors aren't in the P9 XML yet.  These are wrong.
+    0x03 : { 'class' : 'OccStatusSensor',
         'os_path' : '/sys/bus/i2c/devices/3-0050/online' },
-    0x09 : { 'class' : 'OccStatusSensor',
+    0x04 : { 'class' : 'OccStatusSensor',
         'os_path' : '/sys/bus/i2c/devices/3-0051/online' },
-    0xb5 : { 'class' : 'OperatingSystemStatusSensor' },
-    0xb3 : { 'class' : 'PowerCap',
-        'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
+    0x91 : { 'class' : 'OperatingSystemStatusSensor' },
+    #0x06 : { 'class' : 'PowerCap',
+    #    'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
 }
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4