Virtualization/edk2
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/edk2.git synced 2025-10-30 07:56:39 +08:00
Code Issues Projects Releases Wiki Activity

MdeModulePkg: Add PcdDelayedDispatchMaxEntries

Browse Source 
The current fixed value of 8 for `DELAYED_DISPATCH_MAX_ENTRIES` is
not large enough to accommodate platform usage. This change replaces
the macro with a PCD that can be configured by platforms.

In the case the default PCD value is too small, an error message
explaining that the PCD should be updated will be printed followed
by an assert.

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
This commit is contained in:
Michael Kubacki
2025-09-11 15:51:35 -04:00
committed by Liming Gao
parent 32711df057
commit 8a07311710
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
View File

@ -134,9 +134,15 @@ PeiDelayedDispatchRegister (
}
// Check for available entry slots
ASSERT (DelayedDispatchTable->Count <= DELAYED_DISPATCH_MAX_ENTRIES);
if (DelayedDispatchTable->Count == DELAYED_DISPATCH_MAX_ENTRIES) {
DEBUG ((DEBUG_ERROR, "%a Too many entries requested\n", __func__));
if (DelayedDispatchTable->Count >= PcdGet32 (PcdDelayedDispatchMaxEntries)) {
DEBUG ((
DEBUG_ERROR,
"%a DelayedDispatchTable->Count = %d. PcdDelayedDispatchMaxEntries (%d) is too small.\n",
__func__,
DelayedDispatchTable->Count,
PcdGet32 (PcdDelayedDispatchMaxEntries)
));
ASSERT (DelayedDispatchTable->Count < PcdGet32 (PcdDelayedDispatchMaxEntries));
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
@ -1807,7 +1813,7 @@ PeiDispatcher (
if (GuidHob != NULL) {
Private->DelayedDispatchTable = (DELAYED_DISPATCH_TABLE *)(GET_GUID_HOB_DATA (GuidHob));
} else {
TableSize = sizeof (DELAYED_DISPATCH_TABLE) + ((DELAYED_DISPATCH_MAX_ENTRIES - 1) * sizeof (DELAYED_DISPATCH_ENTRY));
TableSize = sizeof (DELAYED_DISPATCH_TABLE) + (PcdGet32 (PcdDelayedDispatchMaxEntries) * sizeof (DELAYED_DISPATCH_ENTRY));
Private->DelayedDispatchTable = BuildGuidHob (&gEfiDelayedDispatchTableGuid, TableSize);
if (Private->DelayedDispatchTable != NULL) {
ZeroMem (Private->DelayedDispatchTable, TableSize);

1
MdeModulePkg/Core/Pei/PeiMain.inf
View File

@ -121,6 +121,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdMigrateTemporaryRamFirmwareVolumes ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdDelayedDispatchMaxDelayUs ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdDelayedDispatchCompletionTimeoutUs ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdDelayedDispatchMaxEntries ## CONSUMES
# [BootMode]
# S3_RESUME ## SOMETIMES_CONSUMES

9
MdeModulePkg/Include/Guid/DelayedDispatch.h
View File

@ -1,7 +1,7 @@
/** @file
Definition for structure & defines exported by Delayed Dispatch PPI
Copyright (c), Microsoft Corporation.
Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
@ -15,11 +15,6 @@
0x4b733449, 0x8eff, 0x488c, { 0x92, 0x1a, 0x15, 0x4a, 0xda, 0x25, 0x18, 0x07 } \
}
//
// Maximal number of Delayed Dispatch entries supported
//
#define DELAYED_DISPATCH_MAX_ENTRIES 8
//
// Internal structure for delayed dispatch entries.
// Packing the structures here to save space as they will be stored as HOBs.
@ -37,7 +32,7 @@ typedef struct {
typedef struct {
UINT32 Count;
UINT32 DispCount;
DELAYED_DISPATCH_ENTRY Entry[DELAYED_DISPATCH_MAX_ENTRIES];
DELAYED_DISPATCH_ENTRY Entry[]; // Number of entries is based on PcdDelayedDispatchMaxEntries
} DELAYED_DISPATCH_TABLE;
#pragma pack (pop)

4
MdeModulePkg/MdeModulePkg.dec
View File

@ -1735,6 +1735,10 @@
# @Prompt UFS device initial completion timoeout (us), default value is 600ms.
gEfiMdeModulePkgTokenSpaceGuid.PcdUfsInitialCompletionTimeout|600000|UINT32|0x00000036
## Delayed Dispatch Max Entries
# @Prompt Maximum number of delayed dispatch entries. Default value is 8.
gEfiMdeModulePkgTokenSpaceGuid.PcdDelayedDispatchMaxEntries|8|UINT32|0x00000037
[PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
## This PCD defines the Console output row. The default value is 25 according to UEFI spec.
# This PCD could be set to 0 then console output would be at max column and max row.