yosemite4: pldm: oem: Hardcode the slot number if mctp configuration empty

sora-su-wiwynn · meta-codesync[bot] · commit 90d182d92772 · 2025-12-05T06:48:42.000-08:00
Summary: # [Description] - Related to YV4T1M-2217 - BMC records an abnormal SEL containing the string "Host0" # [Root Cause] The BMC uses 0 as the default slot number when the mctp configuration is empty. # [Solution] Hardcode the slot number based on the TID if the mctp configuration is empty X-link: https://github.com/facebookexternal/openbmc.wiwynn/pull/3466 Reviewed By: ifel Differential Revision: D88476789 fbshipit-source-id: abef00b40844908fe7a521121ed8e6b67c987cbd
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0001-pldm-Revise-image-path-for-update.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0001-pldm-Revise-image-path-for-update.patch
@@ -1,4 +1,4 @@
-From c40368295ce06dfcb13272001f8d698abe7253a9 Mon Sep 17 00:00:00 2001
+From 942fc9847389fd16bc7905ac3e19c6122041c48f 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 01/15] pldm: Revise image path for update
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0002-platform-mc-Handle-get-PLDM-Commands-failure.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0002-platform-mc-Handle-get-PLDM-Commands-failure.patch
@@ -1,4 +1,4 @@
-From ae79e00176457f1f1f3aeec83f3aabce8337a8f0 Mon Sep 17 00:00:00 2001
+From f085668a1bdf1c86e6b68c42b14fd0fe3e87d1fc Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Fri, 1 Nov 2024 17:44:55 +0800
 Subject: [PATCH 02/15] platform-mc: Handle get PLDM Commands failure
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0003-requester-Validate-MCTP-EID-before-removal.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0003-requester-Validate-MCTP-EID-before-removal.patch
@@ -1,4 +1,4 @@
-From 6e675336f93a8dbcdfa4e37c44a21b1628fb1b81 Mon Sep 17 00:00:00 2001
+From bc92b036e98d67d2d741f98a5cecb8759dc8213c Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Tue, 26 Nov 2024 15:28:02 +0800
 Subject: [PATCH 03/15] requester: Validate MCTP EID before removal
@@ -16,7 +16,7 @@ Upstream-Status: Pending
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/requester/mctp_endpoint_discovery.cpp b/requester/mctp_endpoint_discovery.cpp
-index 41ad909..7d8309b 100644
+index 6f825f2..187fd86 100644
 --- a/requester/mctp_endpoint_discovery.cpp
 +++ b/requester/mctp_endpoint_discovery.cpp
 @@ -268,12 +268,25 @@ void MctpDiscovery::removeFromExistingMctpInfos(MctpInfos& mctpInfos,
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0004-platform-mc-Add-MCTP-recovery-option.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0004-platform-mc-Add-MCTP-recovery-option.patch
@@ -1,4 +1,4 @@
-From 2a76d8034839c87ebcb1bcf233172b1c2b290143 Mon Sep 17 00:00:00 2001
+From 6b9d8eb54a0cb9f3be4130e1d2cafc1b7ff7aa26 Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Thu, 6 Mar 2025 16:48:20 +0800
 Subject: [PATCH 04/15] platform-mc: Add MCTP recovery option
@@ -90,5 +90,5 @@ index 7ac16e1..0766129 100644
      co_return rc;
  }
 -- 
-2.47.3
+2.43.0
 
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0005-platform-mc-Add-option-for-discovering-FRU-data.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0005-platform-mc-Add-option-for-discovering-FRU-data.patch
@@ -1,4 +1,4 @@
-From d7549397d45bf59c5e1ed73ee055e3df85c48b68 Mon Sep 17 00:00:00 2001
+From 0fada69a78a3d6dacd5866958e980b55d22f4c1c Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Thu, 6 Mar 2025 17:40:53 +0800
 Subject: [PATCH 05/15] platform-mc: Add option for discovering FRU data
@@ -19,7 +19,7 @@ Upstream-Status: Pending
  5 files changed, 64 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index b23e1d8..4047bce 100644
+index b008bbd..2ed8486 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -142,6 +142,10 @@ conf_data.set(
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0006-pldm-Use-std-expected-for-instance-ID-allocation.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0006-pldm-Use-std-expected-for-instance-ID-allocation.patch
@@ -1,4 +1,4 @@
-From de7d5fc0964e12e33333780c6adf5c29402d4c40 Mon Sep 17 00:00:00 2001
+From 0e4b721921daed6a283c779c7acad4a6722f014a Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Tue, 15 Jul 2025 10:22:29 +0000
 Subject: [PATCH 06/15] pldm: Use std::expected for instance ID allocation
@@ -800,5 +800,5 @@ index e097988..9f8d02a 100644
          instanceID, effecterID, effecterCount, &stateField, request);
      if (rc != PLDM_SUCCESS)
 -- 
-2.47.3
+2.43.0
 
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0007-common-Add-blocking-instance-ID-allocation.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0007-common-Add-blocking-instance-ID-allocation.patch
@@ -1,4 +1,4 @@
-From a0b3d989748ec8c7bf9e192bb49355874032e00e Mon Sep 17 00:00:00 2001
+From a4fa6677185591d93f43f37a4ba622e0d546af9b Mon Sep 17 00:00:00 2001
 From: Amithash Prasad <amithash@meta.com>
 Date: Wed, 21 May 2025 16:23:33 -0700
 Subject: [PATCH 07/15] common: Add blocking instance ID allocation
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0008-requester-Always-re-initialize-MCTP-info.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0008-requester-Always-re-initialize-MCTP-info.patch
@@ -1,4 +1,4 @@
-From a501628670b9e59289a2ec68206485da28823a15 Mon Sep 17 00:00:00 2001
+From f750e7581674e26bfe3472e121fa881c5f15078f Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Thu, 2 Oct 2025 08:50:56 +0000
 Subject: [PATCH 08/15] requester: Always re-initialize MCTP info
@@ -173,5 +173,5 @@ index 3c37e44..96586a0 100644
  
    private:
 -- 
-2.47.3
+2.43.0
 
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0009-platform-mc-Add-retries-for-terminus-discovery.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0009-platform-mc-Add-retries-for-terminus-discovery.patch
@@ -1,4 +1,4 @@
-From c788bc4f0320e5279f22ae06c72cc705ad3417e0 Mon Sep 17 00:00:00 2001
+From 3fe2879c0e0a64a4ca347f49a555f9b9e20f1e3d Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Tue, 23 Sep 2025 09:47:45 +0000
 Subject: [PATCH 09/15] platform-mc: Add retries for terminus discovery
@@ -33,7 +33,7 @@ Signed-off-by: Eric Yang <eric.yang.wiwynn@gmail.com>
  4 files changed, 93 insertions(+), 6 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 4047bce..330a229 100644
