meta-quanta: gbs: fix BMC can't record gpio present SEL logs

It needs to set the correct sensor type in sensor DBus path and
then records the gpio present SEL logs successfully

cable sensors -> set sensor type 'cable'
Non-cable sensors -> set sensor type 'entity presence'

(From meta-quanta rev: c144969b7fc813610fa55a24629ead297ff24cfe)

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I454d87439141b1b55d995a3276384429ad10d9a9
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

15 files changed, 41 insertions, 40 deletions

diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service
index 9731ee3883..982ae6f5a6 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Detect GPIO Present Manager
 After=phosphor-gpio-presence@.service
-Requires=phosphor-gpio-presence@.service
+Wants=phosphor-gpio-presence@.service
 
 [Service]
 ExecStart=/usr/bin/detect-gpio-present.sh
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh
index 66f52f0675..2bbe46e848 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 SERVICE_NAME="xyz.openbmc_project.Inventory.Manager"
-PRESENT_OBJPATH=("/xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab0_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab1_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab2_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab3_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/hsbp_cab_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/fanbd_cab_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/bp12v_cab_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/sata0_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot0_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot1_prsnt")
+PRESENT_OBJPATH=("/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab0_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab1_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab2_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab3_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/cable/hsbp_cab_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/cable/fanbd_cab_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/cable/bp12v_cab_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/entity/sata0_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot0_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot1_prsnt")
 INTERFACE_NAME="xyz.openbmc_project.Inventory.Item"
 
 IPMI_LOG_SERVICE="xyz.openbmc_project.Logging.IPMI"
@@ -34,11 +34,11 @@ while true; do
         if [ $boot_status == "false" ] && [ ${present_state[$i]} == "true" ];then
             echo "Update cable $(($i+1)) state."
             present_state[$i]="false"
-            busctl call $IPMI_LOG_SERVICE $IPMI_LOG_OBJPATH $IPMI_LOG_INTERFACE $IPMI_LOG_FUNCT $IPMI_LOG_PARA_FORMAT $LOG_ERR ${PRESENT_OBJPATH[$i]} $LOG_EVENT_DATA $LOG_ASSERT_FLAG $LOG_GENID_FLAG
+            busctl call $IPMI_LOG_SERVICE $IPMI_LOG_OBJPATH $IPMI_LOG_INTERFACE $IPMI_LOG_FUNCT $IPMI_LOG_PARA_FORMAT "$LOG_ERR" ${PRESENT_OBJPATH[$i]} $LOG_EVENT_DATA $LOG_ASSERT_FLAG $LOG_GENID_FLAG
         elif [ $boot_status == "true" ] && [ ${present_state[$i]} == "false" ];then
             echo "Update cable $(($i+1)) state."
             present_state[$i]="true"
-            busctl call $IPMI_LOG_SERVICE $IPMI_LOG_OBJPATH $IPMI_LOG_INTERFACE $IPMI_LOG_FUNCT $IPMI_LOG_PARA_FORMAT $LOG_ERR ${PRESENT_OBJPATH[$i]} $LOG_EVENT_DATA $LOG_DEASSERT_FLAG $LOG_GENID_FLAG
+            busctl call $IPMI_LOG_SERVICE $IPMI_LOG_OBJPATH $IPMI_LOG_INTERFACE $IPMI_LOG_FUNCT $IPMI_LOG_PARA_FORMAT "$LOG_ERR" ${PRESENT_OBJPATH[$i]} $LOG_EVENT_DATA $LOG_DEASSERT_FLAG $LOG_GENID_FLAG
         fi
     done
     sleep 1
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh
index 7b45710910..71a608fff5 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh
@@ -25,12 +25,13 @@ pe_eeprom_addr=( 50 54 )
 SERVICE_NAME="xyz.openbmc_project.Inventory.Manager"
 INTERFACE_NAME="xyz.openbmc_project.Inventory.Item"
 
-PE_PRESENT_OBJPATH=("/xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot0_prsnt"
-"/xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot1_prsnt")
-HSBP_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/gpios/hsbp_cab_prsnt"
-FANBD_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/gpios/fanbd_cab_prsnt"
-BP12V_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/gpios/bp12v_cab_prsnt"
-SATA0_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/gpios/sata0_prsnt"
+PE_PRESENT_OBJPATH=("/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot0_prsnt"
+"/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot1_prsnt")
+HSBP_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/cable/hsbp_cab_prsnt"
+FANBD_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/cable/fanbd_cab_prsnt"
+BP12V_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/cable/bp12v_cab_prsnt"
+SATA0_PRESENT_OBJPATH="/xyz/openbmc_project/inventory/system/chassis/entity/sata0_prsnt"
+
 
 set_gpio_persistence() {
   reg_val=$(devmem ${WD1RCR_ADDR} 32)
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
index 7c334132cf..31f9cb3c2a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
+++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
@@ -1093,7 +1093,7 @@
             assert: false
             type: bool
   mutability: Mutability::Write|Mutability::Read
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab0_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab0_prsnt
   readingType: assertion
   sensorNamePattern: nameLeaf
   sensorReadingType: 0x6f
@@ -1103,17 +1103,17 @@
 0xF2:
   <<: *gpio_prsnt
   entityInstance: 1
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab1_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab1_prsnt
 
 0xF3:
   <<: *gpio_prsnt
   entityInstance: 2
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab2_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab2_prsnt
 
 0xF4:
   <<: *gpio_prsnt
   entityInstance: 3
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab3_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab3_prsnt
 
 0xF5:
   entityID: 0x1A
@@ -1129,7 +1129,7 @@
             assert: false
             type: bool
   mutability: Mutability::Write|Mutability::Read
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/sata0_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/entity/sata0_prsnt
   readingType: assertion
   sensorNamePattern: nameLeaf
   sensorReadingType: 0x6f
@@ -1139,17 +1139,17 @@
 0xF6:
   <<: *gpio_prsnt
   entityInstance: 4
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/hsbp_cab_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/hsbp_cab_prsnt
 
 0xF7:
   <<: *gpio_prsnt
   entityInstance: 5
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/fanbd_cab_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/fanbd_cab_prsnt
 
 0xF8:
   <<: *gpio_prsnt
   entityInstance: 6
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/bp12v_cab_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/cable/bp12v_cab_prsnt
 
 0xF9: &card_prsnt
   entityID: 0x0B
@@ -1165,7 +1165,7 @@
             assert: false
             type: bool
   mutability: Mutability::Write|Mutability::Read
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot0_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/entity/pe_slot0_prsnt
   readingType: assertion
   sensorNamePattern: nameLeaf
   sensorReadingType: 0x6f
@@ -1175,4 +1175,4 @@
 0xFA:
   <<: *card_prsnt
   entityInstance: 1
-  path: /xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot1_prsnt
+  path: /xyz/openbmc_project/inventory/system/chassis/entity/pe_slot1_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf
index e6dfdac678..e26c8f50e8 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf
@@ -1,6 +1,6 @@
 #The gpio 70 is a real gpio, which is used to
 #store the sas cable 0 present signal
-INVENTORY=/system/chassis/gpios/ss_cab0_prsnt
+INVENTORY=/system/chassis/cable/ss_cab0_prsnt
 DEVPATH=/dev/input/event0
 KEY=70
 NAME=ss_cab0_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf
index 2f3e5f5bc8..e6a18ee6c3 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf
@@ -1,6 +1,6 @@
 #The gpio 71 is a real gpio, which is used to
 #store the sas cable 1 present signal
-INVENTORY=/system/chassis/gpios/ss_cab1_prsnt
+INVENTORY=/system/chassis/cable/ss_cab1_prsnt
 DEVPATH=/dev/input/event0
 KEY=71
 NAME=ss_cab1_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf
index 719311d5f7..490f97f492 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf
@@ -1,6 +1,6 @@
 #The gpio 72 is a real gpio, which is used to
 #store the sas cable 2 present signal
-INVENTORY=/system/chassis/gpios/ss_cab2_prsnt
+INVENTORY=/system/chassis/cable/ss_cab2_prsnt
 DEVPATH=/dev/input/event0
 KEY=72
 NAME=ss_cab2_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf
index 2e1a828361..f3579ab97a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf
@@ -1,6 +1,6 @@
 #The gpio 73 is a real gpio, which is used to
 #store the sas cable 3 present signal
-INVENTORY=/system/chassis/gpios/ss_cab3_prsnt
+INVENTORY=/system/chassis/cable/ss_cab3_prsnt
 DEVPATH=/dev/input/event0
 KEY=73
 NAME=ss_cab3_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf
index ecd074791a..be6ed95af6 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf
@@ -1,6 +1,6 @@
 #The gpio 57 is a real gpio, which is used to
 #store the HSBP cable present signal
-INVENTORY=/system/chassis/gpios/hsbp_cab_prsnt
+INVENTORY=/system/chassis/cable/hsbp_cab_prsnt
 DEVPATH=/dev/input/event0
 KEY=57
 NAME=hsbp_cab_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf
index 2838872f83..223ef4a7ca 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf
@@ -1,6 +1,6 @@
 #The gpio 58 is a real gpio, which is used to
 #store the fan board cable present signal
-INVENTORY=/system/chassis/gpios/fanbd_cab_prsnt
+INVENTORY=/system/chassis/cable/fanbd_cab_prsnt
 DEVPATH=/dev/input/event0
 KEY=58
 NAME=fanbd_cab_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf
index ca3fbd4b1a..c32fb3c975 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf
@@ -1,6 +1,6 @@
 #The gpio 69 is a real gpio, which is used to
 #store the HSBP 12V standby cable present signal
-INVENTORY=/system/chassis/gpios/bp12v_cab_prsnt
+INVENTORY=/system/chassis/cable/bp12v_cab_prsnt
 DEVPATH=/dev/input/event0
 KEY=69
 NAME=bp12v_cab_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf
index 0a0aed7c75..1cc7da2650 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf
@@ -1,6 +1,6 @@
 #The gpio 5 is a real gpio, which is used to
 #store the SATA0 present signal
-INVENTORY=/system/chassis/gpios/sata0_prsnt
+INVENTORY=/system/chassis/entity/sata0_prsnt
 DEVPATH=/dev/input/event0
 KEY=5
 NAME=sata0_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf
index 342aaf0a90..38c72e11e6 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf
@@ -1,6 +1,6 @@
 #The gpio 120 is a real gpio, which is used to
 #store the PE0 present signal
-INVENTORY=/system/chassis/gpios/pe_slot0_prsnt
+INVENTORY=/system/chassis/entity/pe_slot0_prsnt
 DEVPATH=/dev/input/event0
 KEY=120
 NAME=pe_slot0_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf
index 10d3a2ee71..007229d449 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf
@@ -1,6 +1,6 @@
 #The gpio 121 is a real gpio, which is used to
 #store the PE1 present signal
-INVENTORY=/system/chassis/gpios/pe_slot1_prsnt
+INVENTORY=/system/chassis/entity/pe_slot1_prsnt
 DEVPATH=/dev/input/event0
 KEY=121
 NAME=pe_slot1_prsnt
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index cc3eb1e199..bf2986c47f 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -3,7 +3,7 @@ DEPENDS_append_gbs = " gbs-yaml-config"
 SRC_URI_remove_gbs = "git://github.com/openbmc/phosphor-host-ipmid"
 SRC_URI_prepend_gbs = "git://github.com/quanta-bmc/phosphor-host-ipmid.git"
 
-SRCREV_gbs = "1670af57eee1d33018665cb1bce9ae5ed28470cd"
+SRCREV_gbs = "257ea262809c52e51f1f592e047d27125f0273b3"
 
 FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
 SRC_URI_append_gbs = " file://gbs-ipmid-whitelist.conf \