mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-05 02:20:30 +00:00
arm/linux-yocto: fix boot failure in qemuarm64-secureboot
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. Signed-off-by: Ross Burton <ross.burton@arm.com>
This commit is contained in:
Ross Burton
Jon Mason
@@ -23,5 +23,3 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
|
||||
IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
|
||||
|
||||
MACHINE_FEATURES += "optee-ftpm"
|
||||
|
||||
PREFERRED_VERSION_linux-yocto ?= "5.10%"
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
When in secure mode, qemu's devicetree has the following node to mark the
|
||||
secure memory as off-limits to non-secure environments:
|
||||
|
||||
secram@e000000 {
|
||||
secure-status = "okay";
|
||||
status = "disabled";
|
||||
reg = <0x00 0xe000000 0x00 0x1000000>;
|
||||
device_type = "memory";
|
||||
};
|
||||
|
||||
However, the kernel doesn't think that means the memory is off-limits:
|
||||
|
||||
Early memory node ranges
|
||||
node 0: [mem 0x000000000e000000-0x000000000e0fffff]
|
||||
|
||||
And not far into the boot accesses this region and crashes:
|
||||
|
||||
Internal error: synchronous external abort: 96000050 15 PREEMPT SMP
|
||||
|
||||
This used to work more through luck than judgement, but recent changes to
|
||||
memory zoning[1] means this region is accessed more frequently.
|
||||
|
||||
At present there is debate between qemu and kernel engineers over whether
|
||||
the kernel should be ignoring regions marked like this, or if qemu
|
||||
should block out the region in a different way. Until this is resolved,
|
||||
we can make a choice and simply ignore memory ranges that are marked
|
||||
as disabled.
|
||||
|
||||
Upstream-Status: Pending [discussion ongoing]
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=35ec3d09ff6a49ee90e1bfd09166596f017eb5bb
|
||||
|
||||
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
|
||||
index 59a7a9ee58ef..d151a31adbf9 100644
|
||||
--- a/drivers/of/fdt.c
|
||||
+++ b/drivers/of/fdt.c
|
||||
@@ -1102,6 +1102,9 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
|
||||
if (type == NULL || strcmp(type, "memory") != 0)
|
||||
return 0;
|
||||
|
||||
+ if (!of_fdt_device_is_available(initial_boot_params, node))
|
||||
+ return 0;
|
||||
+
|
||||
reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);
|
||||
if (reg == NULL)
|
||||
reg = of_get_flat_dt_prop(node, "reg", &l);
|
||||
@@ -1,218 +0,0 @@
|
||||
Revert ZONE_DMA patches
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Jon Mason <jon.mason@arm.com>
|
||||
|
||||
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
|
||||
index fce8cbecd6bc..a884d7773989 100644
|
||||
--- a/arch/arm64/include/asm/processor.h
|
||||
+++ b/arch/arm64/include/asm/processor.h
|
||||
@@ -96,7 +96,8 @@
|
||||
#endif /* CONFIG_ARM64_FORCE_52BIT */
|
||||
|
||||
extern phys_addr_t arm64_dma_phys_limit;
|
||||
-#define ARCH_LOW_ADDRESS_LIMIT (arm64_dma_phys_limit - 1)
|
||||
+extern phys_addr_t arm64_dma32_phys_limit;
|
||||
+#define ARCH_LOW_ADDRESS_LIMIT ((arm64_dma_phys_limit ? : arm64_dma32_phys_limit) - 1)
|
||||
|
||||
struct debug_info {
|
||||
#ifdef CONFIG_HAVE_HW_BREAKPOINT
|
||||
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
|
||||
index a985d292e820..7fbb9c85af8a 100644
|
||||
--- a/arch/arm64/mm/init.c
|
||||
+++ b/arch/arm64/mm/init.c
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <linux/kexec.h>
|
||||
#include <linux/crash_dump.h>
|
||||
#include <linux/hugetlb.h>
|
||||
-#include <linux/acpi_iort.h>
|
||||
|
||||
#include <asm/boot.h>
|
||||
#include <asm/fixmap.h>
|
||||
@@ -43,6 +42,8 @@
|
||||
#include <asm/tlb.h>
|
||||
#include <asm/alternative.h>
|
||||
|
||||
+#define ARM64_ZONE_DMA_BITS 30
|
||||
+
|
||||
/*
|
||||
* We need to be able to catch inadvertent references to memstart_addr
|
||||
* that occur (potentially in generic code) before arm64_memblock_init()
|
||||
@@ -53,13 +54,13 @@ s64 memstart_addr __ro_after_init = -1;
|
||||
EXPORT_SYMBOL(memstart_addr);
|
||||
|
||||
/*
|
||||
- * If the corresponding config options are enabled, we create both ZONE_DMA
|
||||
- * and ZONE_DMA32. By default ZONE_DMA covers the 32-bit addressable memory
|
||||
- * unless restricted on specific platforms (e.g. 30-bit on Raspberry Pi 4).
|
||||
- * In such case, ZONE_DMA32 covers the rest of the 32-bit addressable memory,
|
||||
- * otherwise it is empty.
|
||||
+ * We create both ZONE_DMA and ZONE_DMA32. ZONE_DMA covers the first 1G of
|
||||
+ * memory as some devices, namely the Raspberry Pi 4, have peripherals with
|
||||
+ * this limited view of the memory. ZONE_DMA32 will cover the rest of the 32
|
||||
+ * bit addressable memory area.
|
||||
*/
|
||||
phys_addr_t arm64_dma_phys_limit __ro_after_init;
|
||||
+phys_addr_t arm64_dma32_phys_limit __ro_after_init;
|
||||
|
||||
#ifdef CONFIG_KEXEC_CORE
|
||||
/*
|
||||
@@ -84,7 +85,7 @@ static void __init reserve_crashkernel(void)
|
||||
|
||||
if (crash_base == 0) {
|
||||
/* Current arm64 boot protocol requires 2MB alignment */
|
||||
- crash_base = memblock_find_in_range(0, arm64_dma_phys_limit,
|
||||
+ crash_base = memblock_find_in_range(0, arm64_dma32_phys_limit,
|
||||
crash_size, SZ_2M);
|
||||
if (crash_base == 0) {
|
||||
pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
|
||||
@@ -187,24 +188,15 @@ static phys_addr_t __init max_zone_phys(unsigned int zone_bits)
|
||||
static void __init zone_sizes_init(unsigned long min, unsigned long max)
|
||||
{
|
||||
unsigned long max_zone_pfns[MAX_NR_ZONES] = {0};
|
||||
- unsigned int __maybe_unused acpi_zone_dma_bits;
|
||||
- unsigned int __maybe_unused dt_zone_dma_bits;
|
||||
- phys_addr_t __maybe_unused dma32_phys_limit = max_zone_phys(32);
|
||||
|
||||
#ifdef CONFIG_ZONE_DMA
|
||||
- acpi_zone_dma_bits = fls64(acpi_iort_dma_get_max_cpu_address());
|
||||
- dt_zone_dma_bits = fls64(of_dma_get_max_cpu_address(NULL));
|
||||
- zone_dma_bits = min3(32U, dt_zone_dma_bits, acpi_zone_dma_bits);
|
||||
+ zone_dma_bits = ARM64_ZONE_DMA_BITS;
|
||||
arm64_dma_phys_limit = max_zone_phys(zone_dma_bits);
|
||||
max_zone_pfns[ZONE_DMA] = PFN_DOWN(arm64_dma_phys_limit);
|
||||
#endif
|
||||
#ifdef CONFIG_ZONE_DMA32
|
||||
- max_zone_pfns[ZONE_DMA32] = PFN_DOWN(dma32_phys_limit);
|
||||
- if (!arm64_dma_phys_limit)
|
||||
- arm64_dma_phys_limit = dma32_phys_limit;
|
||||
+ max_zone_pfns[ZONE_DMA32] = PFN_DOWN(arm64_dma32_phys_limit);
|
||||
#endif
|
||||
- if (!arm64_dma_phys_limit)
|
||||
- arm64_dma_phys_limit = PHYS_MASK + 1;
|
||||
max_zone_pfns[ZONE_NORMAL] = max;
|
||||
|
||||
free_area_init(max_zone_pfns);
|
||||
@@ -398,9 +390,16 @@ void __init arm64_memblock_init(void)
|
||||
|
||||
early_init_fdt_scan_reserved_mem();
|
||||
|
||||
+ if (IS_ENABLED(CONFIG_ZONE_DMA32))
|
||||
+ arm64_dma32_phys_limit = max_zone_phys(32);
|
||||
+ else
|
||||
+ arm64_dma32_phys_limit = PHYS_MASK + 1;
|
||||
+
|
||||
reserve_elfcorehdr();
|
||||
|
||||
high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
|
||||
+
|
||||
+ dma_contiguous_reserve(arm64_dma32_phys_limit);
|
||||
}
|
||||
|
||||
void __init bootmem_init(void)
|
||||
@@ -435,11 +434,6 @@ void __init bootmem_init(void)
|
||||
sparse_init();
|
||||
zone_sizes_init(min, max);
|
||||
|
||||
- /*
|
||||
- * Reserve the CMA area after arm64_dma_phys_limit was initialised.
|
||||
- */
|
||||
- dma_contiguous_reserve(arm64_dma_phys_limit);
|
||||
-
|
||||
/*
|
||||
* request_standard_resources() depends on crashkernel's memory being
|
||||
* reserved, so do it here.
|
||||
@@ -522,7 +516,7 @@ static void __init free_unused_memmap(void)
|
||||
void __init mem_init(void)
|
||||
{
|
||||
if (swiotlb_force == SWIOTLB_FORCE ||
|
||||
- max_pfn > PFN_DOWN(arm64_dma_phys_limit))
|
||||
+ max_pfn > PFN_DOWN(arm64_dma_phys_limit ? : arm64_dma32_phys_limit))
|
||||
swiotlb_init(1);
|
||||
else
|
||||
swiotlb_force = SWIOTLB_NO_FORCE;
|
||||
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
|
||||
index 2494138a6905..94f34109695c 100644
|
||||
--- a/drivers/acpi/arm64/iort.c
|
||||
+++ b/drivers/acpi/arm64/iort.c
|
||||
@@ -1730,58 +1730,3 @@ void __init acpi_iort_init(void)
|
||||
|
||||
iort_init_platform_devices();
|
||||
}
|
||||
-
|
||||
-#ifdef CONFIG_ZONE_DMA
|
||||
-/*
|
||||
- * Extract the highest CPU physical address accessible to all DMA masters in
|
||||
- * the system. PHYS_ADDR_MAX is returned when no constrained device is found.
|
||||
- */
|
||||
-phys_addr_t __init acpi_iort_dma_get_max_cpu_address(void)
|
||||
-{
|
||||
- phys_addr_t limit = PHYS_ADDR_MAX;
|
||||
- struct acpi_iort_node *node, *end;
|
||||
- struct acpi_table_iort *iort;
|
||||
- acpi_status status;
|
||||
- int i;
|
||||
-
|
||||
- if (acpi_disabled)
|
||||
- return limit;
|
||||
-
|
||||
- status = acpi_get_table(ACPI_SIG_IORT, 0,
|
||||
- (struct acpi_table_header **)&iort);
|
||||
- if (ACPI_FAILURE(status))
|
||||
- return limit;
|
||||
-
|
||||
- node = ACPI_ADD_PTR(struct acpi_iort_node, iort, iort->node_offset);
|
||||
- end = ACPI_ADD_PTR(struct acpi_iort_node, iort, iort->header.length);
|
||||
-
|
||||
- for (i = 0; i < iort->node_count; i++) {
|
||||
- if (node >= end)
|
||||
- break;
|
||||
-
|
||||
- switch (node->type) {
|
||||
- struct acpi_iort_named_component *ncomp;
|
||||
- struct acpi_iort_root_complex *rc;
|
||||
- phys_addr_t local_limit;
|
||||
-
|
||||
- case ACPI_IORT_NODE_NAMED_COMPONENT:
|
||||
- ncomp = (struct acpi_iort_named_component *)node->node_data;
|
||||
- local_limit = DMA_BIT_MASK(ncomp->memory_address_limit);
|
||||
- limit = min_not_zero(limit, local_limit);
|
||||
- break;
|
||||
-
|
||||
- case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
|
||||
- if (node->revision < 1)
|
||||
- break;
|
||||
-
|
||||
- rc = (struct acpi_iort_root_complex *)node->node_data;
|
||||
- local_limit = DMA_BIT_MASK(rc->memory_address_limit);
|
||||
- limit = min_not_zero(limit, local_limit);
|
||||
- break;
|
||||
- }
|
||||
- node = ACPI_ADD_PTR(struct acpi_iort_node, node, node->length);
|
||||
- }
|
||||
- acpi_put_table(&iort->header);
|
||||
- return limit;
|
||||
-}
|
||||
-#endif
|
||||
diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h
|
||||
index 1a12baa58e40..20a32120bb88 100644
|
||||
--- a/include/linux/acpi_iort.h
|
||||
+++ b/include/linux/acpi_iort.h
|
||||
@@ -38,7 +38,6 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *size);
|
||||
const struct iommu_ops *iort_iommu_configure_id(struct device *dev,
|
||||
const u32 *id_in);
|
||||
int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head);
|
||||
-phys_addr_t acpi_iort_dma_get_max_cpu_address(void);
|
||||
#else
|
||||
static inline void acpi_iort_init(void) { }
|
||||
static inline u32 iort_msi_map_id(struct device *dev, u32 id)
|
||||
@@ -56,9 +55,6 @@ static inline const struct iommu_ops *iort_iommu_configure_id(
|
||||
static inline
|
||||
int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
|
||||
{ return 0; }
|
||||
-
|
||||
-static inline phys_addr_t acpi_iort_dma_get_max_cpu_address(void)
|
||||
-{ return PHYS_ADDR_MAX; }
|
||||
#endif
|
||||
|
||||
#endif /* __ACPI_IORT_H__ */
|
||||
@@ -8,7 +8,7 @@ SRC_URI:append:generic-arm64 = " \
|
||||
|
||||
FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
|
||||
SRC_URI:append:qemuarm64-secureboot = " \
|
||||
file://zone_dma_revert.patch \
|
||||
file://skip-unavailable-memory.patch \
|
||||
file://tee.cfg \
|
||||
"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user