entity-manager: Don't block bus in case of ERROR
Seeing cases where error in fru scanning in power_down
will result in putting the bus in blocklist which will prevent
the fru-device from further scanning the bus.
Tested: Manually
fusion2: Added
Patch Tracking Bug: b/376710055
Google-Bug-Id: 376366153
Change-Id: I39aa7412a5df6d918ea6802efb12ba344eeca00a
Signed-off-by: Muhammad Usama <muhammadusama@google.com>
(cherry picked from commit 45c6658aa9f0d90a140a75b21986671dd18435a7)
diff --git a/recipes-phosphor/configuration/entity-manager/0003-fru-device-Don-t-blocklist-bus-in-event-of-Error.patch b/recipes-phosphor/configuration/entity-manager/0003-fru-device-Don-t-blocklist-bus-in-event-of-Error.patch
new file mode 100644
index 0000000..3b8a578
--- /dev/null
+++ b/recipes-phosphor/configuration/entity-manager/0003-fru-device-Don-t-blocklist-bus-in-event-of-Error.patch
@@ -0,0 +1,34 @@
+From c428a8bc5b54724124cd321e9574cec40a16537e Mon Sep 17 00:00:00 2001
+From: Muhammad Usama <muhammadusama@google.com>
+Date: Wed, 30 Oct 2024 23:32:01 +0000
+Subject: [PATCH] fru-device: Don't blocklist bus in event of Error
+
+Patch Tracking Bug: b/376710055
+Upstream info / review: N/A
+Upstream-Status: Pending
+Justification: Improve FRU scanning
+
+Google-Bug-Id: 376366153
+Signed-off-by: Muhammad Usama <muhammadusama@google.com>
+---
+ src/fru_device.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/fru_device.cpp b/src/fru_device.cpp
+index c1868f4..0fd383b 100644
+--- a/src/fru_device.cpp
++++ b/src/fru_device.cpp
+@@ -575,10 +575,6 @@ int getBusFRUs(int file, int first, int last, int bus,
+ if (status == std::future_status::timeout)
+ {
+ std::cerr << "Error reading bus " << bus << "\n";
+- if (powerIsOn)
+- {
+- busBlocklist[bus] = std::nullopt;
+- }
+ close(file);
+ return -1;
+ }
+--
+2.47.0.163.g1226f6d8fa-goog
+
diff --git a/recipes-phosphor/configuration/entity-manager_%.bbappend b/recipes-phosphor/configuration/entity-manager_%.bbappend
index a130eab..ff2be3a 100644
--- a/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -9,6 +9,7 @@
file://0001-Add-association-interface-handling-to-board.patch \
file://0001-fru-device-Increase-Fru-scan-timeout-to-30-seconds.patch \
file://0007-topology-Add-powered_by-topology.patch \
+ file://0003-fru-device-Don-t-blocklist-bus-in-event-of-Error.patch \
"
USB_DEVICE_OPTION:gbmc := "-Dusb-device=true, -Dusb-device=false, stdplus"
