Skip to content

Commit

Permalink
yocto: update master
Browse files Browse the repository at this point in the history
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
  • Loading branch information
amithash authored and facebook-github-bot committed Jul 17, 2024
1 parent 595a095 commit 9fca98e
Show file tree
Hide file tree
Showing 19 changed files with 135 additions and 138 deletions.
Original file line number Diff line number Diff line change
@@ -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 <gilbert.chen@arm.com>
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
Expand Down Expand Up @@ -1063,5 +1063,5 @@ index 32fd7b7..2f88829 100644
+ EXPECT_EQ("TEMP1", names[0][0].second);
+}
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <gilbert.chen@arm.com>
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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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

Original file line number Diff line number Diff line change
@@ -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 <gilbertc@nvidia.com>
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)
Expand Down Expand Up @@ -42,10 +42,10 @@ Signed-off-by: Gilbert Chen <gilbertc@nvidia.com>
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);
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -2208,7 +2208,7 @@ index 768c6c9..a309ca6 100644
auto platformHandler = std::make_unique<platform::Handler>(
&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<fw_update::Manager> fwManager =
std::make_unique<fw_update::Manager>(event, reqHandler, instanceIdDb);
Expand All @@ -2218,5 +2218,5 @@ index 768c6c9..a309ca6 100644
std::make_unique<MctpDiscovery>(
bus, std::initializer_list<MctpDiscoveryHandlerIntf*>{
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <Delphine_CC_Chiu@wiwynn.com>
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
Expand Down Expand Up @@ -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 @@
Expand All @@ -137,9 +137,9 @@ index a309ca6..1ed2043 100644
+ std::make_unique<pldm::ConfigurationDiscoveryHandler>(&dbusHandler);
+
std::unique_ptr<platform_config::Handler> platformConfigHandler{};
platformConfigHandler = std::make_unique<platform_config::Handler>();

@@ -322,7 +326,9 @@ int main(int argc, char** argv)
platformConfigHandler =
std::make_unique<platform_config::Handler>(PDR_JSONS_DIR);
@@ -323,7 +327,9 @@ int main(int argc, char** argv)
std::unique_ptr<MctpDiscovery> mctpDiscoveryHandler =
std::make_unique<MctpDiscovery>(
bus, std::initializer_list<MctpDiscoveryHandlerIntf*>{
Expand Down Expand Up @@ -615,5 +615,5 @@ index a08a990..3384793 100644
phosphor_logging_dep,
sdbusplus,
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <Delphine_CC_Chiu@wiwynn.com>
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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand All @@ -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);
}

Expand All @@ -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

Original file line number Diff line number Diff line change
@@ -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 <Delphine_CC_Chiu@wiwynn.com>
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
Expand Down Expand Up @@ -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<platform_mc::Manager> platformManager =
Expand All @@ -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);
Expand All @@ -1054,5 +1054,5 @@ index aed5019..2c2eed4 100644

auto platformHandler = std::make_unique<platform::Handler>(
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <Chris_Wang@wiwynn.com>
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
Expand All @@ -23,10 +23,10 @@ Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
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',
Expand Down Expand Up @@ -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<pldm::responder::oem_meta::FileIOHandler>(
Expand All @@ -363,5 +363,5 @@ index 2c2eed4..0025b28 100644

auto fruHandler = std::make_unique<fru::Handler>(
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From be9b9fe0abc301e6c5d836a2413aa0b0c300a1a9 Mon Sep 17 00:00:00 2001
From 1bc859e359068e82a61af0d21cae2be69030d542 Mon Sep 17 00:00:00 2001
From: DelphineCCChiu <delphine_cc_chiu@wiwynn.com>
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
Expand All @@ -27,5 +27,5 @@ index c1acf66..c8c00ba 100644
rc = co_await getSensorReading(sensor);

--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <delphine_cc_chiu@wiwynn.com>
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
Expand Down Expand Up @@ -46,5 +46,5 @@ index 208d818..8c3ff6c 100644
if (rc < 0)
{
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <bright_cheng@wiwynn.com>
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
Expand All @@ -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',
Expand Down Expand Up @@ -273,5 +273,5 @@ index 0000000..6b75ca7
+
+} // namespace pldm::responder::oem_meta
--
2.25.1
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <Delphine_CC_Chiu@wiwynn.com>
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
Expand All @@ -24,10 +24,10 @@ Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
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',
Expand Down Expand Up @@ -324,5 +324,5 @@ index 0000000..16ed6ce
+
+} // namespace pldm::responder::oem_meta
--
2.25.1
2.43.0

Loading

0 comments on commit 9fca98e

Please sign in to comment.