meta-quanta: gbs: change back to upstream and enable IPMI SEL
- change back to OpenBMC upstream for phosphor-host-ipmid
and phosphor-sel-logger
- add inventory sensors YAML for IPMI SEL
- enable SEL_LOGGER_SEND_TO_LOGGING_SERVICE and
SEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS for IPMI SEL
Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I16c58444986aec6c927e175a2c69f9cca92a7bcb
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb
index cd632e1..167f78d 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb
+++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb
@@ -9,6 +9,7 @@
file://gbs-ipmi-fru.yaml \
file://gbs-ipmi-sensors.yaml \
file://gbs-ipmi-fru-properties.yaml \
+ file://gbs-ipmi-inventory-sensors.yaml \
"
S = "${WORKDIR}"
@@ -20,12 +21,15 @@
${D}${datadir}/${BPN}/ipmi-sensors.yaml
install -m 0644 -D gbs-ipmi-fru-properties.yaml \
${D}${datadir}/${BPN}/ipmi-extra-properties.yaml
+ install -m 0644 -D gbs-ipmi-inventory-sensors.yaml \
+ ${D}${datadir}/${BPN}/ipmi-inventory-sensors.yaml
}
FILES_${PN}-dev = " \
${datadir}/${BPN}/ipmi-fru-read.yaml \
${datadir}/${BPN}/ipmi-sensors.yaml \
${datadir}/${BPN}/ipmi-extra-properties.yaml \
+ ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \
"
ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml
new file mode 100644
index 0000000..58bcb65
--- /dev/null
+++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml
@@ -0,0 +1,435 @@
+/xyz/openbmc_project/sensors/temperature/i2cool_0:
+ eventReadingType: 1
+ sensorID: 0x10
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/i2cool_1:
+ eventReadingType: 1
+ sensorID: 0x11
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/i2cool_2:
+ eventReadingType: 1
+ sensorID: 0x12
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/powerseq_temp:
+ eventReadingType: 1
+ sensorID: 0x13
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/cputemp:
+ eventReadingType: 1
+ sensorID: 0x14
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme0:
+ eventReadingType: 1
+ sensorID: 0x15
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme1:
+ eventReadingType: 1
+ sensorID: 0x16
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme2:
+ eventReadingType: 1
+ sensorID: 0x17
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme3:
+ eventReadingType: 1
+ sensorID: 0x18
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme4:
+ eventReadingType: 1
+ sensorID: 0x19
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme5:
+ eventReadingType: 1
+ sensorID: 0x1A
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme6:
+ eventReadingType: 1
+ sensorID: 0x1B
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme7:
+ eventReadingType: 1
+ sensorID: 0x1C
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme8:
+ eventReadingType: 1
+ sensorID: 0x1D
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme9:
+ eventReadingType: 1
+ sensorID: 0x1E
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme10:
+ eventReadingType: 1
+ sensorID: 0x1F
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme11:
+ eventReadingType: 1
+ sensorID: 0x20
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme12:
+ eventReadingType: 1
+ sensorID: 0x21
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme13:
+ eventReadingType: 1
+ sensorID: 0x22
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme14:
+ eventReadingType: 1
+ sensorID: 0x23
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/nvme15:
+ eventReadingType: 1
+ sensorID: 0x24
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/vddcr_cpu:
+ eventReadingType: 1
+ sensorID: 0x27
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/vddcr_soc:
+ eventReadingType: 1
+ sensorID: 0x28
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/vddio_abcd:
+ eventReadingType: 1
+ sensorID: 0x29
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/vddio_efgh:
+ eventReadingType: 1
+ sensorID: 0x2A
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/p12v_mobo:
+ eventReadingType: 1
+ sensorID: 0x2B
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/p12v_fan:
+ eventReadingType: 1
+ sensorID: 0x2C
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/temperature/hotswap:
+ eventReadingType: 1
+ sensorID: 0x2D
+ sensorType: 1
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p1v8_stby:
+ eventReadingType: 1
+ sensorID: 0x30
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddcr_soc_stby:
+ eventReadingType: 1
+ sensorID: 0x31
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p2v5_stby:
+ eventReadingType: 1
+ sensorID: 0x32
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p1v2_stby:
+ eventReadingType: 1
+ sensorID: 0x33
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p1v175_stby:
+ eventReadingType: 1
+ sensorID: 0x34
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p1v8:
+ eventReadingType: 1
+ sensorID: 0x35
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p3v3:
+ eventReadingType: 1
+ sensorID: 0x36
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/pwrgd_pvpp:
+ eventReadingType: 1
+ sensorID: 0x37
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/pwrgd_pvddio:
+ eventReadingType: 1
+ sensorID: 0x38
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/pwrgd_cpuvr:
+ eventReadingType: 1
+ sensorID: 0x39
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p3v3_stby:
+ eventReadingType: 1
+ sensorID: 0x3A
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p5v_stby:
+ eventReadingType: 1
+ sensorID: 0x3B
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddcr_cpu_in:
+ eventReadingType: 1
+ sensorID: 0x3C
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddcr_cpu_out:
+ eventReadingType: 1
+ sensorID: 0x3D
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddcr_soc_in:
+ eventReadingType: 1
+ sensorID: 0x3E
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddcr_soc_out:
+ eventReadingType: 1
+ sensorID: 0x3F
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddio_abcd_out:
+ eventReadingType: 1
+ sensorID: 0x40
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddio_abcd_in:
+ eventReadingType: 1
+ sensorID: 0x41
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddio_efgh_out:
+ eventReadingType: 1
+ sensorID: 0x42
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/vddio_efgh_in:
+ eventReadingType: 1
+ sensorID: 0x43
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/hotswap_vin:
+ eventReadingType: 1
+ sensorID: 0x44
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/hotswap_vout:
+ eventReadingType: 1
+ sensorID: 0x45
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p3v_bat_adc:
+ eventReadingType: 1
+ sensorID: 0x46
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p12v_mobo_out:
+ eventReadingType: 1
+ sensorID: 0x47
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p12v_mobo_in:
+ eventReadingType: 1
+ sensorID: 0x48
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p12v_fan_out:
+ eventReadingType: 1
+ sensorID: 0x49
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/voltage/p12v_fan_in:
+ eventReadingType: 1
+ sensorID: 0x4A
+ sensorType: 2
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddcr_cpu_in:
+ eventReadingType: 1
+ sensorID: 0x50
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddcr_cpu_out:
+ eventReadingType: 1
+ sensorID: 0x51
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddcr_soc_in:
+ eventReadingType: 1
+ sensorID: 0x52
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddcr_soc_out:
+ eventReadingType: 1
+ sensorID: 0x53
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddio_abcd_in:
+ eventReadingType: 1
+ sensorID: 0x55
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddio_abcd_out:
+ eventReadingType: 1
+ sensorID: 0x54
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddio_efgh_in:
+ eventReadingType: 1
+ sensorID: 0x57
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/vddio_efgh_out:
+ eventReadingType: 1
+ sensorID: 0x56
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/p12v_mobo_in:
+ eventReadingType: 1
+ sensorID: 0x5A
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/p12v_mobo_out:
+ eventReadingType: 1
+ sensorID: 0x59
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/p12v_fan_in:
+ eventReadingType: 1
+ sensorID: 0x5C
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/p12v_fan_out:
+ eventReadingType: 1
+ sensorID: 0x5B
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/current/hotswap_iout:
+ eventReadingType: 1
+ sensorID: 0x58
+ sensorType: 3
+ offset: 0xff
+/xyz/openbmc_project/sensors/power/hotswap_pout:
+ eventReadingType: 1
+ sensorID: 0x70
+ sensorType: 0x0B
+ offset: 0xff
+/xyz/openbmc_project/sensors/fan_tach/fan0:
+ eventReadingType: 1
+ sensorID: 0x60
+ sensorType: 4
+ offset: 0xff
+/xyz/openbmc_project/sensors/fan_tach/fan1:
+ eventReadingType: 1
+ sensorID: 0x61
+ sensorType: 4
+ offset: 0xff
+/xyz/openbmc_project/sensors/fan_tach/fb_fan0:
+ eventReadingType: 1
+ sensorID: 0x62
+ sensorType: 4
+ offset: 0xff
+/xyz/openbmc_project/sensors/fan_tach/fb_fan1:
+ eventReadingType: 1
+ sensorID: 0x63
+ sensorType: 4
+ offset: 0xff
+/xyz/openbmc_project/sensors/fan_tach/fb_fan2:
+ eventReadingType: 1
+ sensorID: 0x64
+ sensorType: 4
+ offset: 0xff
+/xyz/openbmc_project/metrics/memory/BmcECC:
+ eventReadingType: 0x6f
+ sensorID: 0xF0
+ sensorType: 0x0C
+ offset: 0x00
+/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab0_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF1
+ sensorType: 0x1B
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab1_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF2
+ sensorType: 0x1B
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab2_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF3
+ sensorType: 0x1B
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab3_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF4
+ sensorType: 0x1B
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/sata0_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF5
+ sensorType: 0x25
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/hsbp_cab_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF6
+ sensorType: 0x25
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/fanbd_cab_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF7
+ sensorType: 0x25
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/bp12v_cab_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF8
+ sensorType: 0x25
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot0_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xF9
+ sensorType: 0x25
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot1_prsnt:
+ eventReadingType: 0x6f
+ sensorID: 0xFA
+ sensorType: 0x25
+ offset: 0x01
+/xyz/openbmc_project/watchdog/host0:
+ eventReadingType: 0x6f
+ sensorID: 0xFB
+ sensorType: 0x23
+ offset: 0x01
+/xyz/openbmc_project/inventory/system/chassis/entity/fans_efuse_pg:
+ eventReadingType: 0x6f
+ sensorID: 0xFC
+ sensorType: 0x25
+ offset: 0x01
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 bf2986c..816c5da 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
@@ -1,18 +1,13 @@
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 = "257ea262809c52e51f1f592e047d27125f0273b3"
-
FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
SRC_URI_append_gbs = " file://gbs-ipmid-whitelist.conf \
- file://0063-Save-the-pre-timeout-interrupt-in-dbus-property.patch \
"
WHITELIST_CONF_gbs = "${WORKDIR}/gbs-ipmid-whitelist.conf"
-EXTRA_OECONF_append_gbs = " --with-journal-sel \
+EXTRA_OECONF_append_gbs = " \
SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-sensors.yaml \
FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \
+ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-inventory-sensors.yaml \
"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index e0f8e08..5c28b04 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1,5 +1,4 @@
-SRC_URI_gbs := "git://github.com/quanta-bmc/phosphor-sel-logger.git"
-SRCREV_gbs := "6ded68355db28958836aedb40c0d4780d84d2b43"
-
# Enable threshold monitoring
-EXTRA_OECMAKE_append_gbs = "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON"
+EXTRA_OECMAKE_append_gbs = "-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=ON \
+ -DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=ON \
+ "