Re: [edk2-devel] [PATCH] UefiPayloadPkg: Add macro to support selective driver in UPL

2022-07-05 Thread Lu, James 
Replied as below





Thanks,

James



-Original Message-
From: Ni, Ray 
Sent: Monday, July 4, 2022 11:34 AM
To: Lu, James ; devel@edk2.groups.io
Cc: Dong, Guo ; Guo, Gua 
Subject: RE: [PATCH] UefiPayloadPkg: Add macro to support selective driver in 
UPL



>

> +!if $(GENERIC_MEMORY_TEST_ENABLE) == TRUE

>

> +

> MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/Generic

> MemoryTestDxe.inf

>

> +!endif

>

> +!if $(NULL_MEMORY_TEST_ENABLE) == TRUE

>

>

> MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryT

> estDxe.inf

>

> +!endif



1. Is there a configuration that both GENERIC and NULL memory test is FALSE?

If no, can we add a macro like "MEMORY_TEST" and its value could be "GENERIC" 
or "NULL"?

[James]

Will resolve in patch v2





> +!if $(ATA_ENABLE) == TRUE

>

>MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf

>

>MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

>

>MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf



2. AtaAtapiPassThru also produces "gEfiExtScsiPassThruProtocolGuid" which is 
used by ScsiBusDxe.

So, maybe we need to always include AtaAtapiPassThru driver.

[James]

This is to align client case that AtaAtapiPassThru.inf will not be included 
while ATA_ENABLE == FALSE

And ScsiBusDxe is taken care the flow while gEfiExtScsiPassThruProtocolGuid not 
existing



>

>#

>

># Usb Support

>

> @@ -671,7 +685,9 @@

>  !if $(PS2_KEYBOARD_ENABLE) == TRUE

>

>MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf

>

>  !endif

>

> +!if $(PS2_MOUSE_ENABLE) == TRUE

>

>MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf

>

> +!endif

>

>

>

>#

>

># Console Support

>

> @@ -742,12 +758,14 @@

>#  This should be FALSE for compiling the dynamic command.

>

>gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

>

>}

>

> +!if $(PERFORMANCE_MEASUREMENT_ENABLE) == TRUE



3. Thanks for catching that.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91059): https://edk2.groups.io/g/devel/message/91059
Mute This Topic: https://groups.io/mt/92047211/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] UefiPayloadPkg: Add macro to support selective driver in UPL

2022-07-03 Thread Ni, Ray 
> 
> +!if $(GENERIC_MEMORY_TEST_ENABLE) == TRUE
> 
> +
> MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/Generic
> MemoryTestDxe.inf
> 
> +!endif
> 
> +!if $(NULL_MEMORY_TEST_ENABLE) == TRUE
> 
> 
> MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryT
> estDxe.inf
> 
> +!endif

1. Is there a configuration that both GENERIC and NULL memory test is FALSE?
If no, can we add a macro like "MEMORY_TEST" and its value could be
"GENERIC" or "NULL"?



> +!if $(ATA_ENABLE) == TRUE
> 
>MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
> 
>MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
> 
>MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

2. AtaAtapiPassThru also produces "gEfiExtScsiPassThruProtocolGuid" which is 
used by ScsiBusDxe.
So, maybe we need to always include AtaAtapiPassThru driver. 
> 
>#
> 
># Usb Support
> 
> @@ -671,7 +685,9 @@
>  !if $(PS2_KEYBOARD_ENABLE) == TRUE
> 
>MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
> 
>  !endif
> 
> +!if $(PS2_MOUSE_ENABLE) == TRUE
> 
>MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
> 
> +!endif
> 
> 
> 
>#
> 
># Console Support
> 
> @@ -742,12 +758,14 @@
>#  This should be FALSE for compiling the dynamic command.
> 
>gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> 
>}
> 
> +!if $(PERFORMANCE_MEASUREMENT_ENABLE) == TRUE

