commit c144969b7fc813610fa55a24629ead297ff24cfe
author George Hung <george.hung@quantatw.com> Wed Sep 02 22:20:04 2020 +0800
committer George Hung <george.hung@quantatw.com> Thu Sep 03 05:01:57 2020 +0000
tree 47155b2f7eeabae1a2a354e944ae9d4fbb39eb87
parent e2b4748bdc808ebeed465cb9d3991930b37e8507

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'

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: Ic6203bae07cf8c789e3f77bd6a44a249ecfd9d54

meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service

diff --git a/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service b/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service
index 9731ee3..982ae6f 100644
--- a/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.service
+++ b/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

meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh

diff --git a/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh b/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh
index 66f52f0..2bbe46e 100644
--- a/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh
+++ b/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 @@
         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