update Barreleye config
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 901fcfc..9f9ba03 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -4,70 +4,100 @@
import Openbmc
HOME_PATH = './'
-BIN_PATH = HOME_PATH+'bin/'
CACHE_PATH = HOME_PATH+'cache/'
FRU_PATH = CACHE_PATH+'frus/'
+FLASH_DOWNLOAD_PATH = "/tmp"
+SYSTEM_NAME = "Barreleye"
+
+
+## System states
+## state can change to next state in 2 ways:
+## - a process emits a GotoSystemState signal with state name to goto
+## - objects specified in EXIT_STATE_DEPEND have started
SYSTEM_STATES = [
- 'INIT',
- 'STANDBY',
- 'POWERING_ON',
- 'POWERED_ON',
- 'BOOTING',
+ 'BMC_INIT',
+ 'BMC_STARTING',
+ 'BMC_READY',
+ 'HOST_POWERING_ON',
+ 'HOST_POWERED_ON',
+ 'HOST_BOOTING',
'HOST_UP',
- 'SHUTTING_DOWN',
- 'POWERING_DOWN'
+ 'HOST_POWERED_DOWN',
]
+EXIT_STATE_DEPEND = {
+ 'BMC_STARTING' : {
+ '/org/openbmc/control/chassis0': 0,
+ '/org/openbmc/control/power0' : 0,
+ '/org/openbmc/control/led/BMC_READY' : 0,
+ '/org/openbmc/control/Host_0' : 0,
+ }
+}
+
+## method will be called when state is entered
ENTER_STATE_CALLBACK = {
- 'POWERED_ON' : {
+ 'HOST_POWERED_ON' : {
'bus_name' : 'org.openbmc.control.Host',
'obj_name' : '/org/openbmc/control/Host_0',
'interface_name' : 'org.openbmc.control.Host',
'method_name' : 'boot'
+ },
+ 'BMC_READY' : {
+ 'bus_name' : 'org.openbmc.control.led',
+ 'obj_name' : '/org/openbmc/control/led/BMC_READY',
+ 'interface_name' : 'org.openbmc.Led',
+ 'method_name' : 'setOn'
}
}
SYSTEM_CONFIG = {}
SYSTEM_CONFIG['org.openbmc.control.Bmc'] = {
- 'system_state' : 'INIT',
+ 'system_state' : 'BMC_INIT',
'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'control_bmc.exe',
+ 'process_name' : 'control_bmc_barreleye.exe',
'heartbeat' : 'no',
'instances' : [ { 'name' : 'Bmc_0' } ]
}
SYSTEM_CONFIG['org.openbmc.managers.Inventory'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'inventory_items.py',
'heartbeat' : 'no',
- 'instances' : [ { 'name' : 'Barreleye' } ]
+ 'instances' : [ { 'name' : SYSTEM_NAME } ]
}
SYSTEM_CONFIG['org.openbmc.control.PciePresent'] = {
- 'system_state' : 'POWERING_ON',
+ 'system_state' : 'HOST_POWERED_ON',
'start_process' : True,
'monitor_process' : False,
'process_name' : 'pcie_slot_present.exe',
'heartbeat' : 'no',
'instances' : [ { 'name' : 'Slots_0' } ]
}
-
+SYSTEM_CONFIG['org.openbmc.sensor.Power8Virtual'] = {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
+ 'monitor_process' : True,
+ 'process_name' : 'sensors_virtual_p8.py',
+ 'heartbeat' : 'no',
+ 'instances' : [ { 'name' : 'virtual' } ]
+ }
SYSTEM_CONFIG['org.openbmc.managers.Sensors'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'sensor_manager.py',
'heartbeat' : 'no',
- 'instances' : [ { 'name' : 'Barreleye' } ]
+ 'instances' : [ { 'name' : SYSTEM_NAME } ]
}
SYSTEM_CONFIG['org.openbmc.watchdog.Host'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'host_watchdog.exe',
@@ -77,7 +107,7 @@
'name' : 'HostWatchdog_0',
'properties' : {
'org.openbmc.Watchdog' : {
- 'poll_interval': 3000,
+ 'poll_interval': 30000,
}
}
}
@@ -85,14 +115,14 @@
}
SYSTEM_CONFIG['org.openbmc.control.Power'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'power_control.exe',
- 'heartbeat' : 'yes',
+ 'heartbeat' : 'no',
'instances' : [
{
- 'name' : 'SystemPower_0',
+ 'name' : 'power0',
'user_label': 'Power control',
'properties' : {
'org.openbmc.Control': {
@@ -106,78 +136,42 @@
]
}
-SYSTEM_CONFIG['org.openbmc.sensors.Temperature.Ambient'] = {
- 'system_state' : 'STANDBY',
- 'start_process' : True,
- 'monitor_process' : True,
- 'process_name' : 'sensor_ambient.exe',
- 'heartbeat' : 'yes',
- 'instances' : [
- {
- 'name' : 'FrontChassis',
- 'user_label': 'Ambient Temperature 1',
- 'properties' : {
- 'org.openbmc.SensorValue': {
- 'poll_interval' : 5000,
- },
- 'org.openbmc.SensorThreshold' : {
- 'lower_critical': 5,
- 'lower_warning' : 10,
- 'upper_warning' : 15,
- 'upper_critical': 20
- },
- 'org.openbmc.SensorI2c' : {
- 'dev_path' : '/dev/i2c/i2c0',
- 'address' : '0xA0'
- }
- }
- },
- ]
- }
SYSTEM_CONFIG['org.openbmc.buttons.Power'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'button_power.exe',
'heartbeat' : 'no',
'instances' : [ { 'name' : 'PowerButton_0' } ]
}
-SYSTEM_CONFIG['org.openbmc.sensors.HostStatus'] = {
- 'system_state' : 'STANDBY',
+SYSTEM_CONFIG['org.openbmc.control.led'] = {
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'sensor_host_status.exe',
- 'heartbeat' : "no",
- 'instances' : [ { 'name' : 'HostStatus_0' } ]
- }
-SYSTEM_CONFIG['org.openbmc.leds.ChassisIdentify'] = {
- 'system_state' : 'STANDBY',
- 'start_process' : True,
- 'monitor_process' : True,
- 'process_name' : 'chassis_identify.exe',
+ 'process_name' : 'led_controller.exe',
'heartbeat' : 'no',
- 'instances' : [ { 'name' : 'ChassisIdentify_0' } ]
+ 'instances' : [ { 'name' : 'Dummy' } ]
}
-SYSTEM_CONFIG['org.openbmc.flash.Bios'] = {
- 'system_state' : 'STANDBY',
- 'start_process' : False,
+SYSTEM_CONFIG['org.openbmc.control.Flash'] = {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
'process_name' : 'flash_bios.exe',
'heartbeat' : 'no',
- 'instances' : [ { 'name' : 'BIOS_0' } ]
+ 'instances' : [ { 'name' : 'dummy' } ]
}
-SYSTEM_CONFIG['org.openbmc.manager.Flash'] = {
- 'system_state' : 'STANDBY',
+SYSTEM_CONFIG['org.openbmc.manager.Download'] = {
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'flash_manager.py',
+ 'process_name' : 'download_manager.py',
'heartbeat' : 'no',
- 'instances' : [ { 'name' : 'FlashManager_0' } ]
+ 'instances' : [ { 'name' : SYSTEM_NAME } ]
}
SYSTEM_CONFIG['org.openbmc.control.Host'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'control_host.exe',
@@ -185,44 +179,25 @@
'instances' : [ { 'name' : 'Host_0' } ]
}
SYSTEM_CONFIG['org.openbmc.control.Chassis'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'chassis_control.py',
'heartbeat' : 'no',
- 'instances' : [ { 'name' : 'Chassis' } ]
+ 'instances' : [ { 'name' : 'chassis0' } ]
}
SYSTEM_CONFIG['org.openbmc.vpd'] = {
- 'system_state' : 'POWERING_ON',
- 'start_process' : True,
+ 'system_state' : 'HOST_POWERED_ON',
+ 'start_process' : False,
'monitor_process' : False,
'process_name' : 'board_vpd.exe',
'heartbeat' : 'no',
'instances' : [ { 'name' : 'MBVPD_0' } ]
}
-SYSTEM_CONFIG['org.openbmc.sensors.Occ'] = {
- 'system_state' : 'BOOTED',
- 'start_process' : True,
- 'monitor_process' : True,
- 'process_name' : 'sensor_occ.exe',
- 'heartbeat' : 'no',
- 'instances' : [
- {
- 'name' : 'Occ_0',
- 'properties' : {
- 'org.openbmc.Occ' : {
- 'poll_interval' : 3000,
- }
- }
- },
-
- ]
- }
-
SYSTEM_CONFIG['org.openbmc.sensors.Fan'] = {
- 'system_state' : 'STANDBY',
+ 'system_state' : 'BMC_STARTING',
'start_process' : True,
'monitor_process' : True,
'process_name' : 'fan.exe',
@@ -237,163 +212,177 @@
'state' : True,
'cache' : True
}
-INVENTORY_ROOT = '/org/openbmc/inventory/items'
+INVENTORY_ROOT = '/org/openbmc/inventory'
FRU_INSTANCES = {
- '<inventory_root>/system' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['SYSTEM'],
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['MAIN_PLANAR'],
- 'manufacturer' : 'FOXCONN',
- 'is_fru' : True,
- 'location' : 'C1',
- },
+ '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, },
- '<inventory_root>/system/motherboard' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['MAIN_PLANAR'],
- 'manufacturer' : 'FOXCONN',
- 'is_fru' : True,
- 'location' : 'C0',
- },
- '<inventory_root>/system/fan0' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['FAN'],
- 'manufacturer' : 'DELTA',
- 'is_fru' : True,
- 'location' : 'F0',
- },
- '<inventory_root>/system/fan1' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['FAN'],
- 'manufacturer' : 'DELTA',
- 'is_fru' : True,
- 'location' : 'F1',
- },
- '<inventory_root>/system/io_board/bmc' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['BMC'],
- 'manufacturer' : 'ASPEED',
- 'is_fru' : False,
- },
- '<inventory_root>/system/motherboard/cpu0' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['CPU'],
- 'manufacturer' : 'IBM',
- 'is_fru' : True,
- 'location' : 'P0',
- },
- '<inventory_root>/system/motherboard/cpu0/core0' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['CORE'],
- 'is_fru' : False,
- },
- '<inventory_root>/system/motherboard/cpu0/core1' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['CORE'],
- 'is_fru' : False,
- },
- '<inventory_root>/system/motherboard/dimm0' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['DIMM'],
- 'is_fru' : True,
- },
- '<inventory_root>/system/motherboard/dimm1' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['DIMM'],
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_left_slot_riser' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['RISER_CARD'],
- 'user_label' : 'Left Slot Riser',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_right_slot_riser' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['RISER_CARD'],
- 'user_label' : 'Right Slot Riser',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_x16_slot_riser' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['RISER_CARD'],
- 'user_label' : 'PCIE x16 Slot Riser',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_slot0' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['PCIE_CARD'],
- 'user_label' : 'OCP Mezz card 0',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_slot1' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['PCIE_CARD'],
- 'user_label' : 'OCP Mezz card 1',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_slot2' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['PCIE_CARD'],
- 'user_label' : 'OCP Mezz card 2',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_mezz0' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['PCIE_CARD'],
- 'user_label' : 'OCP Mezz card 0',
- 'is_fru' : True,
- },
- '<inventory_root>/system/io_board/pcie_mezz1' :
- {
- 'fru_type' : Openbmc.FRU_TYPES['PCIE_CARD'],
- 'user_label' : 'OCP Mezz card 1',
- 'is_fru' : True,
- },
+ '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, },
+
+ '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
+ '<inventory_root>/system/chassis/io_board' : { 'fru_type' : 'DAUGHTER_CARD','is_fru' : True, },
+
+
+ '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
+ '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
+ '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
+ '<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
+ '<inventory_root>/system/chassis/fan4' : { 'fru_type' : 'FAN','is_fru' : True, },
+
+ '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
+
+ '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
+ '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
+
+ '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<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/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+ '<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/cpu0/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+
+ '<inventory_root>/system/chassis/motherboard/centaur0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur2' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur3' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur4' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur5' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur6' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+ '<inventory_root>/system/chassis/motherboard/centaur7' : { 'fru_type' : 'MEMORY_BUFFER', '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,},
+ '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+
+ '<inventory_root>/system/chassis/io_board/pcie_slot0_riser' : { 'fru_type' : 'PCIE_RISER', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/io_board/pcie_slot1_riser' : { 'fru_type' : 'PCIE_RISER', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/io_board/pcie_slot0' : { 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/io_board/pcie_slot1' : { 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/io_board/pcie_mezz0' : { 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
+ '<inventory_root>/system/chassis/io_board/pcie_mezz1' : { 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
}
+
+
ID_LOOKUP = {
'FRU' : {
- '14' : '<inventory_root>/system/motherboard/dimm0',
+ 0x0d : '<inventory_root>/system/chassis',
+ 0x34 : '<inventory_root>/system/chassis/motherboard',
+ 0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
+ 0x02 : '<inventory_root>/system/chassis/motherboard/centaur0',
+ 0x03 : '<inventory_root>/system/chassis/motherboard/dimm0',
+ 0x04 : '<inventory_root>/system/chassis/motherboard/dimm1',
+ 0x05 : '<inventory_root>/system/chassis/motherboard/dimm2',
+ 0x06 : '<inventory_root>/system/chassis/motherboard/dimm3',
+ 0xff : '<inventory_root>/system',
+ },
+ 'FRU_STR' : {
+ 'PRODUCT_15' : '<inventory_root>/system',
+ 'CHASSIS_2' : '<inventory_root>/system/chassis',
+ 'BOARD_1' : '<inventory_root>/system/chassis/motherboard/cpu0',
+ 'BOARD_2' : '<inventory_root>/system/chassis/motherboard/centaur0',
+ 'PRODUCT_3' : '<inventory_root>/system/chassis/motherboard/dimm0',
+ 'PRODUCT_4' : '<inventory_root>/system/chassis/motherboard/dimm1',
+ 'PRODUCT_5' : '<inventory_root>/system/chassis/motherboard/dimm2',
+ 'PRODUCT_6' : '<inventory_root>/system/chassis/motherboard/dimm3',
},
'SENSOR' : {
- '21' : '<inventory_root>/system/motherboard/dimm0',
- '14' : '/org/openbmc/sensors/HostStatus_0',
+ 0x2f : '<inventory_root>/system/chassis/motherboard/cpu0',
+ 0x22 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
+ 0x23 : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
+ 0x24 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
+ 0x25 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
+ 0x26 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
+ 0x27 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
+ 0x28 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
+ 0x29 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
+ 0x2a : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
+ 0x2b : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
+ 0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
+ 0x2d : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
+ 0x2e : '<inventory_root>/system/chassis/motherboard/centaur0',
+ 0x1e : '<inventory_root>/system/chassis/motherboard/dimm0',
+ 0x1f : '<inventory_root>/system/chassis/motherboard/dimm1',
+ 0x20 : '<inventory_root>/system/chassis/motherboard/dimm2',
+ 0x21 : '<inventory_root>/system/chassis/motherboard/dimm3',
+ 0x09 : '/org/openbmc/sensor/virtual/BootCount',
+ 0x05 : '/org/openbmc/sensor/virtual/BootProgress',
+ 0x04 : '/org/openbmc/sensor/virtual/HostStatus',
+ 0x08 : '/org/openbmc/sensor/virtual/OccStatus',
+ 0x32 : '/org/openbmc/sensor/virtual/OperatingSystemStatus',
},
'GPIO_PRESENT' : {
- 'SLOT0_RISER_PRESENT' : '<inventory_root>/system/io_board/pcie_left_slot_riser',
- 'SLOT1_RISER_PRESENT' : '<inventory_root>/system/io_board/pcie_right_slot_riser',
- 'SLOT2_RISER_PRESENT' : '<inventory_root>/system/io_board/pcie_x16_slot_riser',
- 'SLOT0_PRESENT' : '<inventory_root>/system/io_board/pcie_slot0',
- 'SLOT1_PRESENT' : '<inventory_root>/system/io_board/pcie_slot1',
- 'SLOT2_PRESENT' : '<inventory_root>/system/io_board/pcie_slot2',
- 'MEZZ0_PRESENT' : '<inventory_root>/system/io_board/pcie_mezz0',
- 'MEZZ1_PRESENT' : '<inventory_root>/system/io_board/pcie_mezz1',
+ 'SLOT0_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot0',
+ 'SLOT1_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot1',
}
}
GPIO_CONFIG = {}
-GPIO_CONFIG['FSI_CLK'] = { 'gpio_num': 4, 'direction': 'out' }
-GPIO_CONFIG['FSI_DATA'] = { 'gpio_num': 5, 'direction': 'out' }
-GPIO_CONFIG['FSI_ENABLE'] = { 'gpio_num': 24, 'direction': 'out' }
-GPIO_CONFIG['POWER_PIN'] = { 'gpio_num': 33, 'direction': 'out' }
-GPIO_CONFIG['CRONUS_SEL'] = { 'gpio_num': 6, 'direction': 'out' }
-GPIO_CONFIG['PGOOD'] = { 'gpio_num': 23, 'direction': 'in' }
-GPIO_CONFIG['IDENTIFY'] = { 'gpio_num': 34, 'direction': 'out' }
-GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_num': 32, 'direction': 'falling' }
-GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_num': 104, 'direction': 'in' }
-GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_num': 105, 'direction': 'in' }
-GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_num': 106, 'direction': 'in' }
-GPIO_CONFIG['SLOT0_PRESENT'] = { 'gpio_num': 107, 'direction': 'in' }
-GPIO_CONFIG['SLOT1_PRESENT'] = { 'gpio_num': 108, 'direction': 'in' }
-GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_num': 109, 'direction': 'in' }
-GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_num': 112, 'direction': 'in' }
-GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_num': 113, 'direction': 'in' }
+GPIO_CONFIG['FSI_CLK'] = { 'gpio_num': 484, 'direction': 'out' }
+GPIO_CONFIG['FSI_DATA'] = { 'gpio_num': 485, 'direction': 'out' }
+GPIO_CONFIG['FSI_ENABLE'] = { 'gpio_num': 504, 'direction': 'out' }
+GPIO_CONFIG['POWER_PIN'] = { 'gpio_num': 449, 'direction': 'out' }
+GPIO_CONFIG['CRONUS_SEL'] = { 'gpio_num': 486, 'direction': 'out' }
+GPIO_CONFIG['PGOOD'] = { 'gpio_num': 503, 'direction': 'in' }
+GPIO_CONFIG['IDENTIFY'] = { 'gpio_num': 474, 'direction': 'out' }
+GPIO_CONFIG['BMC_READY'] = { 'gpio_num': 474, 'direction': 'out' }
+GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_num': 448, 'direction': 'falling' }
+GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_num': 392, 'direction': 'in' }
+GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_num': 393, 'direction': 'in' }
+GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_num': 394, 'direction': 'in' }
+GPIO_CONFIG['SLOT0_PRESENT'] = { 'gpio_num': 395, 'direction': 'in' }
+GPIO_CONFIG['SLOT1_PRESENT'] = { 'gpio_num': 396, 'direction': 'in' }
+GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_num': 397, 'direction': 'in' }
+GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_num': 400, 'direction': 'in' }
+GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_num': 401, 'direction': 'in' }