| Message ID | 20260406151620.99679-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm-bsp/sbsa-ref: workaround CPU topology warning | expand |
On Mon, 06 Apr 2026 11:16:19 -0400, Jon Mason wrote: > 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: cab9d2db3f5b63c726c9e2b1748745fb9cf3d22d Best regards,
diff --git a/meta-arm-bsp/conf/machine/sbsa-ref.conf b/meta-arm-bsp/conf/machine/sbsa-ref.conf index d05e44677e0d..1f86cdb6e0e7 100644 --- a/meta-arm-bsp/conf/machine/sbsa-ref.conf +++ b/meta-arm-bsp/conf/machine/sbsa-ref.conf @@ -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@"
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. Signed-off-by: Jon Mason <jon.mason@arm.com> --- meta-arm-bsp/conf/machine/sbsa-ref.conf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)