commit e98824a99f83e96891c19f5f8c9483e633ce6fec
author Deepak Kodihalli <dkodihal@in.ibm.com> Sun Aug 13 12:00:36 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed Aug 16 03:10:59 2017 +0000
tree c274b9556c52e5a917d37afe5644c1de0e7c65da
parent 3baae2ae8bc3cee9e18cf8dfe7af303edd51e162

ipmi sensors: fix d-bus mappings in input yaml

A system specific YAML file helps map ipmi sensors to corresponding
d-bus objects. This YAML was using the sensor type as the key. This was
an issue because there is a possibility of different sensors, with the
same sensor type, mapping to different d-bus objects and interfaces.

While still maintaining the sensor number as the key in the "output"
YAML (generated by an MRW parser), use the sensor instance name as the
key in the input YAML. This helps to have 1x1 mappings between sensors
and d-bus objects.

Resolves openbmc/openbmc#2130.

Change-Id: I3e87fa88d8622615f1a21aa46084f7082dcc4d0f
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>

common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml

diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
index a0dce0e..61c43cf 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
@@ -1,13 +1,14 @@
-0xC3:
+boot_count_sensor:
   path: /xyz/openbmc_project/state/host0
   serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
+  readingType: readingAssertion
   interfaces:
     xyz.openbmc_project.Control.Boot.RebootAttempts:
       AttemptsLeft:
         0xFF:
           type: uint32_t
-0x1F:
+
+os_boot_sensor:
   path: /xyz/openbmc_project/state/host0
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
@@ -32,7 +33,8 @@
         0x06:
           assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete"
           type: string
-0x0F:
+
+fw_boot_sensor:
   path: /xyz/openbmc_project/state/host0
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: eventdata2
@@ -54,10 +56,10 @@
         0x14:
           type: string
           set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit"
-0x0C:
+
+dimm_func_sensor:
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
-  byteOffset: 0x00
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -71,16 +73,33 @@
           type: "bool"
           assert: true
           deassert: false
-0x07:
+
+cpu_func_sensor:
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
-  byteOffset: 0x00
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
         0x08:
           type:   "bool"
-          assert: false
+          assert:  false
+          deassert: true
+    xyz.openbmc_project.Inventory.Item:
+      Present:
+        0x07:
+          type: "bool"
+          assert: true
+          deassert: false
+
+cpucore_func_sensor:
+  serviceInterface: xyz.openbmc_project.Inventory.Manager
+  readingType: assertion
+  interfaces:
+    xyz.openbmc_project.State.Decorator.OperationalStatus:
+      Functional:
+        0x08:
+          type:   "bool"
+          assert:  false
           deassert: true
     xyz.openbmc_project.Inventory.Item:
       Present: