From de67c35c8a074500e1db86829e9aa164b7cf4b9d Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Tue, 15 Nov 2016 17:50:43 +0800 Subject: [PATCH] MdeModulePkg/BdsDxe: Fix bug to run non-first PlatformRecovery#### The implementation doesn't check the LoadOptions[Index].Status but only depends on the Status returned from EfiBootManagerProcessLoadOption(), which results only the first PlatformRecovery#### runs. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Reviewed-by: Jie Lin Reviewed-by: Sunny Wang --- MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c index 72adc5155c..32bcbf342e 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c @@ -443,17 +443,28 @@ ProcessLoadOptions ( LoadOptionType = LoadOptions[Index].OptionType; } ASSERT (LoadOptionType == LoadOptions[Index].OptionType); + ASSERT (LoadOptionType != LoadOptionTypeBoot); Status = EfiBootManagerProcessLoadOption (&LoadOptions[Index]); + // + // Status indicates whether the load option is loaded and executed + // LoadOptions[Index].Status is what the load option returns + // if (!EFI_ERROR (Status)) { - if (LoadOptionType == LoadOptionTypePlatformRecovery) { - // - // Stop processing if any entry is successful - // + // + // Stop processing if any PlatformRecovery#### returns success. + // + if ((LoadOptions[Index].Status == EFI_SUCCESS) && + (LoadOptionType == LoadOptionTypePlatformRecovery)) { break; } - if ((LoadOptions[Index].Attributes & LOAD_OPTION_FORCE_RECONNECT) != 0) { + + // + // Only set ReconnectAll flag when the load option executes successfully. + // + if (!EFI_ERROR (LoadOptions[Index].Status) && + (LoadOptions[Index].Attributes & LOAD_OPTION_FORCE_RECONNECT) != 0) { ReconnectAll = TRUE; } }