+index 2ed8486..bcff4c5 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -146,6 +146,10 @@ conf_data.set(
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0010-platform-mc-Make-fallback-terminus-name-optional.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0010-platform-mc-Make-fallback-terminus-name-optional.patch
@@ -1,4 +1,4 @@
-From 40cd05dd69f9c6f770e1e278c0d25d76cdadf0a9 Mon Sep 17 00:00:00 2001
+From 03b197df7d3902e84ef41f70ecadc41c5c2e1a70 Mon Sep 17 00:00:00 2001
 From: Eric Yang <eric.yang.wiwynn@gmail.com>
 Date: Mon, 13 Oct 2025 11:10:37 +0000
 Subject: [PATCH 10/15] platform-mc: Make fallback terminus name optional
@@ -45,7 +45,7 @@ Signed-off-by: Eric Yang <eric.yang.wiwynn@gmail.com>
  3 files changed, 19 insertions(+)
 
 diff --git a/meson.build b/meson.build
-index 330a229..9bd57ad 100644
+index bcff4c5..3b6a7b9 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -150,6 +150,10 @@ conf_data.set(
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0011-oem-meta-Add-file-IO-responder-for-event-logs-from-B.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0011-oem-meta-Add-file-IO-responder-for-event-logs-from-B.patch
@@ -1,4 +1,4 @@
-From bc617ffcdb21897835cc7dc5f1e22188f97e335d Mon Sep 17 00:00:00 2001
+From 2b1a42208d8bc9a33a1ec1306d7f3f94000fa407 Mon Sep 17 00:00:00 2001
 From: Sora Su <baxiche@gmail.com>
 Date: Mon, 21 Jul 2025 14:06:38 +0800
 Subject: [PATCH 11/15] oem-meta: Add file IO responder for event logs from BIC
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0012-oem-meta-Add-file-IO-responder-for-crashdump-from-BI.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0012-oem-meta-Add-file-IO-responder-for-crashdump-from-BI.patch
@@ -1,4 +1,4 @@
-From 117f19c2cea31aedada2415a42f581378ac70b50 Mon Sep 17 00:00:00 2001
+From 69161e8884a9aa586f64c038423dc992bf8941ec Mon Sep 17 00:00:00 2001
 From: Sora Su <baxiche@gmail.com>
 Date: Mon, 21 Jul 2025 14:13:32 +0800
 Subject: [PATCH 12/15] oem-meta: Add file IO responder for crashdump from BIC
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0013-oem-meta-Add-APML-alert-handler.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0013-oem-meta-Add-APML-alert-handler.patch
@@ -1,4 +1,4 @@
-From a6988e773e30f3360f005ab357411b9e432fbb23 Mon Sep 17 00:00:00 2001
+From afd121cf55356811cf3cdabb87f4bbb22012f5d0 Mon Sep 17 00:00:00 2001
 From: Sora Su <baxiche@gmail.com>
 Date: Thu, 23 Oct 2025 14:18:22 +0800
 Subject: [PATCH 13/15] oem-meta: Add APML alert handler
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0014-oem-meta-Add-call-to-the-fw-versions-sd-retimer-serv.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0014-oem-meta-Add-call-to-the-fw-versions-sd-retimer-serv.patch
@@ -1,4 +1,4 @@
-From acc1a6433f72deeb093d8bba5317c40931c25b65 Mon Sep 17 00:00:00 2001
+From efef11b6d8736b97ed10522da95cc84114039883 Mon Sep 17 00:00:00 2001
 From: Sora Su <baxiche@gmail.com>
 Date: Thu, 23 Oct 2025 14:34:12 +0800
 Subject: [PATCH 14/15] oem-meta: Add call to the fw-versions-sd-retimer
diff --git a/common/lfopenbmc/recipes-phosphor/pldm/files/0015-oem-meta-Add-MCTP-configuration-discovery.patch b/common/lfopenbmc/recipes-phosphor/pldm/files/0015-oem-meta-Add-MCTP-configuration-discovery.patch
@@ -1,4 +1,4 @@
-From 2c3741fc09ebb1580e67a33011bdcad77eb34eed Mon Sep 17 00:00:00 2001
+From 5e5ecc533f1156f1f13cb8e688697a13e752bb43 Mon Sep 17 00:00:00 2001
 From: Sora Su <baxiche@gmail.com>
 Date: Wed, 17 Sep 2025 16:05:34 +0800
 Subject: [PATCH 15/15] oem-meta: Add MCTP configuration discovery
@@ -464,7 +464,7 @@ index 0000000..2b69307
 @@ -0,0 +1 @@
 +oem_files += files('configuration_discovery_handler.cpp')
 diff --git a/oem/meta/utils.cpp b/oem/meta/utils.cpp
-index 702cbd3..367e70d 100644
+index 702cbd3..6563a45 100644
 --- a/oem/meta/utils.cpp
 +++ b/oem/meta/utils.cpp
 @@ -2,12 +2,18 @@
@@ -567,7 +567,7 @@ index 702cbd3..367e70d 100644
 +        configurationDiscovery->getConfigurations().find(EID);
 +    if (configurationIter == configurationDiscovery->getConfigurations().end())
 +    {
-+        return std::string{"0"};
++        return tryHardcodeSlotNumberStringByTID();
 +    }
 +
 +    pldm::utils::GetAncestorsResponse response;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From c40368295ce06dfcb13272001f8d698abe7253a9 Mon Sep 17 00:00:00 2001`
	`1`	`+From 942fc9847389fd16bc7905ac3e19c6122041c48f Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Delphine CC Chiu <[email protected]>`
`3`	`3`	`Date: Tue, 25 Jun 2024 14:51:37 +0800`
`4`	`4`	`Subject: [PATCH 01/15] pldm: Revise image path for update`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From ae79e00176457f1f1f3aeec83f3aabce8337a8f0 Mon Sep 17 00:00:00 2001`
	`1`	`+From f085668a1bdf1c86e6b68c42b14fd0fe3e87d1fc Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Eric Yang <[email protected]>`
`3`	`3`	`Date: Fri, 1 Nov 2024 17:44:55 +0800`
`4`	`4`	`Subject: [PATCH 02/15] platform-mc: Handle get PLDM Commands failure`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From a0b3d989748ec8c7bf9e192bb49355874032e00e Mon Sep 17 00:00:00 2001`
	`1`	`+From a4fa6677185591d93f43f37a4ba622e0d546af9b Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Amithash Prasad <[email protected]>`
`3`	`3`	`Date: Wed, 21 May 2025 16:23:33 -0700`
`4`	`4`	`Subject: [PATCH 07/15] common: Add blocking instance ID allocation`