[edk2-devel] [PATCH v2 4/4] DynamicTablesPkg: Add Ordered dispatch support for SMBIOS tables

Sami Mujawar posted 4 patches 1 year, 2 months ago
[edk2-devel] [PATCH v2 4/4] DynamicTablesPkg: Add Ordered dispatch support for SMBIOS tables
Posted by Sami Mujawar 1 year, 2 months ago
Some SMBIOS tables do not have a fixed dependency and can depend on any
other SMBIOS tables. Therefore, the SMBIOS dispatcher cannot define a
fixed sequence for dispatching these tables. A possible solution is to
defer the dispatch of such SMBIOS tables towards the end, assuming that
the dependent SMBIOS tables would have been dispatched by then.

Therefore, introduce a dispatch order attribute such that SMBIOS tables
that have a fixed dependency sequence are configured as Default Ordered,
and the SMBIOS tables that do not have a fixed dependency have an Order
attribute specifying an Order Level. An Order Level is used to sequence
the dispatch of Ordered SMBIOS tables.

The Default Ordered SMBIOS tables are dispatched first and a dependency
walk is performed to dispatch the dependent tables by iterating through
the SMBIOS_TABLE_DISPATCHER.Dependency[].

Once all Default ordered SMBIOS tables have been dispatched, the Ordered
SMBIOS tables would be scheduled for dispatch in increasing order as of
the Order Level, e.g. OrderL1, OrderL2, ...
Note: The dispatcher does not perform a dependency walk for the Ordered
SMBIOS tables as the expectation is that the dependent SMBIOS tables
would be already dispatched.

A top level dispatch function DispatchSmbiosTables() has been introduced
to schedule the dispatch of Default Ordered and Ordered SMBIOS tables.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Cc: Alexei Fedorov <Alexei.Fedorov@arm.com>
Cc: Pierre Gondois <pierre.gondois@arm.com>
Cc: Girish Mahadevan <gmahadevan@nvidia.com>
Cc: Jeff Brasen <jbrasen@nvidia.com>
Cc: Ashish Singhal <ashishsingha@nvidia.com>
Cc: Nick Ramirez <nramirez@nvidia.com>
Cc: William Watson <wwatson@nvidia.com>
Cc: Abner Chang <abner.chang@amd.com>
Cc: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Cc: Jose Marinho <Jose.Marinho@arm.com>
---

Notes:
    v2:
     - New patch in v2 series.                                [SAMI]

 DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.c | 531 +++++++++++++++++---
 DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.h |  34 +-
 2 files changed, 487 insertions(+), 78 deletions(-)

diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.c b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.c
index 384a0a9adcd5f11fc73f42b90cfb1c9a6ba2fc73..6da711d7290a868997f7016ac8a04e759c2c4441 100644
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.c
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.c
@@ -27,56 +27,65 @@
     have been satisfied.
   - no cyclic dependency is allowed.
   The dependency list is terminated by SMTT_NULL.
