Skip to contentSkip to conversation

arm/linux-yocto: fix boot failure in qemuarm64-secureboot

PATCH New Jon Mason 1 participant 1 message Jun 5, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm/linux-yocto: fix boot failure in qemuarm64-secureboot

From: Ross Burton <[email protected]>

The boot crash that appears to be triggered by the ZONE_DMA patches has been root-caused, so work around the problem whilst upstream figure out the best way to fix.

Also, upgrade qemuarm64-secureboot to 5.15 instead of pinning back to 5.10.

---
 .../conf/machine/qemuarm64-secureboot.conf    |   2 +-
 .../linux-yocto/skip-unavailable-memory.patch |  47 ++++
 .../linux/linux-yocto/zone_dma_revert.patch   | 218 ------------------
 .../linux/linux-yocto_%.bbappend              |   2 +-
 4 files changed, 49 insertions(+), 220 deletions(-)
 create mode 100644 meta-arm/recipes-kernel/linux/linux-yocto/skip-unavailable-memory.patch
 delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto/zone_dma_revert.patch
meta-arm/conf/machine/qemuarm64-secureboot.conf +1 -1
index c45924a49510..7ca47342943c 100644
@@ -20,4 +20,4 @@ WKS_FILE ?= "qemuarm64.wks"
 WKS_FILE_DEPENDS = "trusted-firmware-a"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
 
-PREFERRED_VERSION_linux-yocto ?= "5.10%"
+MACHINE_FEATURES += "optee-ftpm"
meta-arm/recipes-kernel/linux/linux-yocto/skip-unavailable-memory.patch new file +47 -0

47 lines not on this page · raw message

meta-arm/recipes-kernel/linux/linux-yocto/zone_dma_revert.patch deleted +0 -218

218 lines not on this page · raw message

meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +1 -1
index d215d8b55a00..23bd146be1c9 100644
@@ -14,6 +14,6 @@ SRC_URI:append:qemuarm64-sbsa = " \
 
 FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
 SRC_URI:append:qemuarm64-secureboot = " \
-    file://zone_dma_revert.patch \
+    file://skip-unavailable-memory.patch \
     file://tee.cfg \
     "
Signature · 1 line
2.30.2