From e28bd4a8c9146727e6a9a605fee54b652940e637 Mon Sep 17 00:00:00 2001 From: Nikita Kosenkov Date: Tue, 11 Oct 2022 17:35:24 +0300 Subject: Changed the behavior LEDs when starting the BMC --- .../linux-aspeed/aspeed-bmc-sila-cp2-5422.dts | 6 ++-- .../packagegroups/packagegroup-ibs-apps.bb | 2 ++ .../recipes-phosphor/system/callback-manager.bb | 19 ++++++++++ ...-off-the-blinking-ID-LED-by-the-ID-button.patch | 41 ++++++++++++++++++++++ .../recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend | 1 + 5 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 meta-ibs/meta-common/recipes-phosphor/system/callback-manager.bb create mode 100644 meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0006-On-off-the-blinking-ID-LED-by-the-ID-button.patch diff --git a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts index 81a9be2513..d5bc549e8f 100644 --- a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts +++ b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts @@ -74,17 +74,17 @@ compatible = "gpio-leds"; identify { - default-state = "off"; + default-state = "on"; gpios = <&gpio ASPEED_GPIO(S, 6) GPIO_ACTIVE_LOW>; }; status_amber { - default-state = "off"; + default-state = "on"; gpios = <&gpio ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>; }; status_green { - default-state = "keep"; + default-state = "off"; gpios = <&gpio ASPEED_GPIO(S, 4) GPIO_ACTIVE_LOW>; }; diff --git a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb index 64928f864a..06da008158 100644 --- a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb +++ b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb @@ -58,6 +58,8 @@ RDEPENDS:${PN}-system = " \ peci-pcie \ phosphor-sel-logger \ srvcfg-manager \ + callback-manager \ + id-led-off \ " SUMMARY:${PN}-interface = "Interfaces" diff --git a/meta-ibs/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-ibs/meta-common/recipes-phosphor/system/callback-manager.bb new file mode 100644 index 0000000000..9f74bc7c8d --- /dev/null +++ b/meta-ibs/meta-common/recipes-phosphor/system/callback-manager.bb @@ -0,0 +1,19 @@ +SUMMARY = "Callback Manager" +DESCRIPTION = "D-Bus daemon that registers matches that trigger method calls" + +SRC_URI = "git://github.com/openbmc/s2600wf-misc;branch=master;protocol=https" + +inherit cmake systemd +DEPENDS = "boost sdbusplus" + +PV = "0.1+git${SRCPV}" +SRCREV = "ff1c36e5f7c698269f0dd11bbaf634a76c3e9468" + +S = "${WORKDIR}/git/callback-manager" + +SYSTEMD_SERVICE:${PN} += "callback-manager.service" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=7becf906c8f8d03c237bad13bc3dac53" + +EXTRA_OECMAKE = "-DYOCTO=1" diff --git a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0006-On-off-the-blinking-ID-LED-by-the-ID-button.patch b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0006-On-off-the-blinking-ID-LED-by-the-ID-button.patch new file mode 100644 index 0000000000..2e25695f0d --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0006-On-off-the-blinking-ID-LED-by-the-ID-button.patch @@ -0,0 +1,41 @@ +From 3c236acd2e11048fd30af30e5126aa14c5313672 Mon Sep 17 00:00:00 2001 +From: Nikita Kosenkov +Date: Tue, 11 Oct 2022 17:16:49 +0300 +Subject: [PATCH] On/off the blinking ID LED by the ID button + +--- + src/chassiscommands.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/chassiscommands.cpp b/src/chassiscommands.cpp +index a6df1ac..6de6dda 100644 +--- a/src/chassiscommands.cpp ++++ b/src/chassiscommands.cpp +@@ -29,6 +29,8 @@ + #include + #include + ++#include ++ + using namespace phosphor::logging; + + namespace ipmi::chassis +@@ -162,12 +164,12 @@ void idButtonPropChanged(sdbusplus::message::message& msg) + } + else + { +- // toggle the IED on/off +- if (!getIDState(ledIDOnObj, asserted)) ++ // toggle the LED blink/off ++ if (!getIDState(ledIDBlinkObj, asserted)) + { + return; + } +- enclosureIdentifyLed(ledIDOnObj, !asserted); ++ enclosureIdentifyLed(ledIDBlinkObj, !asserted); + } + } + } +-- +2.35.1 + diff --git a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend index 6f5aa453cd..7b87623323 100644 --- a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend @@ -8,4 +8,5 @@ SRC_URI += "\ file://0003-Allow-Sensor-Commands.patch \ file://0004-Allow-System-IPMI-Interface-Network-Mgmt.patch \ file://0005-Allow-additional-non-whitelisted-commands.patch \ + file://0006-On-off-the-blinking-ID-LED-by-the-ID-button.patch \ " -- cgit v1.2.3