diff options
author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-03-27 07:39:21 +0300 |
---|---|---|
committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-03-27 08:30:03 +0300 |
commit | 2fc4447bde26ed8da70cb4733b10bbdc15afda23 (patch) | |
tree | 007714b798f9cf417691fb611e4285a9fe6ddfe4 /meta-ampere/meta-jade | |
parent | 0e5de5d94982c64a29c418024e708776d811667c (diff) | |
download | openbmc-2fc4447bde26ed8da70cb4733b10bbdc15afda23.tar.xz |
meta-ampere: mtjade: handle HIGHTEMP via multi-gpio-monitor
Change to handle HIGHTEMP event via multi-gpio-monitor application,
replacing ampere-gpio-handling.
Tested:
1. Stop fan monitor service
2. Stress CPU HOST
stress-ng.sh 600 5 max 100
3. Wait SOC Temp goes over 105 degree.
5. Check for HIGHTEMP event log.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: Ia6b34c7d1d7b458e6db60ca79a7a091e19ecaf06
Diffstat (limited to 'meta-ampere/meta-jade')
10 files changed, 23 insertions, 51 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb deleted file mode 100644 index 645847bf03..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Ampere Computing LLC Host Gpio Handling" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-systemd - -DEPENDS += "phosphor-gpio-monitor" -RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor" -RDEPENDS:${PN} += "bash" - -AMPERE_MONITOR_INSTANCES = " \ - S0_hightemp_start S0_hightemp_stop \ - S1_hightemp_start S1_hightemp_stop \ - " - -SYSTEMD_ENVIRONMENT_FILE:${PN} +=" \ - obmc/gpio/S0_hightemp_start \ - obmc/gpio/S0_hightemp_stop \ - obmc/gpio/S1_hightemp_start \ - obmc/gpio/S1_hightemp_stop \ - " - -TMPL = "phosphor-gpio-monitor@.service" -INSTFMT = "phosphor-gpio-monitor@{0}.service" -TGT = "multi-user.target" -FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" - -SYSTEMD_SERVICE:${PN} += " \ - ampere_hightemp_start@.service \ - ampere_hightemp_stop@.service \ - " -SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'AMPERE_MONITOR_INSTANCES')}" - diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_start b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_start deleted file mode 100644 index 44dc221ed8..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_start +++ /dev/null @@ -1,4 +0,0 @@ -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=72 -POLARITY=1 -TARGET=ampere_hightemp_start@0.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_stop b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_stop deleted file mode 100644 index ccd0519094..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_stop +++ /dev/null @@ -1,4 +0,0 @@ -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=72 -POLARITY=0 -TARGET=ampere_hightemp_stop@0.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_start b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_start deleted file mode 100644 index 901eb00801..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_start +++ /dev/null @@ -1,4 +0,0 @@ -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=216 -POLARITY=1 -TARGET=ampere_hightemp_start@1.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_stop b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_stop deleted file mode 100644 index f1b4cc12be..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_stop +++ /dev/null @@ -1,4 +0,0 @@ -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=216 -POLARITY=0 -TARGET=ampere_hightemp_start@1.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_start@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service index 5f26194eb0..5f26194eb0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_start@.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_stop@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service index 012b0ddaf9..012b0ddaf9 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_stop@.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json index 7b89a145be..66c3dcb612 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json @@ -30,6 +30,26 @@ "Continue": true }, { + "Name": "S0_HIGHTEMP", + "LineName": "S0_HIGHTEMP_L", + "EventMon": "BOTH", + "Targets": { + "FALLING": ["ampere_hightemp_start@0.service"], + "RISING": ["ampere_hightemp_stop@0.service"] + }, + "Continue": true + }, + { + "Name": "S1_HIGHTEMP", + "LineName": "S1_HIGHTEMP_L", + "EventMon": "BOTH", + "Targets": { + "FALLING": ["ampere_hightemp_start@1.service"], + "RISING": ["ampere_hightemp_stop@1.service"] + }, + "Continue": true + }, + { "Name": "S0_SCP_AUTH_FAIL", "LineName": "S0_SCP_AUTH_FAIL_L", "EventMon": "FALLING", diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index f798fee835..2a9ed5bacb 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -15,6 +15,8 @@ SRC_URI += " \ SYSTEMD_SERVICE:${PN}-monitor += " \ ampere-host-shutdown-ack@.service \ ampere_overtemp@.service \ + ampere_hightemp_start@.service \ + ampere_hightemp_stop@.service \ ampere_scp_failover.service \ psu_hotswap_reset@.service \ " diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 5e726c363b..b3db54251a 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -3,7 +3,7 @@ RDEPENDS:${PN}-extras:append = " \ phosphor-image-signing \ phosphor-virtual-sensor \ phosphor-misc-usb-ctrl \ - ampere-gpio-handling \ + phosphor-gpio-monitor-monitor \ " RDEPENDS:${PN}-inventory:append = " \ |