From 9fca98e0c780af5a8dc39f0f71c4983b0302e1ce Mon Sep 17 00:00:00 2001 From: Amithash Prasad Date: Wed, 17 Jul 2024 14:12:00 -0700 Subject: [PATCH] yocto: update master Summary: Update master at e2c94c481 update-submodule: yocto/lf-master 1. Removed 1007-CVE-2024-6387-fix-signal-handler-race-condition.patch since its now part of upstream: https://github.com/openbmc/openbmc/blob/master/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb#L30 2. Manually reworked patches for yosemite4 entity-manager. Upstream split configurations/yosemite4_sentineldome.json into configurations/yosemite4_sentineldome_t1.json and configurations/yosemite4_sentineldome_t2.json. 3. Manually reworked patches to pldm since one of them (0011-platform-mc-add-more-exception-type.patch) got merged upstream. Test Plan: CIT build passes. Reviewed By: williamspatrick Differential Revision: D59763365 fbshipit-source-id: 4bf36c69700c4fdd7d33581599c85dcb1965aba2 --- .../files/0001-platform-mc-PDR-handling.patch | 6 +-- .../0002-platform-mc-Sensor-handling.patch | 10 ++--- .../0003-platform-mc-Added-EventManager.patch | 16 +++---- ...ort-multi-host-MCTP-devices-hot-plug.patch | 14 +++--- ...-write-file-request-for-post-code-hi.patch | 20 ++++----- ...atform-mc-Add-OEM-Meta-event-handler.patch | 12 +++--- ...M-META-command-for-host-BIOS-version.patch | 14 +++--- ...tor-all-sensors-once-upon-the-first-.patch | 6 +-- ...09-pldm-Revise-image-path-for-update.patch | 6 +-- ...META-command-for-Event-Logs-from-BIC.patch | 10 ++--- ...-OEM-META-command-for-power-control.patch} | 10 ++--- ...-platform-mc-add-more-exception-type.patch | 34 --------------- ...012-oem-meta-Add-APML-alert-handler.patch} | 10 ++--- common/recipes-phosphor/pldm/pldm_%.bbappend | 25 ++++++----- ...port-CX7-NIC-card-temperature-sensor.patch | 2 +- ...ions-Revise-the-BRCM-NIC-sensor-name.patch | 2 +- ...tp-eids-configuration-for-Yosemite-4.patch | 43 +++++++++++++------ ...yosemite4-Add-IANA-for-sentinel-dome.patch | 31 +++++++++---- yocto_repos.sh | 2 +- 19 files changed, 135 insertions(+), 138 deletions(-) rename common/recipes-phosphor/pldm/files/{0012-Support-OEM-META-command-for-power-control.patch => 0011-Support-OEM-META-command-for-power-control.patch} (98%) delete mode 100644 common/recipes-phosphor/pldm/files/0011-platform-mc-add-more-exception-type.patch rename common/recipes-phosphor/pldm/files/{0013-oem-meta-Add-APML-alert-handler.patch => 0012-oem-meta-Add-APML-alert-handler.patch} (96%) diff --git a/common/recipes-phosphor/pldm/files/0001-platform-mc-PDR-handling.patch b/common/recipes-phosphor/pldm/files/0001-platform-mc-PDR-handling.patch index a9695c908ab8..2fb6a8831ed2 100644 --- a/common/recipes-phosphor/pldm/files/0001-platform-mc-PDR-handling.patch +++ b/common/recipes-phosphor/pldm/files/0001-platform-mc-PDR-handling.patch @@ -1,7 +1,7 @@ -From 1f23c07cbac2b7f8087429b06e3556189b3ff112 Mon Sep 17 00:00:00 2001 +From 8c895e3a276ee6c1e1f73cbb8c6b407e9f8905f0 Mon Sep 17 00:00:00 2001 From: Gilbert Chen Date: Tue, 24 May 2022 15:35:21 +0100 -Subject: [PATCH 01/10] platform-mc: PDR handling +Subject: [PATCH 01/12] platform-mc: PDR handling Get PDRs of new terminus if it supports GetPDR PLDM command. It doesn't handle the event receiver related initialization steps, and either @@ -1063,5 +1063,5 @@ index 32fd7b7..2f88829 100644 + EXPECT_EQ("TEMP1", names[0][0].second); +} -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0002-platform-mc-Sensor-handling.patch b/common/recipes-phosphor/pldm/files/0002-platform-mc-Sensor-handling.patch index 0b8cf9fd2031..81a4ec851c59 100644 --- a/common/recipes-phosphor/pldm/files/0002-platform-mc-Sensor-handling.patch +++ b/common/recipes-phosphor/pldm/files/0002-platform-mc-Sensor-handling.patch @@ -1,7 +1,7 @@ -From fc224a99aea33f2ad953062b3706e85e8ab1b49b Mon Sep 17 00:00:00 2001 +From 19d50c65174d9da6f72bf030736c0303a981823a Mon Sep 17 00:00:00 2001 From: Gilbert Chen Date: Wed, 23 Feb 2022 20:56:19 +0000 -Subject: [PATCH 02/10] platform-mc: Sensor handling +Subject: [PATCH 02/12] platform-mc: Sensor handling Added sensor_manager and numeric_sensor class. The sensor_manager class manages the timing of sensor polling. The NumericSensor class @@ -1853,7 +1853,7 @@ index 8fa4ea0..9105b05 100644 } // namespace platform_mc } // namespace pldm diff --git a/platform-mc/terminus_manager.cpp b/platform-mc/terminus_manager.cpp -index 54d749d..e9b6781 100644 +index bb40d8d..13d40e7 100644 --- a/platform-mc/terminus_manager.cpp +++ b/platform-mc/terminus_manager.cpp @@ -160,6 +160,7 @@ auto TerminusManager::findTeminusPtr(const MctpInfo& mctpInfo) @@ -2410,7 +2410,7 @@ index 0000000..cd4e5a4 + sensorManager.stopPolling(tid); +} diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp -index 4df71e9..768c6c9 100644 +index 9613e02..3aea04a 100644 --- a/pldmd/pldmd.cpp +++ b/pldmd/pldmd.cpp @@ -187,7 +187,7 @@ int main(int argc, char** argv) @@ -2423,5 +2423,5 @@ index 4df71e9..768c6c9 100644 InstanceIdDb instanceIdDb; dbus_api::Requester dbusImplReq(bus, "/xyz/openbmc_project/pldm", -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0003-platform-mc-Added-EventManager.patch b/common/recipes-phosphor/pldm/files/0003-platform-mc-Added-EventManager.patch index e4d8b7e6a92d..e3a2c5ba2096 100644 --- a/common/recipes-phosphor/pldm/files/0003-platform-mc-Added-EventManager.patch +++ b/common/recipes-phosphor/pldm/files/0003-platform-mc-Added-EventManager.patch @@ -1,7 +1,7 @@ -From efc8acfae27d0436ad009b9432dc6a7c7db78f5a Mon Sep 17 00:00:00 2001 +From bfcdb3b51fc3e0c6bf0a82af3f3bfb530367f4d9 Mon Sep 17 00:00:00 2001 From: Gilbert Chen Date: Tue, 2 May 2023 10:20:10 +0000 -Subject: [PATCH 03/10] platform-mc: Added EventManager +Subject: [PATCH 03/12] platform-mc: Added EventManager Added eventManager to handle sensor event class(00h), pldmMessagePollEvent class(05h) and OEM CPER event class(FAh) @@ -42,10 +42,10 @@ Signed-off-by: Gilbert Chen create mode 100644 platform-mc/test/mock_event_manager.hpp diff --git a/libpldmresponder/platform.cpp b/libpldmresponder/platform.cpp -index 7d50b5d..c04d7b4 100644 +index 1e0955a..8ddaa29 100644 --- a/libpldmresponder/platform.cpp +++ b/libpldmresponder/platform.cpp -@@ -379,15 +379,20 @@ Response Handler::platformEventMessage(const pldm_msg* request, +@@ -376,15 +376,20 @@ Response Handler::platformEventMessage(const pldm_msg* request, try { const auto& handlers = eventHandlers.at(eventClass); @@ -2171,10 +2171,10 @@ index 460009d..0db976b 100644 {} diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp -index 768c6c9..a309ca6 100644 +index 3aea04a..ef9b322 100644 --- a/pldmd/pldmd.cpp +++ b/pldmd/pldmd.cpp -@@ -260,6 +260,33 @@ int main(int argc, char** argv) +@@ -261,6 +261,33 @@ int main(int argc, char** argv) // FRU table is built lazily when a FRU command or Get PDR command is // handled. To enable building FRU table, the FRU handler is passed to the // Platform handler. @@ -2208,7 +2208,7 @@ index 768c6c9..a309ca6 100644 auto platformHandler = std::make_unique( &dbusHandler, hostEID, &instanceIdDb, PDR_JSONS_DIR, pdrRepo.get(), hostPDRHandler.get(), dbusToPLDMEventHandler.get(), fruHandler.get(), -@@ -292,8 +319,6 @@ int main(int argc, char** argv) +@@ -293,8 +320,6 @@ int main(int argc, char** argv) std::unique_ptr fwManager = std::make_unique(event, reqHandler, instanceIdDb); @@ -2218,5 +2218,5 @@ index 768c6c9..a309ca6 100644 std::make_unique( bus, std::initializer_list{ -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0004-requester-support-multi-host-MCTP-devices-hot-plug.patch b/common/recipes-phosphor/pldm/files/0004-requester-support-multi-host-MCTP-devices-hot-plug.patch index ade976235795..45f9f64d38f7 100644 --- a/common/recipes-phosphor/pldm/files/0004-requester-support-multi-host-MCTP-devices-hot-plug.patch +++ b/common/recipes-phosphor/pldm/files/0004-requester-support-multi-host-MCTP-devices-hot-plug.patch @@ -1,7 +1,7 @@ -From c5207003ee88a75f203cf4c27ced4388e474f4a5 Mon Sep 17 00:00:00 2001 +From 49c94a99a028feabc38bf7e57814ee7313451381 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Mon, 18 Dec 2023 18:40:23 +0800 -Subject: [PATCH 04/10] requester: support multi-host MCTP devices hot plug +Subject: [PATCH 04/12] requester: support multi-host MCTP devices hot plug Currently, pldmd listens for new MCTP endpoint exposed by mctpd, but they only shows their EID, Network Id, and SupportedMessageTypes, which @@ -118,7 +118,7 @@ index c656762..af5aa23 100644 dependencies: deps, install: true, diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp -index a309ca6..1ed2043 100644 +index ef9b322..d626e32 100644 --- a/pldmd/pldmd.cpp +++ b/pldmd/pldmd.cpp @@ -7,6 +7,7 @@ @@ -137,9 +137,9 @@ index a309ca6..1ed2043 100644 + std::make_unique(&dbusHandler); + std::unique_ptr platformConfigHandler{}; - platformConfigHandler = std::make_unique(); - -@@ -322,7 +326,9 @@ int main(int argc, char** argv) + platformConfigHandler = + std::make_unique(PDR_JSONS_DIR); +@@ -323,7 +327,9 @@ int main(int argc, char** argv) std::unique_ptr mctpDiscoveryHandler = std::make_unique( bus, std::initializer_list{ @@ -615,5 +615,5 @@ index a08a990..3384793 100644 phosphor_logging_dep, sdbusplus, -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0005-Support-OEM-META-write-file-request-for-post-code-hi.patch b/common/recipes-phosphor/pldm/files/0005-Support-OEM-META-write-file-request-for-post-code-hi.patch index 8e01e8b0e022..90ae595b3e11 100644 --- a/common/recipes-phosphor/pldm/files/0005-Support-OEM-META-write-file-request-for-post-code-hi.patch +++ b/common/recipes-phosphor/pldm/files/0005-Support-OEM-META-write-file-request-for-post-code-hi.patch @@ -1,7 +1,7 @@ -From c6062235ffd0eae8125b9542425cd7bff195c27f Mon Sep 17 00:00:00 2001 +From 570a593268f69130d26bd91920be1423a43731f3 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Mon, 23 Oct 2023 17:06:54 +0800 -Subject: [PATCH 05/10] Support OEM-META write file request for post code +Subject: [PATCH 05/12] Support OEM-META write file request for post code history Support write file req when multiple hosts send postcode to BMC @@ -100,18 +100,18 @@ index b528095..8c18670 100644 /** @brief Get Subtree path response from the mapper * diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build -index 63cbaa7..5d27166 100644 +index 15166e2..85269f9 100644 --- a/libpldmresponder/meson.build +++ b/libpldmresponder/meson.build -@@ -31,6 +31,7 @@ sources = [ - '../host-bmc/dbus/custom_dbus.cpp', - '../host-bmc/dbus/cpu_core.cpp', +@@ -34,6 +34,7 @@ sources = [ '../host-bmc/utils.cpp', + '../host-bmc/dbus/pcie_device.cpp', + '../host-bmc/dbus/pcie_slot.cpp', + '../requester/configuration_discovery_handler.cpp', 'event_parser.cpp' ] -@@ -59,6 +60,16 @@ if get_option('oem-ibm').allowed() +@@ -62,6 +63,16 @@ if get_option('oem-ibm').allowed() ] endif @@ -517,7 +517,7 @@ index 0000000..780f0ef + +} // namespace pldm::responder::oem_meta diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp -index 1ed2043..aed5019 100644 +index d626e32..2e60b76 100644 --- a/pldmd/pldmd.cpp +++ b/pldmd/pldmd.cpp @@ -65,6 +65,10 @@ PHOSPHOR_LOG2_USING; @@ -531,7 +531,7 @@ index 1ed2043..aed5019 100644 constexpr uint8_t MCTP_MSG_TYPE_PLDM = 1; using namespace pldm; -@@ -257,6 +261,12 @@ int main(int argc, char** argv) +@@ -258,6 +262,12 @@ int main(int argc, char** argv) pldmTransport.getEventSource(), hostEID, instanceIdDb, &reqHandler); } @@ -545,5 +545,5 @@ index 1ed2043..aed5019 100644 FRU_JSONS_DIR, FRU_MASTER_JSON, pdrRepo.get(), entityTree.get(), bmcEntityTree.get()); -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0006-platform-mc-Add-OEM-Meta-event-handler.patch b/common/recipes-phosphor/pldm/files/0006-platform-mc-Add-OEM-Meta-event-handler.patch index 0b61a1dd6cd9..3367304fa078 100644 --- a/common/recipes-phosphor/pldm/files/0006-platform-mc-Add-OEM-Meta-event-handler.patch +++ b/common/recipes-phosphor/pldm/files/0006-platform-mc-Add-OEM-Meta-event-handler.patch @@ -1,7 +1,7 @@ -From 1fe3ec85602089bb6e08d7a49551ebad679b4bfc Mon Sep 17 00:00:00 2001 +From 22111219cce2f96963e70a11ccedb5a6b56836c0 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Wed, 7 Feb 2024 13:52:07 +0800 -Subject: [PATCH 06/10] platform-mc: Add OEM Meta event handler +Subject: [PATCH 06/12] platform-mc: Add OEM Meta event handler Add OEM Meta handler with event type 0xFB. It will print the logs with prefix "BIOS_IPMI_SEL", so the user can utilize it to filter @@ -1026,10 +1026,10 @@ index 378628e..47c45df 100644 tests = [ diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp -index aed5019..2c2eed4 100644 +index 2e60b76..0e33758 100644 --- a/pldmd/pldmd.cpp +++ b/pldmd/pldmd.cpp -@@ -276,7 +276,8 @@ int main(int argc, char** argv) +@@ -277,7 +277,8 @@ int main(int argc, char** argv) // Platform handler. std::unique_ptr platformManager = @@ -1039,7 +1039,7 @@ index aed5019..2c2eed4 100644 pldm::responder::platform::EventMap addOnEventHandlers{ {PLDM_OEM_EVENT_CLASS_0xFA, -@@ -299,6 +300,13 @@ int main(int argc, char** argv) +@@ -300,6 +301,13 @@ int main(int argc, char** argv) size_t eventDataOffset) { return platformManager->handleSensorEvent( request, payloadLength, formatVersion, tid, eventDataOffset); @@ -1054,5 +1054,5 @@ index aed5019..2c2eed4 100644 auto platformHandler = std::make_unique( -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0007-Support-OEM-META-command-for-host-BIOS-version.patch b/common/recipes-phosphor/pldm/files/0007-Support-OEM-META-command-for-host-BIOS-version.patch index 12a0175846b9..f1e8426b3fb8 100644 --- a/common/recipes-phosphor/pldm/files/0007-Support-OEM-META-command-for-host-BIOS-version.patch +++ b/common/recipes-phosphor/pldm/files/0007-Support-OEM-META-command-for-host-BIOS-version.patch @@ -1,7 +1,7 @@ -From 12be6ee0d9bcf83905347856e6945478bcecd673 Mon Sep 17 00:00:00 2001 +From 745e51fdaa5a624216fa98adca195dd39174347d Mon Sep 17 00:00:00 2001 From: Chris Wang Date: Wed, 10 Apr 2024 21:04:02 +0800 -Subject: [PATCH 07/10] Support OEM-META command for host BIOS version +Subject: [PATCH 07/12] Support OEM-META command for host BIOS version Summary: - Add handler for write-file command "BIOS_VERSION", which is sent @@ -23,10 +23,10 @@ Signed-off-by: Delphine CC Chiu create mode 100644 oem/meta/libpldmresponder/oem_meta_file_io_type_bios_version.hpp diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build -index 5d27166..4e537fa 100644 +index 85269f9..8a14d3e 100644 --- a/libpldmresponder/meson.build +++ b/libpldmresponder/meson.build -@@ -67,6 +67,7 @@ if get_option('oem-meta').allowed() +@@ -70,6 +70,7 @@ if get_option('oem-meta').allowed() sources += [ '../oem/meta/libpldmresponder/oem_meta_file_io.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_post_code.cpp', @@ -350,10 +350,10 @@ index 0000000..4baa9a4 + +} // namespace pldm::responder::oem_meta diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp -index 2c2eed4..0025b28 100644 +index 0e33758..089c96a 100644 --- a/pldmd/pldmd.cpp +++ b/pldmd/pldmd.cpp -@@ -264,7 +264,7 @@ int main(int argc, char** argv) +@@ -265,7 +265,7 @@ int main(int argc, char** argv) #ifdef OEM_META invoker.registerHandler( PLDM_OEM, std::make_unique( @@ -363,5 +363,5 @@ index 2c2eed4..0025b28 100644 auto fruHandler = std::make_unique( -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0008-platform-mc-Monitor-all-sensors-once-upon-the-first-.patch b/common/recipes-phosphor/pldm/files/0008-platform-mc-Monitor-all-sensors-once-upon-the-first-.patch index a601ce4a1875..a03f5135e820 100644 --- a/common/recipes-phosphor/pldm/files/0008-platform-mc-Monitor-all-sensors-once-upon-the-first-.patch +++ b/common/recipes-phosphor/pldm/files/0008-platform-mc-Monitor-all-sensors-once-upon-the-first-.patch @@ -1,7 +1,7 @@ -From be9b9fe0abc301e6c5d836a2413aa0b0c300a1a9 Mon Sep 17 00:00:00 2001 +From 1bc859e359068e82a61af0d21cae2be69030d542 Mon Sep 17 00:00:00 2001 From: DelphineCCChiu Date: Tue, 23 Apr 2024 13:57:49 +0800 -Subject: [PATCH 08/10] platform-mc: Monitor all sensors once upon the first +Subject: [PATCH 08/12] platform-mc: Monitor all sensors once upon the first power-on BMC reads all sensors once upon reboot, then update sensor values @@ -27,5 +27,5 @@ index c1acf66..c8c00ba 100644 rc = co_await getSensorReading(sensor); -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0009-pldm-Revise-image-path-for-update.patch b/common/recipes-phosphor/pldm/files/0009-pldm-Revise-image-path-for-update.patch index ea1ec2903a2b..b453e3fb110b 100644 --- a/common/recipes-phosphor/pldm/files/0009-pldm-Revise-image-path-for-update.patch +++ b/common/recipes-phosphor/pldm/files/0009-pldm-Revise-image-path-for-update.patch @@ -1,7 +1,7 @@ -From 14dc3495e470a5b4e8e2bd75612558804f66a90a Mon Sep 17 00:00:00 2001 +From 87edb55c919e3a38ce164cb8c50ca0c3d6410013 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Tue, 25 Jun 2024 14:51:37 +0800 -Subject: [PATCH 09/10] pldm: Revise image path for update +Subject: [PATCH 09/12] pldm: Revise image path for update Revise image path from /tmp/images to /tmp/pldm_images to prevent image been removed by SoftwareManager due to both service are watching the @@ -46,5 +46,5 @@ index 208d818..8c3ff6c 100644 if (rc < 0) { -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0010-Support-OEM-META-command-for-Event-Logs-from-BIC.patch b/common/recipes-phosphor/pldm/files/0010-Support-OEM-META-command-for-Event-Logs-from-BIC.patch index 2b69a6b1dd84..2a5e86f8f2c7 100644 --- a/common/recipes-phosphor/pldm/files/0010-Support-OEM-META-command-for-Event-Logs-from-BIC.patch +++ b/common/recipes-phosphor/pldm/files/0010-Support-OEM-META-command-for-Event-Logs-from-BIC.patch @@ -1,7 +1,7 @@ -From 4a71279e8da9da56a80cf7082e8c857e4460d397 Mon Sep 17 00:00:00 2001 +From ebd7daf8db4b43022857e2402e26b82e8b330c8d Mon Sep 17 00:00:00 2001 From: Bright Cheng Date: Wed, 26 Jun 2024 14:25:18 +0800 -Subject: [PATCH] Support OEM-META command for Event Logs from BIC +Subject: [PATCH 10/12] Support OEM-META command for Event Logs from BIC Summary: - Add handler for write-file command "EVENT_LOG", which is sent @@ -18,10 +18,10 @@ add SEL in BMC. create mode 100644 oem/meta/libpldmresponder/oem_meta_file_io_type_event_log.hpp diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build -index 4e537fa..8cc3f8f 100644 +index 8a14d3e..8d9987e 100644 --- a/libpldmresponder/meson.build +++ b/libpldmresponder/meson.build -@@ -68,6 +68,7 @@ if get_option('oem-meta').allowed() +@@ -71,6 +71,7 @@ if get_option('oem-meta').allowed() '../oem/meta/libpldmresponder/oem_meta_file_io.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_post_code.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_bios_version.cpp', @@ -273,5 +273,5 @@ index 0000000..6b75ca7 + +} // namespace pldm::responder::oem_meta -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0012-Support-OEM-META-command-for-power-control.patch b/common/recipes-phosphor/pldm/files/0011-Support-OEM-META-command-for-power-control.patch similarity index 98% rename from common/recipes-phosphor/pldm/files/0012-Support-OEM-META-command-for-power-control.patch rename to common/recipes-phosphor/pldm/files/0011-Support-OEM-META-command-for-power-control.patch index 65e97bb9c7e2..78ad22cdce5a 100644 --- a/common/recipes-phosphor/pldm/files/0012-Support-OEM-META-command-for-power-control.patch +++ b/common/recipes-phosphor/pldm/files/0011-Support-OEM-META-command-for-power-control.patch @@ -1,7 +1,7 @@ -From ed011785939a255f55077817cda7b5ad5ca179d6 Mon Sep 17 00:00:00 2001 +From 3554629b233cd6f843afdc0b5bd27661c1922766 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Fri, 14 Jun 2024 16:24:31 +0800 -Subject: [PATCH] Support OEM-META command for power control +Subject: [PATCH 11/12] Support OEM-META command for power control Summary: - Add handler for write-file command "SLED_CYCLE, 12V-CYCLE @@ -24,10 +24,10 @@ Signed-off-by: Delphine CC Chiu create mode 100644 oem/meta/libpldmresponder/oem_meta_file_io_type_power_control.hpp diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build -index 8cc3f8f..ee51e8e 100644 +index 8d9987e..917845a 100644 --- a/libpldmresponder/meson.build +++ b/libpldmresponder/meson.build -@@ -69,6 +69,7 @@ if get_option('oem-meta').allowed() +@@ -72,6 +72,7 @@ if get_option('oem-meta').allowed() '../oem/meta/libpldmresponder/oem_meta_file_io_type_post_code.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_bios_version.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_event_log.cpp', @@ -324,5 +324,5 @@ index 0000000..16ed6ce + +} // namespace pldm::responder::oem_meta -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/files/0011-platform-mc-add-more-exception-type.patch b/common/recipes-phosphor/pldm/files/0011-platform-mc-add-more-exception-type.patch deleted file mode 100644 index 0b081d33faa4..000000000000 --- a/common/recipes-phosphor/pldm/files/0011-platform-mc-add-more-exception-type.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 937c613b1d16c4a1bd50c9c09d9e36d2e9c519b3 Mon Sep 17 00:00:00 2001 -From: Jerry C Chen -Date: Tue, 9 Jul 2024 16:02:23 +0800 -Subject: [PATCH] platform-mc: add more exception type - -Fix PLDMD crash if endpoint device doesn't response. - -Change-Id: I13c0292bdb681567593fbc4a62685e6393f88a82 -Signed-off-by: Jerry C Chen ---- - platform-mc/terminus_manager.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/platform-mc/terminus_manager.cpp b/platform-mc/terminus_manager.cpp -index 54d749d..7452f31 100644 ---- a/platform-mc/terminus_manager.cpp -+++ b/platform-mc/terminus_manager.cpp -@@ -376,6 +376,13 @@ exec::task - "ERROR", e); - co_return PLDM_ERROR; - } -+ catch (int rc) -+ { -+ lg2::error( -+ "sendRecvPldmMsgOverMctp failed. rc={RC}", -+ "RC", rc); -+ co_return PLDM_ERROR; -+ } - } - - exec::task TerminusManager::getTidOverMctp(mctp_eid_t eid, pldm_tid_t* tid) --- -2.25.1 - diff --git a/common/recipes-phosphor/pldm/files/0013-oem-meta-Add-APML-alert-handler.patch b/common/recipes-phosphor/pldm/files/0012-oem-meta-Add-APML-alert-handler.patch similarity index 96% rename from common/recipes-phosphor/pldm/files/0013-oem-meta-Add-APML-alert-handler.patch rename to common/recipes-phosphor/pldm/files/0012-oem-meta-Add-APML-alert-handler.patch index 69a8c5df965a..07b104f38b3d 100644 --- a/common/recipes-phosphor/pldm/files/0013-oem-meta-Add-APML-alert-handler.patch +++ b/common/recipes-phosphor/pldm/files/0012-oem-meta-Add-APML-alert-handler.patch @@ -1,7 +1,7 @@ -From 576537f1da2ba3d8ae70947c71b7fafd8a5b9c4f Mon Sep 17 00:00:00 2001 +From 8f13563ee8a526ce20598ee050be10c0d0b53c5e Mon Sep 17 00:00:00 2001 From: PeterHo-wiwynn Date: Fri, 28 Jun 2024 11:19:43 +0800 -Subject: [PATCH] oem-meta: Add APML alert handler +Subject: [PATCH 12/12] oem-meta: Add APML alert handler Add APML alert handler. It will call `amd-ras` to do ADDC. --- @@ -15,10 +15,10 @@ Add APML alert handler. It will call `amd-ras` to do ADDC. create mode 100644 oem/meta/libpldmresponder/oem_meta_file_io_type_apml_alert.hpp diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build -index ee51e8e..0fc1d0e 100644 +index 917845a..91d8075 100644 --- a/libpldmresponder/meson.build +++ b/libpldmresponder/meson.build -@@ -70,6 +70,7 @@ if get_option('oem-meta').allowed() +@@ -73,6 +73,7 @@ if get_option('oem-meta').allowed() '../oem/meta/libpldmresponder/oem_meta_file_io_type_bios_version.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_event_log.cpp', '../oem/meta/libpldmresponder/oem_meta_file_io_type_power_control.cpp', @@ -191,5 +191,5 @@ index 0000000..c3e246f + +} // namespace pldm::responder::oem_meta -- -2.25.1 +2.43.0 diff --git a/common/recipes-phosphor/pldm/pldm_%.bbappend b/common/recipes-phosphor/pldm/pldm_%.bbappend index baa32949d176..9040df62acfc 100644 --- a/common/recipes-phosphor/pldm/pldm_%.bbappend +++ b/common/recipes-phosphor/pldm/pldm_%.bbappend @@ -4,19 +4,18 @@ EXTRA_OEMESON:append:openbmc-fb-lf = " -Doem-meta=enabled" SRC_URI:append:openbmc-fb-lf = " \ file://host_eid \ - file://0001-platform-mc-PDR-handling.patch \ - file://0002-platform-mc-Sensor-handling.patch \ - file://0003-platform-mc-Added-EventManager.patch \ - file://0004-requester-support-multi-host-MCTP-devices-hot-plug.patch \ - file://0005-Support-OEM-META-write-file-request-for-post-code-hi.patch \ - file://0006-platform-mc-Add-OEM-Meta-event-handler.patch \ - file://0007-Support-OEM-META-command-for-host-BIOS-version.patch \ - file://0008-platform-mc-Monitor-all-sensors-once-upon-the-first-.patch \ - file://0009-pldm-Revise-image-path-for-update.patch \ - file://0010-Support-OEM-META-command-for-Event-Logs-from-BIC.patch \ - file://0011-platform-mc-add-more-exception-type.patch \ - file://0012-Support-OEM-META-command-for-power-control.patch \ - file://0013-oem-meta-Add-APML-alert-handler.patch \ + file://0001-platform-mc-PDR-handling.patch \ + file://0002-platform-mc-Sensor-handling.patch \ + file://0003-platform-mc-Added-EventManager.patch \ + file://0004-requester-support-multi-host-MCTP-devices-hot-plug.patch \ + file://0005-Support-OEM-META-write-file-request-for-post-code-hi.patch \ + file://0006-platform-mc-Add-OEM-Meta-event-handler.patch \ + file://0007-Support-OEM-META-command-for-host-BIOS-version.patch \ + file://0008-platform-mc-Monitor-all-sensors-once-upon-the-first-.patch \ + file://0009-pldm-Revise-image-path-for-update.patch \ + file://0010-Support-OEM-META-command-for-Event-Logs-from-BIC.patch \ + file://0011-Support-OEM-META-command-for-power-control.patch \ + file://0012-oem-meta-Add-APML-alert-handler.patch \ file://pldm-restart.sh \ file://pldm-slow-restart.service \ " diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch index 4535c86398a0..79b8a0e04b7e 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch @@ -1,4 +1,4 @@ -From 368f69220f9368474bab404c18b7b9582d6ab66b Mon Sep 17 00:00:00 2001 +From e4ba6263760e0fb72fdfb73022c0eb56a004dff8 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 12 Mar 2024 18:34:24 +0800 Subject: [PATCH 1/4] yosemite4: Support CX7 NIC card temperature sensor diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-Revise-the-BRCM-NIC-sensor-name.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-Revise-the-BRCM-NIC-sensor-name.patch index e40207bca025..c0e4cd7cf4fb 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-Revise-the-BRCM-NIC-sensor-name.patch +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-Revise-the-BRCM-NIC-sensor-name.patch @@ -1,4 +1,4 @@ -From ff28f8c91b8f77f5097c39ff5211c55ead8ea29e Mon Sep 17 00:00:00 2001 +From 66db8da2f2e0fea62ae2521a45ce669c1c10cea8 Mon Sep 17 00:00:00 2001 From: RickyWu-wiwynn Date: Wed, 8 May 2024 14:29:36 +0800 Subject: [PATCH 2/4] configurations: Revise the BRCM NIC sensor name diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0003-Add-mctp-eids-configuration-for-Yosemite-4.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0003-Add-mctp-eids-configuration-for-Yosemite-4.patch index 06bc301564ed..50fa18e15692 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0003-Add-mctp-eids-configuration-for-Yosemite-4.patch +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0003-Add-mctp-eids-configuration-for-Yosemite-4.patch @@ -1,4 +1,4 @@ -From 58e4fca3b1e42e1cc90fced02350535f8ef7c51a Mon Sep 17 00:00:00 2001 +From 47c37ae8b9c01e8c3e47e35b34c857461f5ea6c2 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Mon, 25 Sep 2023 11:10:46 +0800 Subject: [PATCH 3/4] Add mctp eids configuration for Yosemite 4 @@ -15,11 +15,12 @@ Tested: check D-Bus path for configuration. Change-Id: I587f5a69051f783753f5855d2f51242aa1cd5bc4 Signed-off-by: Delphine CC Chiu --- - configurations/yosemite4_floatingfalls.json | 17 ++++++++++++++++- - configurations/yosemite4_sentineldome.json | 7 +++++++ - configurations/yosemite4_wailuafalls.json | 21 +++++++++++++++++++++ - schemas/legacy.json | 6 ++++++ - 4 files changed, 50 insertions(+), 1 deletion(-) + configurations/yosemite4_floatingfalls.json | 17 ++++++++++++++- + configurations/yosemite4_sentineldome_t1.json | 7 +++++++ + configurations/yosemite4_sentineldome_t2.json | 7 +++++++ + configurations/yosemite4_wailuafalls.json | 21 +++++++++++++++++++ + schemas/legacy.json | 6 ++++++ + 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/configurations/yosemite4_floatingfalls.json b/configurations/yosemite4_floatingfalls.json index e1f9a51..c709e5b 100644 @@ -47,11 +48,11 @@ index e1f9a51..c709e5b 100644 "Name": "Yosemite 4 Floating Falls Slot $bus % 15", "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Floating Falls', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})", "Type": "Board", -diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome.json -index 9d368ee..725c777 100644 ---- a/configurations/yosemite4_sentineldome.json -+++ b/configurations/yosemite4_sentineldome.json -@@ -412,6 +412,13 @@ +diff --git a/configurations/yosemite4_sentineldome_t1.json b/configurations/yosemite4_sentineldome_t1.json +index 38ba778..5044b12 100644 +--- a/configurations/yosemite4_sentineldome_t1.json ++++ b/configurations/yosemite4_sentineldome_t1.json +@@ -328,6 +328,13 @@ "Zones": [ "Zone 1" ] @@ -64,7 +65,25 @@ index 9d368ee..725c777 100644 + "Type": "MCTPEndpoint" } ], - "Name": "Yosemite 4 Sentinel Dome Slot $bus % 15", + "Name": "Yosemite 4 Sentinel Dome T1 Slot $bus % 15", +diff --git a/configurations/yosemite4_sentineldome_t2.json b/configurations/yosemite4_sentineldome_t2.json +index 01dba52..69c6f86 100644 +--- a/configurations/yosemite4_sentineldome_t2.json ++++ b/configurations/yosemite4_sentineldome_t2.json +@@ -422,6 +422,13 @@ + "Zones": [ + "Zone 1" + ] ++ }, ++ { ++ "Address": "0x20", ++ "Bus": "$bus % 16", ++ "EndpointId": "$bus % 15 * 10", ++ "Name": "BIC", ++ "Type": "MCTPEndpoint" + } + ], + "Name": "Yosemite 4 Sentinel Dome T2 Slot $bus % 15", diff --git a/configurations/yosemite4_wailuafalls.json b/configurations/yosemite4_wailuafalls.json index b85b023..4e706ef 100644 --- a/configurations/yosemite4_wailuafalls.json diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0004-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0004-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch index 1826366b9674..d306a8c3c366 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0004-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0004-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch @@ -1,4 +1,4 @@ -From eb0865a4dea64ff1436430a883655464f913d333 Mon Sep 17 00:00:00 2001 +From 0a69cc3630b75d6403b97bd97153cadde8723e79 Mon Sep 17 00:00:00 2001 From: Delphine CC Chiu Date: Thu, 7 Mar 2024 10:41:16 +0800 Subject: [PATCH 4/4] configurations: yosemite4: Add IANA for sentinel dome @@ -14,15 +14,28 @@ https://gerrit.openbmc.org/c/openbmc/pldm/+/69246 Change-Id: Ifcd410f6548c5f28d399c2ef64a2aadd57554e41 Signed-off-by: Delphine CC Chiu --- - configurations/yosemite4_sentineldome.json | 1 + - schemas/legacy.json | 6 ++++++ - 2 files changed, 7 insertions(+) + configurations/yosemite4_sentineldome_t1.json | 1 + + configurations/yosemite4_sentineldome_t2.json | 1 + + schemas/legacy.json | 6 ++++++ + 3 files changed, 8 insertions(+) -diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome.json -index 725c777..c1e2a5b 100644 ---- a/configurations/yosemite4_sentineldome.json -+++ b/configurations/yosemite4_sentineldome.json -@@ -417,6 +417,7 @@ +diff --git a/configurations/yosemite4_sentineldome_t1.json b/configurations/yosemite4_sentineldome_t1.json +index 5044b12..2011798 100644 +--- a/configurations/yosemite4_sentineldome_t1.json ++++ b/configurations/yosemite4_sentineldome_t1.json +@@ -333,6 +333,7 @@ + "Address": "0x20", + "Bus": "$bus % 16", + "EndpointId": "$bus % 15 * 10", ++ "IANA": "0015A000", + "Name": "BIC", + "Type": "MCTPEndpoint" + } +diff --git a/configurations/yosemite4_sentineldome_t2.json b/configurations/yosemite4_sentineldome_t2.json +index 69c6f86..b5635ea 100644 +--- a/configurations/yosemite4_sentineldome_t2.json ++++ b/configurations/yosemite4_sentineldome_t2.json +@@ -427,6 +427,7 @@ "Address": "0x20", "Bus": "$bus % 16", "EndpointId": "$bus % 15 * 10", diff --git a/yocto_repos.sh b/yocto_repos.sh index 1a5baa47a4a8..45df207f9de0 100644 --- a/yocto_repos.sh +++ b/yocto_repos.sh @@ -12,7 +12,7 @@ rocko_repos=( ) rocko_poky_patch="0001-rocko-backport-support-for-override.patch 0002-Remove-checks-on-python.patch 0003-Add-support-to-build-on-centOS9.patch" lf_master_repos=( - lf-openbmc:4d24a0857 + lf-openbmc:e2c94c481 ) lf_dunfell_repos=( lf-openbmc:c2858f16b