+
+  The SMBIOS dispatcher dispatches the tables that have the default
+  order (OrderDef) set before the ordered SMBIOS tables are dispatched.
+  The SMBIOS_TABLE_DISPATCHER.Order field is used to establish the
+  dispatch order.
+
+  The order specified in the SMBIOS dispatcher table must be unique for all
+  orders other than OrderDef. The dependency walk is only done for tables
+  that have the default dispatch order.
 */
 STATIC
 SMBIOS_TABLE_DISPATCHER  mSmBiosDispatcher[MAX_SMBIOS_TABLES] = {
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BIOS_INFORMATION,                     SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_INFORMATION,                   SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BASEBOARD_INFORMATION,                SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_ENCLOSURE,                     SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PROCESSOR_INFORMATION,                SMBIOS_TYPE_CACHE_INFORMATION,              SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_CONTROLLER_INFORMATION,        SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_MODULE_INFORMATON,             SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_CACHE_INFORMATION,                    SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION,           SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_SLOTS,                         SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ONBOARD_DEVICE_INFORMATION,           SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_OEM_STRINGS,                          SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS,         SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION,            SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_GROUP_ASSOCIATIONS,                   SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_EVENT_LOG,                     SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,                SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION, SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION, SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_DEVICE,                        SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,          SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION, SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION, SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION,       SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS,          SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,          SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS,         SMBIOS_TYPE_MEMORY_DEVICE,                  SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS,    SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BUILT_IN_POINTING_DEVICE,             SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PORTABLE_BATTERY,                     SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_RESET,                         SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_HARDWARE_SECURITY,                    SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_POWER_CONTROLS,                SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_VOLTAGE_PROBE,                        SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_COOLING_DEVICE,                       SMBIOS_TYPE_TEMPERATURE_PROBE,              SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_TEMPERATURE_PROBE,                    SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE,             SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_OUT_OF_BAND_REMOTE_ACCESS,            SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BOOT_INTEGRITY_SERVICE,               SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION,              SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION,       SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_DEVICE,                    SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_DEVICE_COMPONENT,          SMBIOS_TYPE_MANAGEMENT_DEVICE,              SMBIOS_TYPE_VOLTAGE_PROBE,                  SMBIOS_TYPE_COOLING_DEVICE,                 SMBIOS_TYPE_TEMPERATURE_PROBE, SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE, SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA,     SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_CHANNEL,                       SMBIOS_TYPE_MEMORY_DEVICE,                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_IPMI_DEVICE_INFORMATION,              SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_POWER_SUPPLY,                  SMBIOS_TYPE_VOLTAGE_PROBE,                  SMBIOS_TYPE_COOLING_DEVICE,                 SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE,       SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ADDITIONAL_INFORMATION,               SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ONBOARD_DEVICES_EXTENDED_INFORMATION, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_TPM_DEVICE,                           SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PROCESSOR_ADDITIONAL_INFORMATION,     SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_FIRMWARE_INVENTORY_INFORMATION,       SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
-  SMBIOS_TABLE_DEP (SMBIOS_TYPE_STRING_PROPERTY_INFORMATION,          SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL)
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BIOS_INFORMATION,                     OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_INFORMATION,                   OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BASEBOARD_INFORMATION,                OrderL1,  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_ENCLOSURE,                     OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PROCESSOR_INFORMATION,                OrderDef, SMBIOS_TYPE_CACHE_INFORMATION,              SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_CONTROLLER_INFORMATION,        OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_MODULE_INFORMATON,             OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_CACHE_INFORMATION,                    OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION,           OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_SLOTS,                         OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ONBOARD_DEVICE_INFORMATION,           OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_OEM_STRINGS,                          OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS,         OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION,            OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_GROUP_ASSOCIATIONS,                   OrderL4,  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_EVENT_LOG,                     OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,                OrderDef, SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION, SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION, SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_DEVICE,                        OrderDef, SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,          SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION, SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION, SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION,       OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS,          OrderDef, SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,          SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS,         OrderDef, SMBIOS_TYPE_MEMORY_DEVICE,                  SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS,    SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BUILT_IN_POINTING_DEVICE,             OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PORTABLE_BATTERY,                     OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_RESET,                         OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_HARDWARE_SECURITY,                    OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_POWER_CONTROLS,                OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_VOLTAGE_PROBE,                        OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_COOLING_DEVICE,                       OrderDef, SMBIOS_TYPE_TEMPERATURE_PROBE,              SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_TEMPERATURE_PROBE,                    OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE,             OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_OUT_OF_BAND_REMOTE_ACCESS,            OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_BOOT_INTEGRITY_SERVICE,               OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION,              OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION,       OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_DEVICE,                    OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_DEVICE_COMPONENT,          OrderDef, SMBIOS_TYPE_MANAGEMENT_DEVICE,              SMBIOS_TYPE_VOLTAGE_PROBE,                  SMBIOS_TYPE_COOLING_DEVICE,                 SMBIOS_TYPE_TEMPERATURE_PROBE, SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE, SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA,     OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MEMORY_CHANNEL,                       OrderDef, SMBIOS_TYPE_MEMORY_DEVICE,                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_IPMI_DEVICE_INFORMATION,              OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_SYSTEM_POWER_SUPPLY,                  OrderDef, SMBIOS_TYPE_VOLTAGE_PROBE,                  SMBIOS_TYPE_COOLING_DEVICE,                 SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE,       SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ADDITIONAL_INFORMATION,               OrderL3,  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_ONBOARD_DEVICES_EXTENDED_INFORMATION, OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE, OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_TPM_DEVICE,                           OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_PROCESSOR_ADDITIONAL_INFORMATION,     OrderDef, SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_FIRMWARE_INVENTORY_INFORMATION,       OrderL2,  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL),
+  SMBIOS_TABLE_DEP (SMBIOS_TYPE_STRING_PROPERTY_INFORMATION,          OrderL5,  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                                  SMTT_NULL,                     SMTT_NULL,                            SMTT_NULL)
 };
 
 #if !defined (MDEPKG_NDEBUG)
