arm-bsp/sbsa-ref: workaround CPU topology warning
PATCH 1/2 arm-bsp/sbsa-ref: workaround CPU topology warning
To workaround the CPU topology issue with edk2-firmware, we can specify the number of processors being used, which seems to setup the CPU topology mask correctly (and thus no errors). With this addressed, we can use the latest edk2 firmware, which allows us to use the latest TF-A version.
--- meta-arm-bsp/conf/machine/sbsa-ref.conf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
meta-arm-bsp/conf/machine/sbsa-ref.conf +1 -8
@@ -25,19 +25,12 @@ EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boo SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" -# FIXME - when compiling edk2, we're seeing an error of fip.bin being larger than the region size. -# Pin the version back until this can be resolved -PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" - EXTRA_IMAGEDEPENDS += "edk2-firmware" -# FIXME - Currently seeing a kernel warning for the CPU topology when bumping -# the version past this. The issue is being tracked in -# https://github.com/tianocore/edk2-platforms/issues/752 -PREFERRED_VERSION_edk2-firmware ?= "202408%" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine sbsa-ref" QB_CPU = "-cpu neoverse-n2" +QB_SMP = "-smp 4" QB_MEM = "-m 1024" QB_DEFAULT_FSTYPE = "wic.qcow2" QB_NETWORK_DEVICE = "-device e1000e,netdev=net0,mac=@MAC@"
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH 2/2 arm-bsp/edk2-firmware: remove 202408
Nothing in meta-arm-bsp is using this version anymore. Drop it and the related patches.
--- .../recipes-bsp/uefi/edk2-firmware_202408.bb | 12 ----- .../0001-BaseTools-Pccts-set-C-standard.patch | 47 ------------------- .../0001-Platform-StMmRpmb-Fix-build.patch | 38 --------------- 3 files changed, 97 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-StMmRpmb-Fix-build.patch
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb deleted +0 -12
@@ -1,12 +0,0 @@ -require recipes-bsp/uefi/edk2-firmware.inc - -SRCREV_edk2 ?= "b158dad150bf02879668f72ce306445250838201" -SRCREV_edk2-platforms ?= "a3c898956a4d48dc5980336fa6ce6eeb23c4f72b" - -SRC_URI += "file://0001-Platform-StMmRpmb-Fix-build.patch;patchdir=edk2-platforms \ - file://0001-BaseTools-Pccts-set-C-standard.patch" - -# FIXME: -# ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c:146:37: -# error: variable 'ContainedElements' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer] -TOOLCHAIN:aarch64 = "gcc"
meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch deleted +0 -47
47 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-StMmRpmb-Fix-build.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From ee185eda7b7ec9a0c82827fea197fbb73d971f93 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <[email protected]> -Date: Thu, 29 Aug 2024 21:21:50 +0200 -Subject: [PATCH] Platform/StMmRpmb: Fix build - -Add some missing library class resolutions relating to changes in the -core upstream EDK2 repo. - -Signed-off-by: Ard Biesheuvel <[email protected]> -Reviewed-by: Ilias Apalodimas <[email protected]> ---- - .../PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc | 3 +++ - 1 file changed, 3 insertions(+) - -Upstream-Status: Backport - -diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -index 653029c52f..54c7a63b41 100644 ---- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -+++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -@@ -41,11 +41,14 @@ - ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf - FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf - HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf -+ HobPrintLib|MdeModulePkg/Library/HobPrintLib/HobPrintLib.inf -+ ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf - NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf - MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf - MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf -+ PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf --- -2.43.0 -
Signature · 1 line
2.50.1 (Apple Git-155)
Jon Mason
AppliedQuoted 8 lines · Jon Mason
To workaround the CPU topology issue with edk2-firmware, we can specify the number of processors being used, which seems to setup the CPU topology mask correctly (and thus no errors). With this addressed, we can use the latest edk2 firmware, which allows us to use the latest TF-A version.
[...]
Applied, thanks!
[1/2] arm-bsp/sbsa-ref: workaround CPU topology warning
commit: 116c26c80364e3004d00eb48e0236db5f2b0501a
[2/2] arm-bsp/edk2-firmware: remove 202408
commit: cab9d2db3f5b63c726c9e2b1748745fb9cf3d22dBest regards,
Signature · 1 line
Jon Mason <[email protected]>