diff options
| author | Potin Lai <potin.lai@quantatw.com> | 2024-07-29 08:35:22 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-07-29 18:16:05 +0300 |
| commit | b7a607c83bfd0a2ce30a170410742b0ecbdb8a25 (patch) | |
| tree | 24f2f5fa08e685c09a08391d48eb00431c3744fb /meta-facebook | |
| parent | 89a3a3b959becb5c32b18bbc3f1fc8555d0cc68d (diff) | |
| download | openbmc-b7a607c83bfd0a2ce30a170410742b0ecbdb8a25.tar.xz | |
meta-facebook: catalina: fix phosphor-multi-gpio-monitor not work
Add installation of platform json configuration.
Add missing service files of reset button.
Tested results:
```
root@bmc:~# journalctl -u phosphor-multi-gpio-monitor.service
Jul 28 22:38:47 bmc phosphor-multi-gpio-monitor[550]: GPIO Line ID_RST_BTN_BMC_N Deasserted
Jul 28 22:38:48 bmc phosphor-multi-gpio-monitor[550]: GPIO Line ID_RST_BTN_BMC_N Asserted
root@bmc:~#
root@bmc:~# journalctl -u deassert-reset-button.service
Jul 28 22:38:48 bmc systemd[1]: Starting Deassert ID_RST_BTN_BMC_N...
Jul 28 22:38:48 bmc deassert-run-power-pg[5051]: set_gpio: set RST_BMC_RSTBTN_OUT_N = 0 success
Jul 28 22:38:48 bmc systemd[1]: deassert-reset-button.service: Deactivated successfully.
Jul 28 22:38:48 bmc systemd[1]: Finished Deassert ID_RST_BTN_BMC_N
root@bmc:~#
root@bmc:~# journalctl -u assert-reset-button.service
Jul 28 22:38:49 bmc systemd[1]: Starting Assert ID_RST_BTN_BMC_N...
Jul 28 22:38:49 bmc assert-run-power-pg[5058]: set_gpio: set RST_BMC_RSTBTN_OUT_N = 1 success
Jul 28 22:38:49 bmc systemd[1]: assert-reset-button.service: Deactivated successfully.
Jul 28 22:38:49 bmc systemd[1]: Finished Assert ID_RST_BTN_BMC_N.
```
Change-Id: I9f726aaa94007c955812ea731da73be346558a62
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Diffstat (limited to 'meta-facebook')
4 files changed, 7 insertions, 3 deletions
diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service index 1004e5b589..89a6b3f8d7 100644 --- a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service @@ -1,5 +1,5 @@ [Unit] -Description=Assert RUN_POWER_PG +Description=Assert ID_RST_BTN_BMC_N [Service] Type=oneshot diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor index c4d2f4f0f7..2fd42f3038 100644 --- a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor @@ -29,7 +29,7 @@ do_ID_RST_BTN_BMC_N_change() } case $LINENAME in - "RUN_POWER_PG") + "RUN_POWER_PG" | "ID_RST_BTN_BMC_N") FUNC_NAME="do_${LINENAME}_change" "$FUNC_NAME" ;; diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service index 2f5da96f59..f822b2f0fd 100644 --- a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service @@ -1,5 +1,5 @@ [Unit] -Description=Deassert RUN_POWER_PG +Description=Deassert ID_RST_BTN_BMC_N [Service] Type=oneshot diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 0f90a58197..e4ebc9274e 100644 --- a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -12,7 +12,9 @@ RDEPENDS:${PN}:append = " bash" FILES:${PN} += "${systemd_system_unitdir}/*" SYSTEMD_SERVICE:${PN}-monitor += " \ + assert-reset-button.service \ assert-run-power-pg.service \ + deassert-reset-button.service \ deassert-run-power-pg.service \ " @@ -22,5 +24,7 @@ do_install:append:() { install -d ${D}${datadir}/${PN} install -d ${D}${libexecdir}/${PN} + install -m 0644 ${WORKDIR}/phosphor-multi-gpio-monitor.json \ + ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json install -m 0755 ${WORKDIR}/catalina-gpio-monitor ${D}${libexecdir}/${PN}/catalina-gpio-monitor } |