@@ -159,7 +168,83 @@ InitSmbiosTableDispatcher (
   DEBUG_PRINT_DISPATCHER_STATUS (FALSE);
 }
 
-/** Schedule the dispatch of a SMBIOS table.
+/** Dispatch the SMBIOS table.
+
+  @param [in]  Disp                 Pointer to the  SMBIOS table dispatcher
+                                    object for the table to dispatch.
+  @param [in]  TableFactoryProtocol Pointer to the Table Factory Protocol
+                                    interface.
+  @param [in]  CfgMgrProtocol       Pointer to the Configuration Manager
+                                    Protocol Interface.
+  @param [in]  SmbiosProtocol       Pointer to the SMBIOS protocol.
+  @param [in]  SmbiosTableInfo      Pointer to the SMBIOS table Info.
+  @param [in]  SmbiosTableCount     Count of SMBIOS table info objects.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         Required object is not found.
+  @retval EFI_BAD_BUFFER_SIZE   Size returned by the Configuration Manager
+                                is less than the Object size for the
+                                requested object.
+**/
+STATIC
+EFI_STATUS
+EFIAPI
+DispatchTable (
+  IN       SMBIOS_TABLE_DISPATCHER               *CONST  Disp,
+  IN CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST  TableFactoryProtocol,
+  IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,
+  IN       EFI_SMBIOS_PROTOCOL                           *SmbiosProtocol,
+  IN       CM_STD_OBJ_SMBIOS_TABLE_INFO          *CONST  SmbiosTableInfo,
+  IN CONST UINT32                                        SmbiosTableCount
+  )
+{
+  UINTN       Index;
+  EFI_STATUS  Status;
+  BOOLEAN     Found;
+
+  if (Disp == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Found = FALSE;
+
+  // Update the dospatcher state to dispatched.
+  Disp->State = StDispatched;
+  // Find the SMBIOS table info matching the TableType
+  for (Index = 0; Index < SmbiosTableCount; Index++) {
+    if (SmbiosTableInfo[Index].TableType == Disp->TableType) {
+      Found = TRUE;
+      break;
+    }
+  }
+
+  if (!Found) {
+    ASSERT (0);
+    return EFI_NOT_FOUND;
+  }
+
+  // Install the SMBIOS table
+  Status = BuildAndInstallSmbiosTable (
+             TableFactoryProtocol,
+             CfgMgrProtocol,
+             SmbiosProtocol,
+             &SmbiosTableInfo[Index]
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "ERROR: Failed to install SMBIOS Table." \
+      " Id = %d Status = %r\n",
+      SmbiosTableInfo[Index].TableGeneratorId,
+      Status
+      ));
+  }
+
+  return Status;
+}
+
+/** Schedule the dispatch of a default ordered SMBIOS table.
 
   The SMBIOS dispatcher state table is used to establish the dependency
   order in which the SMBIOS tables are installed. This allows the SMBIOS
@@ -190,10 +275,17 @@ InitSmbiosTableDispatcher (
   @retval EFI_BAD_BUFFER_SIZE   Size returned by the Configuration Manager
                                 is less than the Object size for the
                                 requested object.
+  @retval EFI_NO_MAPPING        A dependent table may be optional and
+                                may not be in the list of tables to install.
+  @retval EFI_ALREADY_STARTED   A table may be in the dependency list of
+                                multiple tables and would have been installed
+                                when one of the other parent table's dependency
+                                list was fulfilled.
 **/
