* [PATCH 0/3] ArmPkg/PlatformBootManagerLib: fixes
@ 2017-03-20 20:35 Ard Biesheuvel
2017-03-20 20:35 ` [PATCH 1/3] ArmPkg/PlatformBootManagerLib: dispatch deferred images after EndOfDxe Ard Biesheuvel
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Ard Biesheuvel @ 2017-03-20 20:35 UTC (permalink / raw)
To: edk2-devel, leif.lindholm, ryan.harkin; +Cc: Ard Biesheuvel
Replace the bootlogo implementation in QuietBoot.c with a call into
BootLogoLib, so we can get rid of some code.
While we're at it, add a missing call to dispatch deferred images, and
remove the IntelFrameworkModulePkg dependency directly, by switching to
a hardcoded Shell FILE_GUID reference rather than indirecting via a
PCD.
Ard Biesheuvel (3):
ArmPkg/PlatformBootManagerLib: dispatch deferred images after EndOfDxe
ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly
ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash
support
ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 43 +-
ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 7 +-
ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c | 680 --------------------
3 files changed, 38 insertions(+), 692 deletions(-)
delete mode 100644 ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/3] ArmPkg/PlatformBootManagerLib: dispatch deferred images after EndOfDxe 2017-03-20 20:35 [PATCH 0/3] ArmPkg/PlatformBootManagerLib: fixes Ard Biesheuvel @ 2017-03-20 20:35 ` Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 3/3] ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash support Ard Biesheuvel 2 siblings, 0 replies; 8+ messages in thread From: Ard Biesheuvel @ 2017-03-20 20:35 UTC (permalink / raw) To: edk2-devel, leif.lindholm, ryan.harkin; +Cc: Ard Biesheuvel Add the missing call to EfiBootManagerDispatchDeferredImages() so that images that have been deferred to after EndOfDxe (such as option ROMs) will be loaded. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 67e87c1c2642..cc5a4d1ff9b3 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -453,6 +453,11 @@ PlatformBootManagerBeforeConsole ( EfiEventGroupSignal (&gEfiEndOfDxeEventGroupGuid); // + // Dispatch deferred images after EndOfDxe event. + // + EfiBootManagerDispatchDeferredImages (); + + // // Locate the PCI root bridges and make the PCI bus driver connect each, // non-recursively. This will produce a number of child handles with PciIo on // them. -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly 2017-03-20 20:35 [PATCH 0/3] ArmPkg/PlatformBootManagerLib: fixes Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 1/3] ArmPkg/PlatformBootManagerLib: dispatch deferred images after EndOfDxe Ard Biesheuvel @ 2017-03-20 20:35 ` Ard Biesheuvel 2017-03-22 12:53 ` Leif Lindholm 2017-03-20 20:35 ` [PATCH 3/3] ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash support Ard Biesheuvel 2 siblings, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2017-03-20 20:35 UTC (permalink / raw) To: edk2-devel, leif.lindholm, ryan.harkin; +Cc: Ard Biesheuvel Instead of indirecting the reference to the Shell binary via a PCD that is defined in IntelFrameworkModulePkg, and which invariably gets set to the same value by all users of this library, move the reference into the code, and drop the reference to the PCD entirely. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 7 +++++-- ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index cc5a4d1ff9b3..d479c28775fb 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -33,6 +33,9 @@ #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } +STATIC CONST EFI_GUID mUefiShellFileGuid = { + 0x7C04A583, 0x9E3E, 0x4f1c, { 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } +}; #pragma pack (1) typedef struct { @@ -327,7 +330,7 @@ AddOutput ( STATIC VOID PlatformRegisterFvBootOption ( - EFI_GUID *FileGuid, + CONST EFI_GUID *FileGuid, CHAR16 *Description, UINT32 Attributes ) @@ -540,7 +543,7 @@ PlatformBootManagerAfterConsole ( // Register UEFI Shell // PlatformRegisterFvBootOption ( - PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE + &mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE ); } diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 8ec4f1dea6c4..8ac3b3799674 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -59,7 +59,6 @@ [FeaturePcd] [FixedPcd] gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly 2017-03-20 20:35 ` [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly Ard Biesheuvel @ 2017-03-22 12:53 ` Leif Lindholm 2017-03-22 13:16 ` Ard Biesheuvel 0 siblings, 1 reply; 8+ messages in thread From: Leif Lindholm @ 2017-03-22 12:53 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: edk2-devel, ryan.harkin On Mon, Mar 20, 2017 at 08:35:44PM +0000, Ard Biesheuvel wrote: > Instead of indirecting the reference to the Shell binary via a PCD > that is defined in IntelFrameworkModulePkg, and which invariably > gets set to the same value by all users of this library, move the > reference into the code, and drop the reference to the PCD entirely. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 7 +++++-- > ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 - > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > index cc5a4d1ff9b3..d479c28775fb 100644 > --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > @@ -33,6 +33,9 @@ > > #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } > > +STATIC CONST EFI_GUID mUefiShellFileGuid = { > + 0x7C04A583, 0x9E3E, 0x4f1c, { 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > +}; Surely this ought to be defined in a shared header file rather than replicated across the tree? (And yes, used in QuarkPlatformPkg as well.) Otherwise, looks like a good change. / Leif > > #pragma pack (1) > typedef struct { > @@ -327,7 +330,7 @@ AddOutput ( > STATIC > VOID > PlatformRegisterFvBootOption ( > - EFI_GUID *FileGuid, > + CONST EFI_GUID *FileGuid, > CHAR16 *Description, > UINT32 Attributes > ) > @@ -540,7 +543,7 @@ PlatformBootManagerAfterConsole ( > // Register UEFI Shell > // > PlatformRegisterFvBootOption ( > - PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE > + &mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE > ); > } > > diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > index 8ec4f1dea6c4..8ac3b3799674 100644 > --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > @@ -59,7 +59,6 @@ [FeaturePcd] > > [FixedPcd] > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly 2017-03-22 12:53 ` Leif Lindholm @ 2017-03-22 13:16 ` Ard Biesheuvel 2017-03-22 13:22 ` Leif Lindholm 0 siblings, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2017-03-22 13:16 UTC (permalink / raw) To: Leif Lindholm; +Cc: edk2-devel@lists.01.org, Ryan Harkin On 22 March 2017 at 12:53, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On Mon, Mar 20, 2017 at 08:35:44PM +0000, Ard Biesheuvel wrote: >> Instead of indirecting the reference to the Shell binary via a PCD >> that is defined in IntelFrameworkModulePkg, and which invariably >> gets set to the same value by all users of this library, move the >> reference into the code, and drop the reference to the PCD entirely. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> --- >> ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 7 +++++-- >> ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 - >> 2 files changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c >> index cc5a4d1ff9b3..d479c28775fb 100644 >> --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c >> +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c >> @@ -33,6 +33,9 @@ >> >> #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } >> >> +STATIC CONST EFI_GUID mUefiShellFileGuid = { >> + 0x7C04A583, 0x9E3E, 0x4f1c, { 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } >> +}; > > Surely this ought to be defined in a shared header file rather than > replicated across the tree? (And yes, used in QuarkPlatformPkg as > well.) > > Otherwise, looks like a good change. > Yes, it would make the most sense to add this to the [Guid] section of ShellPkg itself. I will propose it as a separate series, and replace the quark reference as well ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly 2017-03-22 13:16 ` Ard Biesheuvel @ 2017-03-22 13:22 ` Leif Lindholm 0 siblings, 0 replies; 8+ messages in thread From: Leif Lindholm @ 2017-03-22 13:22 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org, Ryan Harkin On Wed, Mar 22, 2017 at 01:16:26PM +0000, Ard Biesheuvel wrote: > On 22 March 2017 at 12:53, Leif Lindholm <leif.lindholm@linaro.org> wrote: > > On Mon, Mar 20, 2017 at 08:35:44PM +0000, Ard Biesheuvel wrote: > >> Instead of indirecting the reference to the Shell binary via a PCD > >> that is defined in IntelFrameworkModulePkg, and which invariably > >> gets set to the same value by all users of this library, move the > >> reference into the code, and drop the reference to the PCD entirely. > >> > >> Contributed-under: TianoCore Contribution Agreement 1.0 > >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >> --- > >> ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 7 +++++-- > >> ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 - > >> 2 files changed, 5 insertions(+), 3 deletions(-) > >> > >> diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > >> index cc5a4d1ff9b3..d479c28775fb 100644 > >> --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > >> +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > >> @@ -33,6 +33,9 @@ > >> > >> #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } > >> > >> +STATIC CONST EFI_GUID mUefiShellFileGuid = { > >> + 0x7C04A583, 0x9E3E, 0x4f1c, { 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > >> +}; > > > > Surely this ought to be defined in a shared header file rather than > > replicated across the tree? (And yes, used in QuarkPlatformPkg as > > well.) > > > > Otherwise, looks like a good change. > > > > Yes, it would make the most sense to add this to the [Guid] section of > ShellPkg itself. I will propose it as a separate series, and replace > the quark reference as well Since I'm about to go offline - with that change implemented: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash support 2017-03-20 20:35 [PATCH 0/3] ArmPkg/PlatformBootManagerLib: fixes Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 1/3] ArmPkg/PlatformBootManagerLib: dispatch deferred images after EndOfDxe Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly Ard Biesheuvel @ 2017-03-20 20:35 ` Ard Biesheuvel 2017-03-22 12:59 ` Leif Lindholm 2 siblings, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2017-03-20 20:35 UTC (permalink / raw) To: edk2-devel, leif.lindholm, ryan.harkin; +Cc: Ard Biesheuvel Replace the duplicated and outdated code in QuietBoot.c with a reference to BootLogoLib, which provides the same functionality. This also allows us to drop all references to IntelFrameworkModulePkg in this module. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 31 +- ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +- ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c | 680 -------------------- 3 files changed, 28 insertions(+), 689 deletions(-) diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index d479c28775fb..43febe57da8b 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -17,6 +17,7 @@ **/ #include <IndustryStandard/Pci22.h> +#include <Library/BootLogoLib.h> #include <Library/DevicePathLib.h> #include <Library/PcdLib.h> #include <Library/UefiBootManagerLib.h> @@ -522,13 +523,15 @@ PlatformBootManagerAfterConsole ( VOID ) { - Print (L"Press ESCAPE for boot options "); + EFI_STATUS Status; // // Show the splash screen. // - EnableQuietBoot (PcdGetPtr (PcdLogoFile)); - + Status = BootLogoEnableLogo (); + if (EFI_ERROR (Status)) { + Print (L"Press ESCAPE for boot options "); + } // // Connect the rest of the devices. // @@ -559,5 +562,25 @@ PlatformBootManagerWaitCallback ( UINT16 TimeoutRemain ) { - Print (L"."); + EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White; + UINT16 Timeout; + EFI_STATUS Status; + + Timeout = PcdGet16 (PcdPlatformBootTimeOut); + + Black.Raw = 0x00000000; + White.Raw = 0x00FFFFFF; + + Status = BootLogoUpdateProgress ( + White.Pixel, + Black.Pixel, + L"Press ESCAPE for boot options", + White.Pixel, + (Timeout - TimeoutRemain) * 100 / Timeout, + 0 + ); + if (EFI_ERROR (Status)) { + Print (L"."); + } } diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 8ac3b3799674..42e68258288a 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -33,16 +33,15 @@ [Defines] [Sources] PlatformBm.c - QuietBoot.c [Packages] - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec [LibraryClasses] BaseLib BaseMemoryLib + BootLogoLib DebugLib DevicePathLib DxeServicesLib @@ -54,11 +53,9 @@ [LibraryClasses] UefiLib [FeaturePcd] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport [FixedPcd] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity @@ -79,6 +76,5 @@ [Protocols] gEfiDevicePathProtocolGuid gEfiGraphicsOutputProtocolGuid gEfiLoadedImageProtocolGuid - gEfiOEMBadgingProtocolGuid gEfiPciRootBridgeIoProtocolGuid gEfiSimpleFileSystemProtocolGuid diff --git a/ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c b/ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c deleted file mode 100644 index 687bda0e0480..000000000000 --- a/ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c +++ /dev/null @@ -1,680 +0,0 @@ -/** @file - Platform BDS function for quiet boot support. - -Copyright (C) 2016, Red Hat, Inc. -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include <IndustryStandard/Bmp.h> -#include <Library/DxeServicesLib.h> -#include <Protocol/BootLogo.h> -#include <Protocol/OEMBadging.h> -#include <Protocol/UgaDraw.h> - -#include "PlatformBm.h" - -/** - Convert a *.BMP graphics image to a GOP blt buffer. If a NULL Blt buffer - is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt - buffer is passed in it will be used if it is big enough. - - @param BmpImage Pointer to BMP file - @param BmpImageSize Number of bytes in BmpImage - @param GopBlt Buffer containing GOP version of BmpImage. - @param GopBltSize Size of GopBlt in bytes. - @param PixelHeight Height of GopBlt/BmpImage in pixels - @param PixelWidth Width of GopBlt/BmpImage in pixels - - @retval EFI_SUCCESS GopBlt and GopBltSize are returned. - @retval EFI_UNSUPPORTED BmpImage is not a valid *.BMP image - @retval EFI_BUFFER_TOO_SMALL The passed in GopBlt buffer is not big enough. - GopBltSize will contain the required size. - @retval EFI_OUT_OF_RESOURCES No enough buffer to allocate. - -**/ -STATIC -EFI_STATUS -ConvertBmpToGopBlt ( - IN VOID *BmpImage, - IN UINTN BmpImageSize, - IN OUT VOID **GopBlt, - IN OUT UINTN *GopBltSize, - OUT UINTN *PixelHeight, - OUT UINTN *PixelWidth - ) -{ - UINT8 *Image; - UINT8 *ImageHeader; - BMP_IMAGE_HEADER *BmpHeader; - BMP_COLOR_MAP *BmpColorMap; - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer; - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; - UINT64 BltBufferSize; - UINTN Index; - UINTN Height; - UINTN Width; - UINTN ImageIndex; - UINT32 DataSizePerLine; - BOOLEAN IsAllocated; - UINT32 ColorMapNum; - - if (sizeof (BMP_IMAGE_HEADER) > BmpImageSize) { - return EFI_INVALID_PARAMETER; - } - - BmpHeader = (BMP_IMAGE_HEADER *) BmpImage; - - if (BmpHeader->CharB != 'B' || BmpHeader->CharM != 'M') { - return EFI_UNSUPPORTED; - } - - // - // Doesn't support compress. - // - if (BmpHeader->CompressionType != 0) { - return EFI_UNSUPPORTED; - } - - // - // Only support BITMAPINFOHEADER format. - // BITMAPFILEHEADER + BITMAPINFOHEADER = BMP_IMAGE_HEADER - // - if (BmpHeader->HeaderSize != sizeof (BMP_IMAGE_HEADER) - OFFSET_OF(BMP_IMAGE_HEADER, HeaderSize)) { - return EFI_UNSUPPORTED; - } - - // - // The data size in each line must be 4 byte alignment. - // - DataSizePerLine = ((BmpHeader->PixelWidth * BmpHeader->BitPerPixel + 31) >> 3) & (~0x3); - BltBufferSize = MultU64x32 (DataSizePerLine, BmpHeader->PixelHeight); - if (BltBufferSize > (UINT32) ~0) { - return EFI_INVALID_PARAMETER; - } - - if ((BmpHeader->Size != BmpImageSize) || - (BmpHeader->Size < BmpHeader->ImageOffset) || - (BmpHeader->Size - BmpHeader->ImageOffset != BmpHeader->PixelHeight * DataSizePerLine)) { - return EFI_INVALID_PARAMETER; - } - - // - // Calculate Color Map offset in the image. - // - Image = BmpImage; - BmpColorMap = (BMP_COLOR_MAP *) (Image + sizeof (BMP_IMAGE_HEADER)); - if (BmpHeader->ImageOffset < sizeof (BMP_IMAGE_HEADER)) { - return EFI_INVALID_PARAMETER; - } - - if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) { - switch (BmpHeader->BitPerPixel) { - case 1: - ColorMapNum = 2; - break; - case 4: - ColorMapNum = 16; - break; - case 8: - ColorMapNum = 256; - break; - default: - ColorMapNum = 0; - break; - } - // - // BMP file may has padding data between the bmp header section and the bmp data section. - // - if (BmpHeader->ImageOffset - sizeof (BMP_IMAGE_HEADER) < sizeof (BMP_COLOR_MAP) * ColorMapNum) { - return EFI_INVALID_PARAMETER; - } - } - - // - // Calculate graphics image data address in the image - // - Image = ((UINT8 *) BmpImage) + BmpHeader->ImageOffset; - ImageHeader = Image; - - // - // Calculate the BltBuffer needed size. - // - BltBufferSize = MultU64x32 ((UINT64) BmpHeader->PixelWidth, BmpHeader->PixelHeight); - // - // Ensure the BltBufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) doesn't overflow - // - if (BltBufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL))) { - return EFI_UNSUPPORTED; - } - BltBufferSize = MultU64x32 (BltBufferSize, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - - IsAllocated = FALSE; - if (*GopBlt == NULL) { - // - // GopBlt is not allocated by caller. - // - *GopBltSize = (UINTN) BltBufferSize; - *GopBlt = AllocatePool (*GopBltSize); - IsAllocated = TRUE; - if (*GopBlt == NULL) { - return EFI_OUT_OF_RESOURCES; - } - } else { - // - // GopBlt has been allocated by caller. - // - if (*GopBltSize < (UINTN) BltBufferSize) { - *GopBltSize = (UINTN) BltBufferSize; - return EFI_BUFFER_TOO_SMALL; - } - } - - *PixelWidth = BmpHeader->PixelWidth; - *PixelHeight = BmpHeader->PixelHeight; - - // - // Convert image from BMP to Blt buffer format - // - BltBuffer = *GopBlt; - for (Height = 0; Height < BmpHeader->PixelHeight; Height++) { - Blt = &BltBuffer[(BmpHeader->PixelHeight - Height - 1) * BmpHeader->PixelWidth]; - for (Width = 0; Width < BmpHeader->PixelWidth; Width++, Image++, Blt++) { - switch (BmpHeader->BitPerPixel) { - case 1: - // - // Convert 1-bit (2 colors) BMP to 24-bit color - // - for (Index = 0; Index < 8 && Width < BmpHeader->PixelWidth; Index++) { - Blt->Red = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Red; - Blt->Green = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Green; - Blt->Blue = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Blue; - Blt++; - Width++; - } - - Blt--; - Width--; - break; - - case 4: - // - // Convert 4-bit (16 colors) BMP Palette to 24-bit color - // - Index = (*Image) >> 4; - Blt->Red = BmpColorMap[Index].Red; - Blt->Green = BmpColorMap[Index].Green; - Blt->Blue = BmpColorMap[Index].Blue; - if (Width < (BmpHeader->PixelWidth - 1)) { - Blt++; - Width++; - Index = (*Image) & 0x0f; - Blt->Red = BmpColorMap[Index].Red; - Blt->Green = BmpColorMap[Index].Green; - Blt->Blue = BmpColorMap[Index].Blue; - } - break; - - case 8: - // - // Convert 8-bit (256 colors) BMP Palette to 24-bit color - // - Blt->Red = BmpColorMap[*Image].Red; - Blt->Green = BmpColorMap[*Image].Green; - Blt->Blue = BmpColorMap[*Image].Blue; - break; - - case 24: - // - // It is 24-bit BMP. - // - Blt->Blue = *Image++; - Blt->Green = *Image++; - Blt->Red = *Image; - break; - - default: - // - // Other bit format BMP is not supported. - // - if (IsAllocated) { - FreePool (*GopBlt); - *GopBlt = NULL; - } - return EFI_UNSUPPORTED; - }; - - } - - ImageIndex = (UINTN) (Image - ImageHeader); - if ((ImageIndex % 4) != 0) { - // - // Bmp Image starts each row on a 32-bit boundary! - // - Image = Image + (4 - (ImageIndex % 4)); - } - } - - return EFI_SUCCESS; -} - -/** - Use SystemTable Conout to stop video based Simple Text Out consoles from going - to the video device. Put up LogoFile on every video device that is a console. - - @param[in] LogoFile File name of logo to display on the center of the screen. - - @retval EFI_SUCCESS ConsoleControl has been flipped to graphics and logo displayed. - @retval EFI_UNSUPPORTED Logo not found - -**/ -EFI_STATUS -EnableQuietBoot ( - IN EFI_GUID *LogoFile - ) -{ - EFI_STATUS Status; - EFI_OEM_BADGING_PROTOCOL *Badging; - UINT32 SizeOfX; - UINT32 SizeOfY; - INTN DestX; - INTN DestY; - UINT8 *ImageData; - UINTN ImageSize; - UINTN BltSize; - UINT32 Instance; - EFI_BADGING_FORMAT Format; - EFI_BADGING_DISPLAY_ATTRIBUTE Attribute; - UINTN CoordinateX; - UINTN CoordinateY; - UINTN Height; - UINTN Width; - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - UINT32 ColorDepth; - UINT32 RefreshRate; - EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_BOOT_LOGO_PROTOCOL *BootLogo; - UINTN NumberOfLogos; - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *LogoBlt; - UINTN LogoDestX; - UINTN LogoDestY; - UINTN LogoHeight; - UINTN LogoWidth; - UINTN NewDestX; - UINTN NewDestY; - UINTN NewHeight; - UINTN NewWidth; - UINT64 BufferSize; - - UgaDraw = NULL; - // - // Try to open GOP first - // - Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput); - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - GraphicsOutput = NULL; - // - // Open GOP failed, try to open UGA - // - Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw); - } - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - - // - // Try to open Boot Logo Protocol. - // - BootLogo = NULL; - gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID **) &BootLogo); - - // - // Erase Cursor from screen - // - gST->ConOut->EnableCursor (gST->ConOut, FALSE); - - Badging = NULL; - Status = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging); - - if (GraphicsOutput != NULL) { - SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution; - SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution; - - } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status = UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth, &RefreshRate); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - } else { - return EFI_UNSUPPORTED; - } - - Blt = NULL; - NumberOfLogos = 0; - LogoDestX = 0; - LogoDestY = 0; - LogoHeight = 0; - LogoWidth = 0; - NewDestX = 0; - NewDestY = 0; - NewHeight = 0; - NewWidth = 0; - Instance = 0; - Height = 0; - Width = 0; - while (1) { - ImageData = NULL; - ImageSize = 0; - - if (Badging != NULL) { - // - // Get image from OEMBadging protocol. - // - Status = Badging->GetImage ( - Badging, - &Instance, - &Format, - &ImageData, - &ImageSize, - &Attribute, - &CoordinateX, - &CoordinateY - ); - if (EFI_ERROR (Status)) { - goto Done; - } - - // - // Currently only support BMP format. - // - if (Format != EfiBadgingFormatBMP) { - if (ImageData != NULL) { - FreePool (ImageData); - } - continue; - } - } else { - // - // Get the specified image from FV. - // - Status = GetSectionFromAnyFv (LogoFile, EFI_SECTION_RAW, 0, (VOID **) &ImageData, &ImageSize); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - - CoordinateX = 0; - CoordinateY = 0; - if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { - Attribute = EfiBadgingDisplayAttributeCenter; - } else { - Attribute = EfiBadgingDisplayAttributeCustomized; - } - } - - if (Blt != NULL) { - FreePool (Blt); - } - Blt = NULL; - Status = ConvertBmpToGopBlt ( - ImageData, - ImageSize, - (VOID **) &Blt, - &BltSize, - &Height, - &Width - ); - if (EFI_ERROR (Status)) { - FreePool (ImageData); - - if (Badging == NULL) { - return Status; - } else { - continue; - } - } - - // - // Calculate the display position according to Attribute. - // - switch (Attribute) { - case EfiBadgingDisplayAttributeLeftTop: - DestX = CoordinateX; - DestY = CoordinateY; - break; - - case EfiBadgingDisplayAttributeCenterTop: - DestX = (SizeOfX - Width) / 2; - DestY = CoordinateY; - break; - - case EfiBadgingDisplayAttributeRightTop: - DestX = (SizeOfX - Width - CoordinateX); - DestY = CoordinateY;; - break; - - case EfiBadgingDisplayAttributeCenterRight: - DestX = (SizeOfX - Width - CoordinateX); - DestY = (SizeOfY - Height) / 2; - break; - - case EfiBadgingDisplayAttributeRightBottom: - DestX = (SizeOfX - Width - CoordinateX); - DestY = (SizeOfY - Height - CoordinateY); - break; - - case EfiBadgingDisplayAttributeCenterBottom: - DestX = (SizeOfX - Width) / 2; - DestY = (SizeOfY - Height - CoordinateY); - break; - - case EfiBadgingDisplayAttributeLeftBottom: - DestX = CoordinateX; - DestY = (SizeOfY - Height - CoordinateY); - break; - - case EfiBadgingDisplayAttributeCenterLeft: - DestX = CoordinateX; - DestY = (SizeOfY - Height) / 2; - break; - - case EfiBadgingDisplayAttributeCenter: - DestX = (SizeOfX - Width) / 2; - DestY = (SizeOfY - Height) / 2; - break; - - case EfiBadgingDisplayAttributeCustomized: - DestX = (SizeOfX - Width) / 2; - DestY = ((SizeOfY * 382) / 1000) - Height / 2; - break; - - default: - DestX = CoordinateX; - DestY = CoordinateY; - break; - } - - if ((DestX >= 0) && (DestY >= 0)) { - if (GraphicsOutput != NULL) { - Status = GraphicsOutput->Blt ( - GraphicsOutput, - Blt, - EfiBltBufferToVideo, - 0, - 0, - (UINTN) DestX, - (UINTN) DestY, - Width, - Height, - Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) - ); - } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status = UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) Blt, - EfiUgaBltBufferToVideo, - 0, - 0, - (UINTN) DestX, - (UINTN) DestY, - Width, - Height, - Width * sizeof (EFI_UGA_PIXEL) - ); - } else { - Status = EFI_UNSUPPORTED; - } - - // - // Report displayed Logo information. - // - if (!EFI_ERROR (Status)) { - NumberOfLogos++; - - if (LogoWidth == 0) { - // - // The first Logo. - // - LogoDestX = (UINTN) DestX; - LogoDestY = (UINTN) DestY; - LogoWidth = Width; - LogoHeight = Height; - } else { - // - // Merge new logo with old one. - // - NewDestX = MIN ((UINTN) DestX, LogoDestX); - NewDestY = MIN ((UINTN) DestY, LogoDestY); - NewWidth = MAX ((UINTN) DestX + Width, LogoDestX + LogoWidth) - NewDestX; - NewHeight = MAX ((UINTN) DestY + Height, LogoDestY + LogoHeight) - NewDestY; - - LogoDestX = NewDestX; - LogoDestY = NewDestY; - LogoWidth = NewWidth; - LogoHeight = NewHeight; - } - } - } - - FreePool (ImageData); - - if (Badging == NULL) { - break; - } - } - -Done: - if (BootLogo == NULL || NumberOfLogos == 0) { - // - // No logo displayed. - // - if (Blt != NULL) { - FreePool (Blt); - } - - return Status; - } - - // - // Advertise displayed Logo information. - // - if (NumberOfLogos == 1) { - // - // Only one logo displayed, use its Blt buffer directly for BootLogo protocol. - // - LogoBlt = Blt; - Status = EFI_SUCCESS; - } else { - // - // More than one Logo displayed, get merged BltBuffer using VideoToBuffer operation. - // - if (Blt != NULL) { - FreePool (Blt); - } - - // - // Ensure the LogoHeight * LogoWidth doesn't overflow - // - if (LogoHeight > DivU64x64Remainder ((UINTN) ~0, LogoWidth, NULL)) { - return EFI_UNSUPPORTED; - } - BufferSize = MultU64x64 (LogoWidth, LogoHeight); - - // - // Ensure the BufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) doesn't overflow - // - if (BufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL))) { - return EFI_UNSUPPORTED; - } - - LogoBlt = AllocateZeroPool ((UINTN)BufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - if (LogoBlt == NULL) { - return EFI_OUT_OF_RESOURCES; - } - - if (GraphicsOutput != NULL) { - Status = GraphicsOutput->Blt ( - GraphicsOutput, - LogoBlt, - EfiBltVideoToBltBuffer, - LogoDestX, - LogoDestY, - 0, - 0, - LogoWidth, - LogoHeight, - LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) - ); - } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status = UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) LogoBlt, - EfiUgaVideoToBltBuffer, - LogoDestX, - LogoDestY, - 0, - 0, - LogoWidth, - LogoHeight, - LogoWidth * sizeof (EFI_UGA_PIXEL) - ); - } else { - Status = EFI_UNSUPPORTED; - } - } - - if (!EFI_ERROR (Status)) { - BootLogo->SetBootLogo (BootLogo, LogoBlt, LogoDestX, LogoDestY, LogoWidth, LogoHeight); - } - FreePool (LogoBlt); - - return Status; -} - -/** - Use SystemTable Conout to turn on video based Simple Text Out consoles. The - Simple Text Out screens will now be synced up with all non video output devices - - @retval EFI_SUCCESS UGA devices are back in text mode and synced up. - -**/ -EFI_STATUS -DisableQuietBoot ( - VOID - ) -{ - - // - // Enable Cursor on Screen - // - gST->ConOut->EnableCursor (gST->ConOut, TRUE); - return EFI_SUCCESS; -} - -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash support 2017-03-20 20:35 ` [PATCH 3/3] ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash support Ard Biesheuvel @ 2017-03-22 12:59 ` Leif Lindholm 0 siblings, 0 replies; 8+ messages in thread From: Leif Lindholm @ 2017-03-22 12:59 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: edk2-devel, ryan.harkin On Mon, Mar 20, 2017 at 08:35:45PM +0000, Ard Biesheuvel wrote: > Replace the duplicated and outdated code in QuietBoot.c with a reference > to BootLogoLib, which provides the same functionality. This also allows > us to drop all references to IntelFrameworkModulePkg in this module. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 31 +- > ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +- > ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c | 680 -------------------- > 3 files changed, 28 insertions(+), 689 deletions(-) > > diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > index d479c28775fb..43febe57da8b 100644 > --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c > @@ -17,6 +17,7 @@ > **/ > > #include <IndustryStandard/Pci22.h> > +#include <Library/BootLogoLib.h> > #include <Library/DevicePathLib.h> > #include <Library/PcdLib.h> > #include <Library/UefiBootManagerLib.h> > @@ -522,13 +523,15 @@ PlatformBootManagerAfterConsole ( > VOID > ) > { > - Print (L"Press ESCAPE for boot options "); > + EFI_STATUS Status; > > // > // Show the splash screen. > // > - EnableQuietBoot (PcdGetPtr (PcdLogoFile)); > - > + Status = BootLogoEnableLogo (); > + if (EFI_ERROR (Status)) { > + Print (L"Press ESCAPE for boot options "); > + } > // > // Connect the rest of the devices. > // > @@ -559,5 +562,25 @@ PlatformBootManagerWaitCallback ( > UINT16 TimeoutRemain > ) > { > - Print (L"."); > + EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black; > + EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White; > + UINT16 Timeout; > + EFI_STATUS Status; > + > + Timeout = PcdGet16 (PcdPlatformBootTimeOut); > + > + Black.Raw = 0x00000000; > + White.Raw = 0x00FFFFFF; Speaking of things that ought to have common defines... However, this one doesn't have as clear an answer, and remains quite readable to anyone who knows what RGB is, so never mind. Nice diffstat :) Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > + > + Status = BootLogoUpdateProgress ( > + White.Pixel, > + Black.Pixel, > + L"Press ESCAPE for boot options", > + White.Pixel, > + (Timeout - TimeoutRemain) * 100 / Timeout, > + 0 > + ); > + if (EFI_ERROR (Status)) { > + Print (L"."); > + } > } > diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > index 8ac3b3799674..42e68258288a 100644 > --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > @@ -33,16 +33,15 @@ [Defines] > > [Sources] > PlatformBm.c > - QuietBoot.c > > [Packages] > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > > [LibraryClasses] > BaseLib > BaseMemoryLib > + BootLogoLib > DebugLib > DevicePathLib > DxeServicesLib > @@ -54,11 +53,9 @@ [LibraryClasses] > UefiLib > > [FeaturePcd] > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable > gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport > > [FixedPcd] > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity > @@ -79,6 +76,5 @@ [Protocols] > gEfiDevicePathProtocolGuid > gEfiGraphicsOutputProtocolGuid > gEfiLoadedImageProtocolGuid > - gEfiOEMBadgingProtocolGuid > gEfiPciRootBridgeIoProtocolGuid > gEfiSimpleFileSystemProtocolGuid > diff --git a/ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c b/ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c > deleted file mode 100644 > index 687bda0e0480..000000000000 > --- a/ArmPkg/Library/PlatformBootManagerLib/QuietBoot.c > +++ /dev/null > @@ -1,680 +0,0 @@ > -/** @file > - Platform BDS function for quiet boot support. > - > -Copyright (C) 2016, Red Hat, Inc. > -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> > -This program and the accompanying materials > -are licensed and made available under the terms and conditions of the BSD License > -which accompanies this distribution. The full text of the license may be found at > -http://opensource.org/licenses/bsd-license.php > - > -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > - > -**/ > - > -#include <IndustryStandard/Bmp.h> > -#include <Library/DxeServicesLib.h> > -#include <Protocol/BootLogo.h> > -#include <Protocol/OEMBadging.h> > -#include <Protocol/UgaDraw.h> > - > -#include "PlatformBm.h" > - > -/** > - Convert a *.BMP graphics image to a GOP blt buffer. If a NULL Blt buffer > - is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt > - buffer is passed in it will be used if it is big enough. > - > - @param BmpImage Pointer to BMP file > - @param BmpImageSize Number of bytes in BmpImage > - @param GopBlt Buffer containing GOP version of BmpImage. > - @param GopBltSize Size of GopBlt in bytes. > - @param PixelHeight Height of GopBlt/BmpImage in pixels > - @param PixelWidth Width of GopBlt/BmpImage in pixels > - > - @retval EFI_SUCCESS GopBlt and GopBltSize are returned. > - @retval EFI_UNSUPPORTED BmpImage is not a valid *.BMP image > - @retval EFI_BUFFER_TOO_SMALL The passed in GopBlt buffer is not big enough. > - GopBltSize will contain the required size. > - @retval EFI_OUT_OF_RESOURCES No enough buffer to allocate. > - > -**/ > -STATIC > -EFI_STATUS > -ConvertBmpToGopBlt ( > - IN VOID *BmpImage, > - IN UINTN BmpImageSize, > - IN OUT VOID **GopBlt, > - IN OUT UINTN *GopBltSize, > - OUT UINTN *PixelHeight, > - OUT UINTN *PixelWidth > - ) > -{ > - UINT8 *Image; > - UINT8 *ImageHeader; > - BMP_IMAGE_HEADER *BmpHeader; > - BMP_COLOR_MAP *BmpColorMap; > - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer; > - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; > - UINT64 BltBufferSize; > - UINTN Index; > - UINTN Height; > - UINTN Width; > - UINTN ImageIndex; > - UINT32 DataSizePerLine; > - BOOLEAN IsAllocated; > - UINT32 ColorMapNum; > - > - if (sizeof (BMP_IMAGE_HEADER) > BmpImageSize) { > - return EFI_INVALID_PARAMETER; > - } > - > - BmpHeader = (BMP_IMAGE_HEADER *) BmpImage; > - > - if (BmpHeader->CharB != 'B' || BmpHeader->CharM != 'M') { > - return EFI_UNSUPPORTED; > - } > - > - // > - // Doesn't support compress. > - // > - if (BmpHeader->CompressionType != 0) { > - return EFI_UNSUPPORTED; > - } > - > - // > - // Only support BITMAPINFOHEADER format. > - // BITMAPFILEHEADER + BITMAPINFOHEADER = BMP_IMAGE_HEADER > - // > - if (BmpHeader->HeaderSize != sizeof (BMP_IMAGE_HEADER) - OFFSET_OF(BMP_IMAGE_HEADER, HeaderSize)) { > - return EFI_UNSUPPORTED; > - } > - > - // > - // The data size in each line must be 4 byte alignment. > - // > - DataSizePerLine = ((BmpHeader->PixelWidth * BmpHeader->BitPerPixel + 31) >> 3) & (~0x3); > - BltBufferSize = MultU64x32 (DataSizePerLine, BmpHeader->PixelHeight); > - if (BltBufferSize > (UINT32) ~0) { > - return EFI_INVALID_PARAMETER; > - } > - > - if ((BmpHeader->Size != BmpImageSize) || > - (BmpHeader->Size < BmpHeader->ImageOffset) || > - (BmpHeader->Size - BmpHeader->ImageOffset != BmpHeader->PixelHeight * DataSizePerLine)) { > - return EFI_INVALID_PARAMETER; > - } > - > - // > - // Calculate Color Map offset in the image. > - // > - Image = BmpImage; > - BmpColorMap = (BMP_COLOR_MAP *) (Image + sizeof (BMP_IMAGE_HEADER)); > - if (BmpHeader->ImageOffset < sizeof (BMP_IMAGE_HEADER)) { > - return EFI_INVALID_PARAMETER; > - } > - > - if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) { > - switch (BmpHeader->BitPerPixel) { > - case 1: > - ColorMapNum = 2; > - break; > - case 4: > - ColorMapNum = 16; > - break; > - case 8: > - ColorMapNum = 256; > - break; > - default: > - ColorMapNum = 0; > - break; > - } > - // > - // BMP file may has padding data between the bmp header section and the bmp data section. > - // > - if (BmpHeader->ImageOffset - sizeof (BMP_IMAGE_HEADER) < sizeof (BMP_COLOR_MAP) * ColorMapNum) { > - return EFI_INVALID_PARAMETER; > - } > - } > - > - // > - // Calculate graphics image data address in the image > - // > - Image = ((UINT8 *) BmpImage) + BmpHeader->ImageOffset; > - ImageHeader = Image; > - > - // > - // Calculate the BltBuffer needed size. > - // > - BltBufferSize = MultU64x32 ((UINT64) BmpHeader->PixelWidth, BmpHeader->PixelHeight); > - // > - // Ensure the BltBufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) doesn't overflow > - // > - if (BltBufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL))) { > - return EFI_UNSUPPORTED; > - } > - BltBufferSize = MultU64x32 (BltBufferSize, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > - > - IsAllocated = FALSE; > - if (*GopBlt == NULL) { > - // > - // GopBlt is not allocated by caller. > - // > - *GopBltSize = (UINTN) BltBufferSize; > - *GopBlt = AllocatePool (*GopBltSize); > - IsAllocated = TRUE; > - if (*GopBlt == NULL) { > - return EFI_OUT_OF_RESOURCES; > - } > - } else { > - // > - // GopBlt has been allocated by caller. > - // > - if (*GopBltSize < (UINTN) BltBufferSize) { > - *GopBltSize = (UINTN) BltBufferSize; > - return EFI_BUFFER_TOO_SMALL; > - } > - } > - > - *PixelWidth = BmpHeader->PixelWidth; > - *PixelHeight = BmpHeader->PixelHeight; > - > - // > - // Convert image from BMP to Blt buffer format > - // > - BltBuffer = *GopBlt; > - for (Height = 0; Height < BmpHeader->PixelHeight; Height++) { > - Blt = &BltBuffer[(BmpHeader->PixelHeight - Height - 1) * BmpHeader->PixelWidth]; > - for (Width = 0; Width < BmpHeader->PixelWidth; Width++, Image++, Blt++) { > - switch (BmpHeader->BitPerPixel) { > - case 1: > - // > - // Convert 1-bit (2 colors) BMP to 24-bit color > - // > - for (Index = 0; Index < 8 && Width < BmpHeader->PixelWidth; Index++) { > - Blt->Red = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Red; > - Blt->Green = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Green; > - Blt->Blue = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Blue; > - Blt++; > - Width++; > - } > - > - Blt--; > - Width--; > - break; > - > - case 4: > - // > - // Convert 4-bit (16 colors) BMP Palette to 24-bit color > - // > - Index = (*Image) >> 4; > - Blt->Red = BmpColorMap[Index].Red; > - Blt->Green = BmpColorMap[Index].Green; > - Blt->Blue = BmpColorMap[Index].Blue; > - if (Width < (BmpHeader->PixelWidth - 1)) { > - Blt++; > - Width++; > - Index = (*Image) & 0x0f; > - Blt->Red = BmpColorMap[Index].Red; > - Blt->Green = BmpColorMap[Index].Green; > - Blt->Blue = BmpColorMap[Index].Blue; > - } > - break; > - > - case 8: > - // > - // Convert 8-bit (256 colors) BMP Palette to 24-bit color > - // > - Blt->Red = BmpColorMap[*Image].Red; > - Blt->Green = BmpColorMap[*Image].Green; > - Blt->Blue = BmpColorMap[*Image].Blue; > - break; > - > - case 24: > - // > - // It is 24-bit BMP. > - // > - Blt->Blue = *Image++; > - Blt->Green = *Image++; > - Blt->Red = *Image; > - break; > - > - default: > - // > - // Other bit format BMP is not supported. > - // > - if (IsAllocated) { > - FreePool (*GopBlt); > - *GopBlt = NULL; > - } > - return EFI_UNSUPPORTED; > - }; > - > - } > - > - ImageIndex = (UINTN) (Image - ImageHeader); > - if ((ImageIndex % 4) != 0) { > - // > - // Bmp Image starts each row on a 32-bit boundary! > - // > - Image = Image + (4 - (ImageIndex % 4)); > - } > - } > - > - return EFI_SUCCESS; > -} > - > -/** > - Use SystemTable Conout to stop video based Simple Text Out consoles from going > - to the video device. Put up LogoFile on every video device that is a console. > - > - @param[in] LogoFile File name of logo to display on the center of the screen. > - > - @retval EFI_SUCCESS ConsoleControl has been flipped to graphics and logo displayed. > - @retval EFI_UNSUPPORTED Logo not found > - > -**/ > -EFI_STATUS > -EnableQuietBoot ( > - IN EFI_GUID *LogoFile > - ) > -{ > - EFI_STATUS Status; > - EFI_OEM_BADGING_PROTOCOL *Badging; > - UINT32 SizeOfX; > - UINT32 SizeOfY; > - INTN DestX; > - INTN DestY; > - UINT8 *ImageData; > - UINTN ImageSize; > - UINTN BltSize; > - UINT32 Instance; > - EFI_BADGING_FORMAT Format; > - EFI_BADGING_DISPLAY_ATTRIBUTE Attribute; > - UINTN CoordinateX; > - UINTN CoordinateY; > - UINTN Height; > - UINTN Width; > - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; > - EFI_UGA_DRAW_PROTOCOL *UgaDraw; > - UINT32 ColorDepth; > - UINT32 RefreshRate; > - EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; > - EFI_BOOT_LOGO_PROTOCOL *BootLogo; > - UINTN NumberOfLogos; > - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *LogoBlt; > - UINTN LogoDestX; > - UINTN LogoDestY; > - UINTN LogoHeight; > - UINTN LogoWidth; > - UINTN NewDestX; > - UINTN NewDestY; > - UINTN NewHeight; > - UINTN NewWidth; > - UINT64 BufferSize; > - > - UgaDraw = NULL; > - // > - // Try to open GOP first > - // > - Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput); > - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { > - GraphicsOutput = NULL; > - // > - // Open GOP failed, try to open UGA > - // > - Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw); > - } > - if (EFI_ERROR (Status)) { > - return EFI_UNSUPPORTED; > - } > - > - // > - // Try to open Boot Logo Protocol. > - // > - BootLogo = NULL; > - gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID **) &BootLogo); > - > - // > - // Erase Cursor from screen > - // > - gST->ConOut->EnableCursor (gST->ConOut, FALSE); > - > - Badging = NULL; > - Status = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging); > - > - if (GraphicsOutput != NULL) { > - SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution; > - SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution; > - > - } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { > - Status = UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth, &RefreshRate); > - if (EFI_ERROR (Status)) { > - return EFI_UNSUPPORTED; > - } > - } else { > - return EFI_UNSUPPORTED; > - } > - > - Blt = NULL; > - NumberOfLogos = 0; > - LogoDestX = 0; > - LogoDestY = 0; > - LogoHeight = 0; > - LogoWidth = 0; > - NewDestX = 0; > - NewDestY = 0; > - NewHeight = 0; > - NewWidth = 0; > - Instance = 0; > - Height = 0; > - Width = 0; > - while (1) { > - ImageData = NULL; > - ImageSize = 0; > - > - if (Badging != NULL) { > - // > - // Get image from OEMBadging protocol. > - // > - Status = Badging->GetImage ( > - Badging, > - &Instance, > - &Format, > - &ImageData, > - &ImageSize, > - &Attribute, > - &CoordinateX, > - &CoordinateY > - ); > - if (EFI_ERROR (Status)) { > - goto Done; > - } > - > - // > - // Currently only support BMP format. > - // > - if (Format != EfiBadgingFormatBMP) { > - if (ImageData != NULL) { > - FreePool (ImageData); > - } > - continue; > - } > - } else { > - // > - // Get the specified image from FV. > - // > - Status = GetSectionFromAnyFv (LogoFile, EFI_SECTION_RAW, 0, (VOID **) &ImageData, &ImageSize); > - if (EFI_ERROR (Status)) { > - return EFI_UNSUPPORTED; > - } > - > - CoordinateX = 0; > - CoordinateY = 0; > - if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { > - Attribute = EfiBadgingDisplayAttributeCenter; > - } else { > - Attribute = EfiBadgingDisplayAttributeCustomized; > - } > - } > - > - if (Blt != NULL) { > - FreePool (Blt); > - } > - Blt = NULL; > - Status = ConvertBmpToGopBlt ( > - ImageData, > - ImageSize, > - (VOID **) &Blt, > - &BltSize, > - &Height, > - &Width > - ); > - if (EFI_ERROR (Status)) { > - FreePool (ImageData); > - > - if (Badging == NULL) { > - return Status; > - } else { > - continue; > - } > - } > - > - // > - // Calculate the display position according to Attribute. > - // > - switch (Attribute) { > - case EfiBadgingDisplayAttributeLeftTop: > - DestX = CoordinateX; > - DestY = CoordinateY; > - break; > - > - case EfiBadgingDisplayAttributeCenterTop: > - DestX = (SizeOfX - Width) / 2; > - DestY = CoordinateY; > - break; > - > - case EfiBadgingDisplayAttributeRightTop: > - DestX = (SizeOfX - Width - CoordinateX); > - DestY = CoordinateY;; > - break; > - > - case EfiBadgingDisplayAttributeCenterRight: > - DestX = (SizeOfX - Width - CoordinateX); > - DestY = (SizeOfY - Height) / 2; > - break; > - > - case EfiBadgingDisplayAttributeRightBottom: > - DestX = (SizeOfX - Width - CoordinateX); > - DestY = (SizeOfY - Height - CoordinateY); > - break; > - > - case EfiBadgingDisplayAttributeCenterBottom: > - DestX = (SizeOfX - Width) / 2; > - DestY = (SizeOfY - Height - CoordinateY); > - break; > - > - case EfiBadgingDisplayAttributeLeftBottom: > - DestX = CoordinateX; > - DestY = (SizeOfY - Height - CoordinateY); > - break; > - > - case EfiBadgingDisplayAttributeCenterLeft: > - DestX = CoordinateX; > - DestY = (SizeOfY - Height) / 2; > - break; > - > - case EfiBadgingDisplayAttributeCenter: > - DestX = (SizeOfX - Width) / 2; > - DestY = (SizeOfY - Height) / 2; > - break; > - > - case EfiBadgingDisplayAttributeCustomized: > - DestX = (SizeOfX - Width) / 2; > - DestY = ((SizeOfY * 382) / 1000) - Height / 2; > - break; > - > - default: > - DestX = CoordinateX; > - DestY = CoordinateY; > - break; > - } > - > - if ((DestX >= 0) && (DestY >= 0)) { > - if (GraphicsOutput != NULL) { > - Status = GraphicsOutput->Blt ( > - GraphicsOutput, > - Blt, > - EfiBltBufferToVideo, > - 0, > - 0, > - (UINTN) DestX, > - (UINTN) DestY, > - Width, > - Height, > - Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) > - ); > - } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { > - Status = UgaDraw->Blt ( > - UgaDraw, > - (EFI_UGA_PIXEL *) Blt, > - EfiUgaBltBufferToVideo, > - 0, > - 0, > - (UINTN) DestX, > - (UINTN) DestY, > - Width, > - Height, > - Width * sizeof (EFI_UGA_PIXEL) > - ); > - } else { > - Status = EFI_UNSUPPORTED; > - } > - > - // > - // Report displayed Logo information. > - // > - if (!EFI_ERROR (Status)) { > - NumberOfLogos++; > - > - if (LogoWidth == 0) { > - // > - // The first Logo. > - // > - LogoDestX = (UINTN) DestX; > - LogoDestY = (UINTN) DestY; > - LogoWidth = Width; > - LogoHeight = Height; > - } else { > - // > - // Merge new logo with old one. > - // > - NewDestX = MIN ((UINTN) DestX, LogoDestX); > - NewDestY = MIN ((UINTN) DestY, LogoDestY); > - NewWidth = MAX ((UINTN) DestX + Width, LogoDestX + LogoWidth) - NewDestX; > - NewHeight = MAX ((UINTN) DestY + Height, LogoDestY + LogoHeight) - NewDestY; > - > - LogoDestX = NewDestX; > - LogoDestY = NewDestY; > - LogoWidth = NewWidth; > - LogoHeight = NewHeight; > - } > - } > - } > - > - FreePool (ImageData); > - > - if (Badging == NULL) { > - break; > - } > - } > - > -Done: > - if (BootLogo == NULL || NumberOfLogos == 0) { > - // > - // No logo displayed. > - // > - if (Blt != NULL) { > - FreePool (Blt); > - } > - > - return Status; > - } > - > - // > - // Advertise displayed Logo information. > - // > - if (NumberOfLogos == 1) { > - // > - // Only one logo displayed, use its Blt buffer directly for BootLogo protocol. > - // > - LogoBlt = Blt; > - Status = EFI_SUCCESS; > - } else { > - // > - // More than one Logo displayed, get merged BltBuffer using VideoToBuffer operation. > - // > - if (Blt != NULL) { > - FreePool (Blt); > - } > - > - // > - // Ensure the LogoHeight * LogoWidth doesn't overflow > - // > - if (LogoHeight > DivU64x64Remainder ((UINTN) ~0, LogoWidth, NULL)) { > - return EFI_UNSUPPORTED; > - } > - BufferSize = MultU64x64 (LogoWidth, LogoHeight); > - > - // > - // Ensure the BufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) doesn't overflow > - // > - if (BufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL))) { > - return EFI_UNSUPPORTED; > - } > - > - LogoBlt = AllocateZeroPool ((UINTN)BufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > - if (LogoBlt == NULL) { > - return EFI_OUT_OF_RESOURCES; > - } > - > - if (GraphicsOutput != NULL) { > - Status = GraphicsOutput->Blt ( > - GraphicsOutput, > - LogoBlt, > - EfiBltVideoToBltBuffer, > - LogoDestX, > - LogoDestY, > - 0, > - 0, > - LogoWidth, > - LogoHeight, > - LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) > - ); > - } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { > - Status = UgaDraw->Blt ( > - UgaDraw, > - (EFI_UGA_PIXEL *) LogoBlt, > - EfiUgaVideoToBltBuffer, > - LogoDestX, > - LogoDestY, > - 0, > - 0, > - LogoWidth, > - LogoHeight, > - LogoWidth * sizeof (EFI_UGA_PIXEL) > - ); > - } else { > - Status = EFI_UNSUPPORTED; > - } > - } > - > - if (!EFI_ERROR (Status)) { > - BootLogo->SetBootLogo (BootLogo, LogoBlt, LogoDestX, LogoDestY, LogoWidth, LogoHeight); > - } > - FreePool (LogoBlt); > - > - return Status; > -} > - > -/** > - Use SystemTable Conout to turn on video based Simple Text Out consoles. The > - Simple Text Out screens will now be synced up with all non video output devices > - > - @retval EFI_SUCCESS UGA devices are back in text mode and synced up. > - > -**/ > -EFI_STATUS > -DisableQuietBoot ( > - VOID > - ) > -{ > - > - // > - // Enable Cursor on Screen > - // > - gST->ConOut->EnableCursor (gST->ConOut, TRUE); > - return EFI_SUCCESS; > -} > - > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-03-22 13:22 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-20 20:35 [PATCH 0/3] ArmPkg/PlatformBootManagerLib: fixes Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 1/3] ArmPkg/PlatformBootManagerLib: dispatch deferred images after EndOfDxe Ard Biesheuvel 2017-03-20 20:35 ` [PATCH 2/3] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly Ard Biesheuvel 2017-03-22 12:53 ` Leif Lindholm 2017-03-22 13:16 ` Ard Biesheuvel 2017-03-22 13:22 ` Leif Lindholm 2017-03-20 20:35 ` [PATCH 3/3] ArmPkg/PlatformBootManagerLib: move to BootLogoLib for boot splash support Ard Biesheuvel 2017-03-22 12:59 ` Leif Lindholm
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox