remove QEMU_CORE_NUM support for SBSA as it is hardcoded anyway...

Author: kuqin12

Platforms/QemuSbsaPkg/PlatformBuild.py

@@ -322,7 +322,6 @@ def SetPlatformEnv(self):
         self.env.SetValue("BUILDREPORT_TYPES", "PCD DEPEX FLASH BUILD_FLAGS LIBRARY FIXED_ADDRESS HASH", "Setting build report types")
         self.env.SetValue("ARM_TFA_PATH", str(Path(self.GetWorkspaceRoot()) / "Silicon" / "Arm" / "TFA"), "Platform hardcoded")
         self.env.SetValue("ARM_HAF_PATH", str(Path(self.GetWorkspaceRoot()) / "Silicon" / "Arm" / "HAF"), "Platform hardcoded")
-        self.env.SetValue("BLD_*_QEMU_CORE_NUM", "4", "Default")
         self.env.SetValue("BLD_*_MEMORY_PROTECTION", "TRUE", "Default")
         # Include the MFCI test cert by default, override on the commandline with "BLD_*_SHIP_MODE=TRUE" if you want the retail MFCI cert
         self.env.SetValue("BLD_*_SHIP_MODE", "FALSE", "Default")

Platforms/QemuSbsaPkg/Plugins/QemuRunner/QemuRunner.py

@@ -117,8 +117,10 @@ def Runner(env):
 
         args += " -machine sbsa-ref" #,accel=(tcg|kvm)"
         args += " -cpu max,sve=off,sme=off"
-        if env.GetBuildValue ("QEMU_CORE_NUM") is not None:
-          args += " -smp " + env.GetBuildValue ("QEMU_CORE_NUM")
+        # Hardcoded to 4 cores for now, changing this also needs to pair with the ARM_CORE_INFO data
+        # in SbsaQemuLib.c, otherwise the MP services protocol will be initialized with the wrong number
+        # of cores and cause issues with some tests that rely on it.
+        args += " -smp 4"
         args += " -global driver=cfi.pflash01,property=secure,value=on"
         args += " -drive if=pflash,format=raw,unit=0,file=" + \
             os.path.join(OutputPath_FV, "SECURE_FLASH0.fd")

Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc

@@ -653,7 +653,7 @@
 
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000
-  gArmPlatformTokenSpaceGuid.PcdCoreCount|$(QEMU_CORE_NUM)
+  gArmPlatformTokenSpaceGuid.PcdCoreCount|4
 
   #
   # ARM PrimeCell