smbios-mdr:Add support to toggle pcieslot presence
In the current state, the PCIeslot presence is always hardcoded to
`true`, since the PCIeSlots are always embedded on the board. But the
slot presence is not really useful. Since we are already getting the
current usage of the slot in the SMBIOS Type 9 structure we could use
the "Available"/"Occupied" status in the current usage field to
indicate the drive presence.
Modify the slot presence code to only mark "true" if the current usage
of the slot is "Occupied" & make it "false" if it is anything other
than that.
Tested By:
1. Enabled the meson option via the meta-ibm layer by adding
PACKAGECONFIG:append = "slot-drive-presence"
2. Post the SMBIOS transfer, could see the presence of the slot being
toggled with respect to the current occupancy of the slot.
Change-Id: I57e6f48dc501e7e1625a5389ea1e989c5e585824
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
diff --git a/include/pcieslot.hpp b/include/pcieslot.hpp
index b578cbb..857ac24 100644
--- a/include/pcieslot.hpp
+++ b/include/pcieslot.hpp
@@ -139,6 +139,15 @@
const std::map<uint8_t, size_t> pcieLanesTable = {
{0x08, 1}, {0x09, 2}, {0xa, 4}, {0xb, 8}, {0xc, 12}, {0xd, 16}, {0xe, 32}};
+enum class Availability : uint8_t
+{
+ Other = 0x01,
+ Unknown = 0x02,
+ Available = 0x03,
+ InUse = 0x04,
+ Unavailable = 0x05
+};
+
}; // namespace smbios
}; // namespace phosphor
diff --git a/meson.options b/meson.options
index 935670d..b7f5265 100644
--- a/meson.options
+++ b/meson.options
@@ -29,6 +29,13 @@
)
option(
+ 'slot-drive-presence',
+ type: 'feature',
+ value: 'disabled',
+ description: 'Sets drive presence on slot objects'
+)
+
+option(
'cpuinfo-peci',
type: 'feature',
value: 'enabled',
diff --git a/src/meson.build b/src/meson.build
index 18d858d..1c983bd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,6 +11,10 @@
cpp_args_smbios += ['-DDIMM_ONLY_LOCATOR']
endif
+if get_option('slot-drive-presence').allowed()
+ cpp_args_smbios += ['-DSLOT_DRIVE_PRESENCE']
+endif
+
executable(
'smbiosmdrv2app',
'mdrv2.cpp',
diff --git a/src/pcieslot.cpp b/src/pcieslot.cpp
index 63d7f91..832194b 100644
--- a/src/pcieslot.cpp
+++ b/src/pcieslot.cpp
@@ -50,8 +50,14 @@
pcieIsHotPluggable(pcieInfo->characteristics2);
pcieLocation(pcieInfo->slotDesignation, pcieInfo->length, dataIn);
+#ifdef SLOT_DRIVE_PRESENCE
+ /* Set PCIeSlot presence based on its current Usage */
+ Item::present(pcieInfo->currUsage ==
+ static_cast<uint8_t>(Availability::InUse));
+#else
/* Pcie slot is embedded on the board. Always be true */
Item::present(true);
+#endif
if (!motherboardPath.empty())
{