Vlv2TbltDevicePkg: Fix SOURCE_DEBUG_ENABLE feature

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

Fix library mapping and PCD settings required to use
the SOURCE_DEBUG_ENABLE feature in PEI, DXE, and SMM.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 5b5523f904aa25c3c45d7f7607d5754a7febb524..9ec3f3b2825816cff0c7a565e7cb527c6a3311df 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -338,8 +338,9 @@
 \r
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
 \r
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r

-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf\r
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
+  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
+!endif\r

 \r
  !if $(MINNOW2_FSP_BUILD) == TRUE\r
  PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf\r
 \r
  !if $(MINNOW2_FSP_BUILD) == TRUE\r
  PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf\r


@@ -439,11 +440,6 @@
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
 !endif\r
 \r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
 !endif\r
 \r

-!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
-  TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf\r
-!endif\r
-\r

 [LibraryClasses.IA32.DXE_RUNTIME_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
 [LibraryClasses.IA32.DXE_RUNTIME_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r


@@ -616,6 +612,10 @@
 \r
   gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE\r
 \r
 \r
   gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE\r
 \r

+!if $(SOURCE_DEBUG_ENABLE)\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE\r
+!endif\r
+\r

 [PcdsFixedAtBuild.common]\r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
 # $(FLASH_REGION_VLVMICROCODE_BASE)\r
 [PcdsFixedAtBuild.common]\r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
 # $(FLASH_REGION_VLVMICROCODE_BASE)\r


@@ -694,6 +694,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE\r

+  gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|2\r

 !endif\r
 \r
 [PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r
 !endif\r
 \r
 [PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index cd9dee0ebf9eaec54e0f24818c5f2b021b54abaa..807860f72f3b386da9ba3f44e5b4a3caa0b0804b 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -338,8 +338,9 @@
 \r
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
 \r
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r

-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf\r
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
+  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
+!endif\r

 \r
  !if $(MINNOW2_FSP_BUILD) == TRUE\r
  PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf\r
 \r
  !if $(MINNOW2_FSP_BUILD) == TRUE\r
  PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf\r


@@ -439,11 +440,6 @@
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
 !endif\r
 \r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
 !endif\r
 \r

-!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
-  TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf\r
-!endif\r
-\r

 [LibraryClasses.X64.DXE_RUNTIME_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
 [LibraryClasses.X64.DXE_RUNTIME_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r


@@ -616,6 +612,10 @@
 \r
   gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE\r
 \r
 \r
   gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE\r
 \r

+!if $(SOURCE_DEBUG_ENABLE)\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE\r
+!endif\r
+\r

 [PcdsFixedAtBuild.common]\r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
 # $(FLASH_REGION_VLVMICROCODE_BASE)\r
 [PcdsFixedAtBuild.common]\r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
 # $(FLASH_REGION_VLVMICROCODE_BASE)\r


@@ -694,6 +694,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE\r

+  gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|2\r

 !endif\r
 \r
 [PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r
 !endif\r
 \r
 [PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r


@@ -1152,9 +1153,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(CAPSULE_ENABLE) == TRUE\r
   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {\r
     <LibraryClasses>\r
 !if $(CAPSULE_ENABLE) == TRUE\r
   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {\r
     <LibraryClasses>\r

-    PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-    MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
-    HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+      MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+      HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
+      DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
+!endif\r

   }\r
 !endif\r
 \r
   }\r
 !endif\r
 \r