3. Thanks for catching that.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91023): https://edk2.groups.io/g/devel/message/91023
Mute This Topic: https://groups.io/mt/92047211/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH] UefiPayloadPkg: Add macro to support selective driver in UPL

2022-06-28 Thread james . lu 
From: James Lu 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3967

Add macros to decide modules built into UPL.elf.

Macro list:
 - GENERIC_MEMORY_TEST_ENABLE: GenericMemoryTestDxe
 - NULL_MEMORY_TEST_ENABLE: NullMemoryTestDxe
 - ATA_ENABLE: SataControllerDxe, AtaBusDxe, AtaAtapiPassThruDxe
 - SD_ENABLE: SdMmcPciDxe, EmmcDxe, SdDxe
 - PS2_MOUSE_ENABLE: Ps2MouseDxe

Cc: Guo Dong 
Cc: Ray Ni 
Cc: Gua Guo 
Signed-off-by: James Lu 
---
 UefiPayloadPkg/UefiPayloadPkg.dsc | 18 ++
 UefiPayloadPkg/UefiPayloadPkg.fdf | 15 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc 
b/UefiPayloadPkg/UefiPayloadPkg.dsc
index cfcf38578d..9e94a40d72 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -36,6 +36,11 @@
   DEFINE PLATFORM_BOOT_TIMEOUT= 3
   DEFINE ABOVE_4G_MEMORY  = TRUE
   DEFINE BOOT_MANAGER_ESCAPE  = FALSE
+  DEFINE GENERIC_MEMORY_TEST_ENABLE   = FALSE
+  DEFINE NULL_MEMORY_TEST_ENABLE  = TRUE
+  DEFINE ATA_ENABLE   = TRUE
+  DEFINE SD_ENABLE= TRUE
+  DEFINE PS2_MOUSE_ENABLE = TRUE
   DEFINE SD_MMC_TIMEOUT   = 100
   #
   # SBL:  UEFI payload for Slim Bootloader
@@ -596,7 +601,12 @@
   
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
   UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+!if $(GENERIC_MEMORY_TEST_ENABLE) == TRUE
+  
MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf
+!endif
+!if $(NULL_MEMORY_TEST_ENABLE) == TRUE
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+!endif
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
@@ -631,9 +641,11 @@
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+!if $(ATA_ENABLE) == TRUE
   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
+!endif
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
@@ -644,9 +656,11 @@
   #
   # SD/eMMC Support
   #
+!if $(SD_ENABLE) == TRUE
   MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
   MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
   MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+!endif
 
   #
   # Usb Support
@@ -671,7 +685,9 @@
 !if $(PS2_KEYBOARD_ENABLE) == TRUE
   MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
 !endif
+!if $(PS2_MOUSE_ENABLE) == TRUE
   MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+!endif
 
   #
   # Console Support
@@ -742,12 +758,14 @@
   #  This should be FALSE for compiling the dynamic command.
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
   }
+!if $(PERFORMANCE_MEASUREMENT_ENABLE) == TRUE
   ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
 
   ## This flag is used to control initialization of the shell library
   #  This should be FALSE for compiling the dynamic command.
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
   }
+!endif
   ShellPkg/Application/Shell/Shell.inf {
 
   ## This flag is used to control initialization of the shell library
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf 
b/UefiPayloadPkg/UefiPayloadPkg.fdf
index c7b04978ad..5aa228e828 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -149,7 +149,12 @@ INF 
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
 
 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
 INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+!if $(GENERIC_MEMORY_TEST_ENABLE) == TRUE
+INF  
MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf
+!endif
+!if $(NULL_MEMORY_TEST_ENABLE) == TRUE
+INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+!endif
 INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
@@ -176,7 +181,9 @@ INF OvmfPkg/SioBusDxe/SioBusDxe.inf
 !if $(PS2_KEYBOARD_ENABLE) == TRUE
 INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
 !endif
+!if $(PS2_MOUSE_ENABLE) == TRUE
 INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+!endif
 
 #
 # Console Support
@@ -195,9 +202,11 @@ INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
 INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
 INF