+STATIC
 EFI_STATUS
 EFIAPI
-DispatchSmbiosTable (
+DispatchDefaultOrderedSmbiosTable (
   IN CONST SMBIOS_TABLE_TYPE                             TableType,
   IN CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST  TableFactoryProtocol,
   IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,
@@ -205,28 +297,56 @@ DispatchSmbiosTable (
   EFI_STATUS               Status;
   UINTN                    Index;
   SMBIOS_TABLE_DISPATCHER  *Disp;
+  SMBIOS_TABLE_TYPE        DepTableType;
 
   DEBUG ((DEBUG_VERBOSE, "->DP %02d\n", TableType));
   Disp = &mSmBiosDispatcher[TableType];
+
+  if (Disp->Order != OrderDef) {
+    DEBUG ((DEBUG_VERBOSE, "<-DP %d : EFI_INVALID_PARAMETER\n", TableType));
+    // The table being request for installation is
+    // not a default ordered table.
+    return EFI_INVALID_PARAMETER;
+  }
+
   if (Disp->State == StNotPresent) {
-    DEBUG ((DEBUG_VERBOSE, "<-DP %02d : EFI_NOT_FOUND\n", TableType));
-    return EFI_NOT_FOUND;
+    DEBUG ((DEBUG_VERBOSE, "<-DP %02d : EFI_NO_MAPPING\n", TableType));
+    // A dependent table may be optional and therefore may
+    // not be in the list of tables to install.
+    return EFI_NO_MAPPING;
   }
 
   if (Disp->State == StDispatched) {
     DEBUG ((DEBUG_VERBOSE, "<-DP %02d : EFI_ALREADY_STARTED\n", TableType));
+    // This table may be in the dependency list of multiple tables
+    // and would have been installed when one of the other parent
+    // table's dependency list was fulfilled.
     return EFI_ALREADY_STARTED;
   }
 
   // Table is present so check the dependency.
   for (Index = 0; Index < MAX_SMBIOS_DEPENDENCY; Index++) {
+    DepTableType = Disp->Dependency[Index];
     // Check if the dependency list is terminated by SMTT_NULL.
-    if (Disp->Dependency[Index] == SMTT_NULL) {
+    if (DepTableType == SMTT_NULL) {
       break;
     }
 
-    Status = DispatchSmbiosTable (
-               Disp->Dependency[Index],
+    if (mSmBiosDispatcher[DepTableType].Order != OrderDef) {
+      // An incorrect dependency has been set.
+      // The default ordered SMBIOS tables must not have
+      // a dependency on ordered SMBIOS tables.
+      DEBUG ((
+        DEBUG_VERBOSE,
+        "<-DP %02d : EFI_INVALID_PARAMETER - Invalid dependency\n",
+        TableType
+        ));
+      ASSERT (0);
+      return EFI_INVALID_PARAMETER;
+    }
+
+    Status = DispatchDefaultOrderedSmbiosTable (
+               DepTableType,
                TableFactoryProtocol,
                CfgMgrProtocol,
                SmbiosProtocol,
@@ -234,44 +354,51 @@ DispatchSmbiosTable (
                SmbiosTableCount
                );
     if (EFI_ERROR (Status)) {
-      if ((Status == EFI_ALREADY_STARTED) || (Status == EFI_NOT_FOUND)) {
+      if ((Status == EFI_ALREADY_STARTED) ||
+          (Status == EFI_NO_MAPPING))
+      {
         // Some dependencies may already be satisfied
         // as other tables may also have similar
         // dependencies i.e. EFI_ALREADY_STARTED
         // Or
         // the dependent table may be optional
-        // and not provided i.e. EFI_NOT_FOUND.
+        // and not provided i.e. EFI_NO_MAPPING.
+        DEBUG ((
+          DEBUG_VERBOSE,
+          "<-DP %02d : Status = %r - treated as Success, continue\n",
+          TableType,
+          Status
+          ));
+        // Therefore, reset Status to success
+        Status = EFI_SUCCESS;
         continue;
       }
 
-      DEBUG ((DEBUG_VERBOSE, "<-DP %02d : Status = %d\n", TableType, Status));
+      DEBUG ((
+        DEBUG_VERBOSE,
+        "<-DP %02d : Status = %r\n",
+        TableType,
+        Status
+        ));
       return Status;
     }
   }
 
-  DEBUG ((DEBUG_VERBOSE, "DP %02d : Status = %d\n", TableType, Status));
-
-  // All dependencies satisfied - Install SMBIOS table
-  Disp->State = StDispatched;
-  // Find the SMBIOS table info matching the TableType
-  for (Index = 0; Index < SmbiosTableCount; Index++) {
-    if (SmbiosTableInfo[Index].TableType == TableType) {
-      break;
-    }
-  }
-
-  Status = BuildAndInstallSmbiosTable (
+  // All dependencies satisfied - dispatch SMBIOS table
+  Status = DispatchTable (
+             Disp,
              TableFactoryProtocol,
              CfgMgrProtocol,
              SmbiosProtocol,
-             &SmbiosTableInfo[Index]
+             SmbiosTableInfo,
+             SmbiosTableCount
              );
   if (EFI_ERROR (Status)) {
     DEBUG ((
       DEBUG_ERROR,
       "ERROR: Failed to install SMBIOS Table." \
-      " Id = %u Status = %r\n",
-      SmbiosTableInfo[Index].TableGeneratorId,
+      " TableType = %u Status = %r\n",
+      Disp->TableType,
       Status
       ));
   }
@@ -280,3 +407,263 @@ DispatchSmbiosTable (
   DEBUG ((DEBUG_VERBOSE, "<-DP %0d\n", TableType));
   return Status;
 }
+
+/** Schedule the dispatch of ordered SMBIOS tables.
+
+  The SMBIOS dispatcher dispatches the tables that have the default
+  order (OrderDef) set first before the ordered SMBIOS tables are
+  dispatched.
+  The SMBIOS_TABLE_DISPATCHER.Order field is used to establish the
+  dispatch order.
+
+  @param [in]  Order                The dispatch order for the SMBIOS table type
+                                    to be scheduled for dispatch.
+  @param [in]  TableFactoryProtocol Pointer to the Table Factory Protocol
+                                    interface.
+  @param [in]  CfgMgrProtocol       Pointer to the Configuration Manager
+                                    Protocol Interface.
+  @param [in]  SmbiosProtocol       Pointer to the SMBIOS protocol.
+  @param [in]  SmbiosTableInfo      Pointer to the SMBIOS table Info.
+  @param [in]  SmbiosTableCount     Count of SMBIOS table info objects.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         Required object is not found.
+  @retval EFI_BAD_BUFFER_SIZE   Size returned by the Configuration Manager
+                                is less than the Object size for the
+                                requested object.
+**/
+STATIC
+EFI_STATUS
+EFIAPI
+DispatchOrderedSmbiosTables (
+  IN CONST DISPATCH_ORDER                                Order,
+  IN CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST  TableFactoryProtocol,
+  IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,
+  IN       EFI_SMBIOS_PROTOCOL                           *SmbiosProtocol,
+  IN       CM_STD_OBJ_SMBIOS_TABLE_INFO          *CONST  SmbiosTableInfo,
+  IN CONST UINT32                                        SmbiosTableCount
+  )
+{
+  EFI_STATUS               Status;
+  UINTN                    Index;
+  SMBIOS_TABLE_DISPATCHER  *Disp;
+
+  DEBUG ((DEBUG_VERBOSE, "->DPO %d\n", Order));
+
+  if (Order == OrderDef) {
+    DEBUG ((DEBUG_VERBOSE, "<-DPO %d : EFI_INVALID_PARAMETER\n", Order));
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Disp = NULL;
+  for (Index = 0; Index < ARRAY_SIZE (mSmBiosDispatcher); Index++) {
+    if (mSmBiosDispatcher[Index].Order == Order) {
+      Disp = &mSmBiosDispatcher[Index];
+      break;
+    }
+  } // for
+
+  if (Disp == NULL) {
+    // Table with specified order not found.
+    DEBUG ((DEBUG_VERBOSE, "<-DPO %d : EFI_INVALID_PARAMETER\n", Order));
+    ASSERT (0);
+    return EFI_INVALID_PARAMETER;
+  } else if (Disp->State == StNotPresent) {
+    // An ordered table of this order is not present
+    // for installation. So, nothing to do here.
+    DEBUG ((
+      DEBUG_VERBOSE,
+      "<-DPO %a - %d {%u}: EFI_SUCCESS\n",
+      SmbiosTableStateTxt[Disp->State],
+      Order,
+      Disp->TableType
+      ));
+    return EFI_SUCCESS;
+  } else if (Disp->State == StDispatched) {
+    // Ordered tables are dispatched in their dispatch order and
+    // cannot be in the dependency list of any other table.
+    // Therefore, the table cannot be already dispatched.
+    DEBUG ((
+      DEBUG_VERBOSE,
+      "<-DPO %a - %d {%u}: EFI_INVALID_PARAMETER\n",
+      SmbiosTableStateTxt[Disp->State],
+      Order,
+      Disp->TableType
+      ));
+
+    ASSERT (0);
+    return EFI_INVALID_PARAMETER;
+  } else if (Disp->State != StPresent) {
+    // Invalid state, at this point the only valid state
+    // should be StPresent, otherwise the state machine
+    // is incorrect.
+    DEBUG ((
+      DEBUG_VERBOSE,
+      "<-DPO %d - %d {%u}: EFI_INVALID_PARAMETER\n",
+      Disp->State,
+      Order,
+      Disp->TableType
+      ));
+    ASSERT (0);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Status = DispatchTable (
+             Disp,
+             TableFactoryProtocol,
+             CfgMgrProtocol,
+             SmbiosProtocol,
+             SmbiosTableInfo,
+             SmbiosTableCount
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "ERROR: Failed to install SMBIOS Table." \
+      " TableType = %u Status = %r\n",
+      Disp->TableType,
+      Status
+      ));
+  }
+
+  DEBUG_PRINT_DISPATCHER_STATUS (FALSE);
+  DEBUG ((DEBUG_VERBOSE, "<-DPO %d {%u}\n", Order, Disp->TableType));
+  return Status;
+}
+
+/** Schedule the dispatch of SMBIOS tables.
+
+  The SMBIOS dispatcher state table is used to establish the dependency
+  order in which the SMBIOS tables are installed. This allows the SMBIOS
+  dispatcher to dispatch the dependent tables for installation before the
+  parent table is installed.
+  The SMBIOS_TABLE_DISPATCHER.Dependency[] field is used to establish the
+  dependency list.
+  Elements in the Dependency list are resolved by increasing index. However,
+  all orders are equivalent as:
+  - the Parent SMBIOS table will only be installed once all dependencies
+    have been satisfied.
+  - no cyclic dependency is allowed.
+  The dependency list is terminated by SMTT_NULL.
+
+  The SMBIOS dispatcher dispatches the tables that have the default
+  order (OrderDef) set before the ordered SMBIOS tables are dispatched.
+  The SMBIOS_TABLE_DISPATCHER.Order field is used to establish the
+  dispatch order.
+
+  The order specified in the SMBIOS dispatcher table must be unique for all
+  orders other than OrderDef. The dependency walk is only done for tables
+  that have the default dispatch order.
+
+  @param [in]  TableFactoryProtocol Pointer to the Table Factory Protocol
+                                    interface.
+  @param [in]  CfgMgrProtocol       Pointer to the Configuration Manager
+                                    Protocol Interface.
+  @param [in]  SmbiosProtocol       Pointer to the SMBIOS protocol.
+  @param [in]  SmbiosTableInfo      Pointer to the SMBIOS table Info.
+  @param [in]  SmbiosTableCount     Count of SMBIOS table info objects.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         Required object is not found.
+  @retval EFI_BAD_BUFFER_SIZE   Size returned by the Configuration Manager
+                                is less than the Object size for the
+                                requested object.
+**/
+EFI_STATUS
+EFIAPI
+DispatchSmbiosTables (
+  IN CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST  TableFactoryProtocol,
+  IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,
+  IN       EFI_SMBIOS_PROTOCOL                           *SmbiosProtocol,
+  IN       CM_STD_OBJ_SMBIOS_TABLE_INFO          *CONST  SmbiosTableInfo,
+  IN CONST UINT32                                        SmbiosTableCount
+  )
+{
+  EFI_STATUS         Status;
+  UINTN              Index;
+  UINT8              Order;
+  SMBIOS_TABLE_TYPE  TableType;
+
+  if ((TableFactoryProtocol == NULL)  ||
+      (CfgMgrProtocol == NULL)        ||
+      (SmbiosProtocol == NULL)        ||
+      (SmbiosTableInfo == NULL)       ||
+      (SmbiosTableCount == 0))
+  {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  // First dispatch the default ordered SMBIOS tables
+  for (Index = 0; Index < SmbiosTableCount; Index++) {
+    TableType = SmbiosTableInfo[Index].TableType;
+    if (mSmBiosDispatcher[TableType].Order != OrderDef) {
+      // Skip if the table is not a default order table.
+      continue;
+    }
+
+    Status = DispatchDefaultOrderedSmbiosTable (
+               TableType,
+               TableFactoryProtocol,
+               CfgMgrProtocol,
+               SmbiosProtocol,
+               SmbiosTableInfo,
+               SmbiosTableCount
+               );
+    if (EFI_ERROR (Status)) {
+      if ((Status == EFI_ALREADY_STARTED) ||
+          (Status == EFI_NO_MAPPING))
+      {
+        // Some dependencies may already be satisfied
+        // as other tables may also have similar
+        // dependencies i.e. EFI_ALREADY_STARTED
+        // Or
+        // the dependent table may be optional
+        // and not provided i.e. EFI_NO_MAPPING.
+        DEBUG ((
+          DEBUG_VERBOSE,
+          "TableType %02d : Status = %r - treated as Success, continue\n",
+          SmbiosTableInfo[Index].TableType,
+          Status
+          ));
+        // Therefore, reset Status to success
+        Status = EFI_SUCCESS;
+        continue;
+      }
+
+      DEBUG ((
+        DEBUG_ERROR,
+        "ERROR: Failed to install SMBIOS Table." \
+        " Id = %d Status = %r\n",
+        SmbiosTableInfo[Index].TableGeneratorId,
+        Status
+        ));
+      return Status;
+    }
+  }
+
+  // Now dispatch the ordered SMBIOS tables
+  for (Order = OrderL1; Order < OrderMax; Order++) {
+    Status = DispatchOrderedSmbiosTables (
+               (DISPATCH_ORDER)Order,
+               TableFactoryProtocol,
+               CfgMgrProtocol,
+               SmbiosProtocol,
+               SmbiosTableInfo,
+               SmbiosTableCount
+               );
+    if (EFI_ERROR (Status)) {
+      DEBUG ((
+        DEBUG_ERROR,
+        "ERROR: Failed to install SMBIOS Table." \
+        " Order = %d Status = %r\n",
+        Order,
+        Status
+        ));
+      break;
+    }
+  }
+
+  return Status;
+}
diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.h b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.h
index e98ac18c7ddc31b8d03a3a83f9bd66ab23278136..471570e57f00392c45d6f478f06c72ef6bbc57bc 100644
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.h
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableDispatcher.h
@@ -43,9 +43,10 @@
 /**
   A helper macro to populate the SMBIOS table dispatcher table
 */
-#define SMBIOS_TABLE_DEP(TableId, Dep1, Dep2, Dep3, Dep4, Dep5, Dep6) \
+#define SMBIOS_TABLE_DEP(TableId, Order, Dep1, Dep2, Dep3, Dep4, Dep5, Dep6) \
   { \
     TableId, \
+    Order, \
     StNotPresent, \
     { Dep1, Dep2, Dep3, Dep4, Dep5, Dep6 } \
   }
@@ -59,6 +60,19 @@ typedef enum SmbiosTableState {
   StDispatched    ///< SMBIOS table generators have been dispatched.
 } SMBIOS_TABLE_STATE;
 
+/**
+  An enum describing the dispatch order for the SMBIOS tables.
+*/
+typedef enum DispatchOrder {
+  OrderDef = 0,   ///< Default dispatch order.
+  OrderL1,        ///< Dispatch order 1.
+  OrderL2,        ///< Dispatch order 2.
+  OrderL3,        ///< Dispatch order 3.
+  OrderL4,        ///< Dispatch order 4.
+  OrderL5,        ///< Dispatch order 5.
+  OrderMax        ///< Dispatch order Max.
+} DISPATCH_ORDER;
+
 /**
   A structure describing the dependencies for a SMBIOS table and
   the dispatcher state information.
@@ -66,6 +80,8 @@ typedef enum SmbiosTableState {
 typedef struct SmBiosTableDispatcher {
   /// SMBIOS Structure/Table Type
   SMBIOS_TABLE_TYPE     TableType;
+  /// SMBIOS table dispatch order
+  DISPATCH_ORDER        Order;
   /// SMBIOS dispatcher state
   SMBIOS_TABLE_STATE    State;
   /// SMBIOS Structure/Table dependency list
@@ -113,7 +129,7 @@ InitSmbiosTableDispatcher (
   IN  UINT32                        SmbiosTableCount
   );
 
-/** Schedule the dispatch of a SMBIOS table.
+/** Schedule the dispatch of SMBIOS tables.
 
   The SMBIOS dispatcher state table is used to establish the dependency
   order in which the SMBIOS tables are installed. This allows the SMBIOS
@@ -128,8 +144,15 @@ InitSmbiosTableDispatcher (
   - no cyclic dependency is allowed.
   The dependency list is terminated by SMTT_NULL.
 
-  @param [in]  TableType            The SMBIOS table type to schedule for
-                                    dispatch.
+  The SMBIOS dispatcher dispatches the tables that have the default
+  order (OrderDef) set before the ordered SMBIOS tables are dispatched.
+  The SMBIOS_TABLE_DISPATCHER.Order field is used to establish the
+  dispatch order.
+
+  The order specified in the SMBIOS dispatcher table must be unique for all
+  orders other than OrderDef. The dependency walk is only done for tables
+  that have the default dispatch order.
+
   @param [in]  TableFactoryProtocol Pointer to the Table Factory Protocol
                                     interface.
   @param [in]  CfgMgrProtocol       Pointer to the Configuration Manager
@@ -147,8 +170,7 @@ InitSmbiosTableDispatcher (
 **/
 EFI_STATUS
 EFIAPI
-DispatchSmbiosTable (
-  IN CONST SMBIOS_TABLE_TYPE                             TableType,
+DispatchSmbiosTables (
   IN CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST  TableFactoryProtocol,
   IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,
   IN       EFI_SMBIOS_PROTOCOL                           *SmbiosProtocol,
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#100835): https://edk2.groups.io/g/devel/message/100835
Mute This Topic: https://groups.io/mt/97468482/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-