update SBSA as well

Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc

@@ -741,8 +741,7 @@
   # Bit 0 - Controls whether the debugger will break in on initialization.
   # Bit 1 - Controls whether the DXE debugger is enabled.
   # Bit 2 - Controls whether the MM debugger is enabled.
-  # Bit 3 - Controls whether the debugger runs in minimal mode. If enabled, the
-  #         debugger will avoid using protocols and depend on static linked functionality.
+  # Bit 3 - Disables the debuggers periodic polling for a requested break-in.
   DebuggerFeaturePkgTokenSpaceGuid.PcdDebugConfigFlags|0x2
 
   # Set the debugger timeout to wait forever. This only takes effect if Bit 0 of PcdDebugConfigFlags is set

Platforms/QemuSbsaPkg/Plugins/QemuRunner/QemuRunner.py

@@ -132,7 +132,7 @@ def Runner(env):
             args += " -gdb tcp::" + gdb_port
 
         # write ConOut messages to telnet localhost port
-        serial_port = env.GetValue("SERIAL_PORT")
+        serial_port = env.GetValue("SERIAL_PORT", "50001")
         if serial_port != None:
             args += " -serial tcp:127.0.0.1:" + serial_port + ",server,nowait"
         else:

Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc

@@ -50,9 +50,14 @@
   # Defines for default states.  These can be changed on the command line.
   # -D FLAG=VALUE
   #
-  !ifndef DEBUGGER_ENABLED
-    DEFINE DEBUGGER_ENABLED               = FALSE
-  !endif
+
+  #
+  # DXE_DBG_BRK will force the DXE debugger to break in as early as possible and wait indefinitely
+  #
+!ifndef DXE_DBG_BRK
+  DEFINE DXE_DBG_BRK = FALSE
+!endif
+
   DEFINE TTY_TERMINAL            = FALSE
   DEFINE TPM2_ENABLE             = FALSE
   DEFINE TPM2_CONFIG_ENABLE      = FALSE
@@ -588,11 +593,7 @@
   # CLEAR_MEMORY_ENABLED       0x08
   # ASSERT_BREAKPOINT_ENABLED  0x10
   # ASSERT_DEADLOOP_ENABLED    0x20
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff
-!endif
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
 
 [PcdsFixedAtBuild.common]
   !include QemuPkg/AutoGen/SecurebootPcds.inc
@@ -795,6 +796,19 @@
   # Set this to be gOemConfigPolicyGuid
   gSetupDataPkgTokenSpaceGuid.PcdConfigurationPolicyGuid|{GUID("ba320ade-e132-4c99-a3df-74d673ea6f76")}
 
+  ## Controls the debug configuration flags.
+  # Bit 0 - Controls whether the debugger will break in on initialization.
+  # Bit 1 - Controls whether the DXE debugger is enabled.
+  # Bit 2 - Controls whether the MM debugger is enabled.
+  # Bit 3 - Disables the debuggers periodic polling for a requested break-in.
+  # For SBSA, we have to disable the periodic polling, because there is only one one serial port and the debug agent
+  # may eat console input if let poll on it
+  DebuggerFeaturePkgTokenSpaceGuid.PcdDebugConfigFlags|0x6
+
+  # Set the debugger timeout to wait forever. This only takes effect if Bit 0 of PcdDebugConfigFlags is set
+  # to 1, which by default it is not. Using BLD_*_DXE_DBG_BRK=TRUE will set this to 1.
+  DebuggerFeaturePkgTokenSpaceGuid.PcdInitialBreakpointTimeoutMs|0
+
 [PcdsFixedAtBuild.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId|"Palindrome"
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId|0x756D6551754D #MuQemuArm
@@ -868,10 +882,8 @@
     gEfiMdeModulePkgTokenSpaceGuid.PcdDeviceStateBitmask|0x20
   !endif
 
-  # Set to debug if debugger is enabled.
-  !if $(DEBUGGER_ENABLED) == TRUE
-    gEfiMdeModulePkgTokenSpaceGuid.PcdDeviceStateBitmask|0x08
-  !endif
+  # Set to debug as debugger is enabled.
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDeviceStateBitmask|0x08
 
   #
   # TPM2 support
@@ -980,6 +992,13 @@
     <LibraryClasses>
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+    <PcdsFixedAtBuild>
+      ## Forcibly enables the debugger with a 30 second initial breakpoint. This can be set from the cmdline by passing
+      # BLD_*_DXE_DBG_BRK=TRUE. If this is false, the debugger will not have an initial break in, but will break in
+      # on exceptions
+      !if $(DXE_DBG_BRK) == TRUE
+        DebuggerFeaturePkgTokenSpaceGuid.PcdDebugConfigFlags|0x7
+      !endif
   }
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
     <LibraryClasses>