meta-facebook: yosemite4: rescan eeproms after chassis on/off
Add service for rescanning the eeproms after chassis on/off event
detected by gpio-monitor.
Tested: power on/off chassis and check dbus path on FruDevice.
Change-Id: Ie85f1526bf14cd87f92f93e37839bc80cf9044a4
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device
new file mode 100644
index 0000000..611d5e9
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+bus=$(($1 + 15))
+
+# rescan eeprom for fru information
+busctl call xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice xyz.openbmc_project.FruDeviceManager ReScanBus q $bus
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device@.service
new file mode 100644
index 0000000..8b4438e
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Rescan FruDevice for slot %i
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/phosphor-gpio-monitor/rescan-fru-device %i
+SyslogIdentifier=rescan-fru-device%i
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
index 96a06f2..31f9fd4 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
@@ -13,9 +13,10 @@
"Name": "PWROK_STBY_BMC_SLOT1",
"ChipId": "0",
"GpioNum": 10,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@1.service"]
+ "RISING": ["probe-slot-device@1.service", "rescan-fru-device@1.service"],
+ "FALLING": ["rescan-fru-device@1.service"]
},
"Continue": true
},
@@ -23,9 +24,10 @@
"Name": "PWROK_STBY_BMC_SLOT2",
"ChipId": "0",
"GpioNum": 11,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@2.service"]
+ "RISING": ["probe-slot-device@2.service", "rescan-fru-device@2.service"],
+ "FALLING": ["rescan-fru-device@2.service"]
},
"Continue": true
},
@@ -33,9 +35,10 @@
"Name": "PWROK_STBY_BMC_SLOT3",
"ChipId": "0",
"GpioNum": 12,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@3.service"]
+ "RISING": ["probe-slot-device@3.service", "rescan-fru-device@3.service"],
+ "FALLING": ["rescan-fru-device@3.service"]
},
"Continue": true
},
@@ -43,9 +46,10 @@
"Name": "PWROK_STBY_BMC_SLOT4",
"ChipId": "0",
"GpioNum": 13,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@4.service"]
+ "RISING": ["probe-slot-device@4.service", "rescan-fru-device@4.service"],
+ "FALLING": ["rescan-fru-device@4.service"]
},
"Continue": true
},
@@ -53,9 +57,10 @@
"Name": "PWROK_STBY_BMC_SLOT5",
"ChipId": "0",
"GpioNum": 190,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@5.service"]
+ "RISING": ["probe-slot-device@5.service", "rescan-fru-device@5.service"],
+ "FALLING": ["rescan-fru-device@5.service"]
},
"Continue": true
},
@@ -63,9 +68,10 @@
"Name": "PWROK_STBY_BMC_SLOT6",
"ChipId": "0",
"GpioNum": 191,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@6.service"]
+ "RISING": ["probe-slot-device@6.service", "rescan-fru-device@6.service"],
+ "FALLING": ["rescan-fru-device@6.service"]
},
"Continue": true
},
@@ -73,9 +79,10 @@
"Name": "PWROK_STBY_BMC_SLOT7",
"ChipId": "0",
"GpioNum": 195,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@7.service"]
+ "RISING": ["probe-slot-device@7.service", "rescan-fru-device@7.service"],
+ "FALLING": ["rescan-fru-device@7.service"]
},
"Continue": true
},
@@ -83,9 +90,10 @@
"Name": "PWROK_STBY_BMC_SLOT8",
"ChipId": "0",
"GpioNum": 202,
- "EventMon": "RISING",
+ "EventMon": "BOTH",
"Targets": {
- "RISING": ["probe-slot-device@8.service"]
+ "RISING": ["probe-slot-device@8.service", "rescan-fru-device@8.service"],
+ "FALLING": ["rescan-fru-device@8.service"]
},
"Continue": true
}
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index c6240c7..3e4f07b 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -6,6 +6,8 @@
file://set-button-sled.service \
file://probe-slot-device@.service \
file://probe-slot-device \
+ file://rescan-fru-device@.service \
+ file://rescan-fru-device \
"
RDEPENDS:${PN}:append:yosemite4 = " bash"
@@ -15,6 +17,7 @@
SYSTEMD_SERVICE:${PN} += " \
set-button-sled.service \
probe-slot-device@.service \
+ rescan-fru-device@.service \
"
SYSTEMD_AUTO_ENABLE = "enable"
@@ -25,6 +28,8 @@
${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
install -m 0644 ${WORKDIR}/set-button-sled.service ${D}${systemd_system_unitdir}/set-button-sled.service
install -m 0644 ${WORKDIR}/probe-slot-device@.service ${D}${systemd_system_unitdir}/probe-slot-device@.service
+ install -m 0644 ${WORKDIR}/rescan-fru-device@.service ${D}${systemd_system_unitdir}/rescan-fru-device@.service
install -d ${D}${libexecdir}/${PN}
install -m 0777 ${WORKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/
+ install -m 0777 ${WORKDIR}/rescan-fru-device ${D}${libexecdir}/${PN}/
}