Skip to contentSkip to conversation

arm-bsp/fvp-base-arm32: Update kernel patch for v5.19

PATCH Applied Jon Mason 2 participants 4 messages Aug 11, 2022 – Aug 15, 2022 Arm/versatile express platform

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/3 arm-bsp/fvp-base-arm32: Update kernel patch for v5.19

In newer kernels, vexpress has been rolled under the versatile umbrella. Update the patch to refer to the new location

---
 .../0001-ARM-vexpress-enable-GICv3.patch      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch +10 -10
index d0a05c24..184a7631 100644
@@ -1,4 +1,4 @@
-From 5dbb6c4267b1e46ed08359be363d8bc9b6a79397 Mon Sep 17 00:00:00 2001
+From 9fe529a146f4528ec80a3d04588e387f3651dc22 Mon Sep 17 00:00:00 2001
 From: Ryan Harkin <[email protected]>
 Date: Wed, 16 Nov 2016 14:43:02 +0000
 Subject: [PATCH] ARM: vexpress: enable GICv3
@@ -11,21 +11,21 @@ ARMv7 kernel.  And these targets often contain GICv3.
 Signed-off-by: Ryan Harkin <[email protected]>
 Signed-off-by: Jon Medhurst <[email protected]>
 ---
- arch/arm/mach-vexpress/Kconfig | 1 +
+ arch/arm/mach-versatile/Kconfig | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
-index 7c728ebc0b33..ed579382d41f 100644
---- a/arch/arm/mach-vexpress/Kconfig
-+++ b/arch/arm/mach-vexpress/Kconfig
-@@ -4,6 +4,7 @@ menuconfig ARCH_VEXPRESS
- 	select ARCH_SUPPORTS_BIG_ENDIAN
+diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
+index 2ef226194c3a..3d54877fe339 100644
+--- a/arch/arm/mach-versatile/Kconfig
++++ b/arch/arm/mach-versatile/Kconfig
+@@ -251,6 +251,7 @@ menuconfig ARCH_VEXPRESS
+ 	depends on ARCH_MULTI_V7
  	select ARM_AMBA
  	select ARM_GIC
 +	select ARM_GIC_V3
  	select ARM_GLOBAL_TIMER
  	select ARM_TIMER_SP804
- 	select COMMON_CLK_VERSATILE
+ 	select GPIOLIB
 -- 
-2.17.1
+2.30.2
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/3 arm/qemuarm64-secureboot: remove tfa memory patch

The TF-A memory patch was upstreamed and is not needed for newer kernels (like v5.19)

---
 .../linux-yocto/skip-unavailable-memory.patch | 86 -------------------
 .../linux/linux-yocto_%.bbappend              |  1 -
 2 files changed, 87 deletions(-)
 delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto/skip-unavailable-memory.patch
meta-arm/recipes-kernel/linux/linux-yocto/skip-unavailable-memory.patch deleted +0 -86
deleted file mode 100644
index c5dac6aa..00000000
@@ -1,86 +0,0 @@
-Backported to 5.15.
-
-Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-kernel/[email protected]/T/#u]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 7bfeda1c9224270af97adf799ce0b5a4292bceb6 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <[email protected]>
-Date: Tue, 17 May 2022 11:14:10 +0100
-Subject: [PATCH] of/fdt: Ignore disabled memory nodes
-
-When we boot a machine using a devicetree, the generic DT code goes
-through all nodes with a 'device_type = "memory"' property, and collects
-all memory banks mentioned there. However it does not check for the
-status property, so any nodes which are explicitly "disabled" will still
-be added as a memblock.
-This ends up badly for QEMU, when booting with secure firmware on
-arm/arm64 machines, because QEMU adds a node describing secure-only
-memory:
-===================
-	secram@e000000 {
-		secure-status = "okay";
-		status = "disabled";
-		reg = <0x00 0xe000000 0x00 0x1000000>;
-		device_type = "memory";
-	};
-===================
-
-The kernel will eventually use that memory block (which is located below
-the main DRAM bank), but accesses to that will be answered with an
-SError:
-===================
-[    0.000000] Internal error: synchronous external abort: 96000050 [#1] PREEMPT SMP
-[    0.000000] Modules linked in:
-[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0-rc6-00014-g10c8acb8b679 #524
-[    0.000000] Hardware name: linux,dummy-virt (DT)
-[    0.000000] pstate: 200000c5 (nzCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-[    0.000000] pc : new_slab+0x190/0x340
-[    0.000000] lr : new_slab+0x184/0x340
-[    0.000000] sp : ffff80000a4b3d10
-....
-==================
-The actual crash location and call stack will be somewhat random, and
-depend on the specific allocation of that physical memory range.
-
-As the DT spec[1] explicitly mentions standard properties, add a simple
-check to skip over disabled memory nodes, so that we only use memory
-that is meant for non-secure code to use.
-
-That fixes booting a QEMU arm64 VM with EL3 enabled ("secure=on"), when
-not using UEFI. In this case the QEMU generated DT will be handed on
-to the kernel, which will see the secram node.
-This issue is reproducible when using TF-A together with U-Boot as
-firmware, then booting with the "booti" command.
-
-When using U-Boot as an UEFI provider, the code there [2] explicitly
-filters for disabled nodes when generating the UEFI memory map, so we
-are safe.
-EDK/2 only reads the first bank of the first DT memory node [3] to learn
-about memory, so we got lucky there.
-
-[1] https://github.com/devicetree-org/devicetree-specification/blob/main/source/chapter3-devicenodes.rst#memory-node (after the table)
-[2] https://source.denx.de/u-boot/u-boot/-/blob/master/lib/fdtdec.c#L1061-1063
-[3] https://github.com/tianocore/edk2/blob/master/ArmVirtPkg/PrePi/FdtParser.c
-
-Reported-by: Ross Burton <[email protected]>
-Signed-off-by: Andre Przywara <[email protected]>
----
- drivers/of/fdt.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
-index 59a7a9ee58ef..5439c899fe04 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);
--- 
-2.25.1
meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +0 -1
index 1d01daa0..24ace0e7 100644
@@ -8,7 +8,6 @@ SRC_URI:append:generic-arm64 =" \
 
 FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
 SRC_URI:append:qemuarm64-secureboot = " \
-    file://skip-unavailable-memory.patch \
     file://tee.cfg \
     "
 
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/3 arm/linux-yocto: remove optee num pages kernel config variable

In reply to Jon Mason

This kernel config variable has been removed from newer kernels (v5.19) and is logging a warning of:
[INFO]: the following symbols were not found in the active configuration:
- CONFIG_OPTEE_SHM_NUM_PRIV_PAGES

Remove the entry, as it is no longer needed

---
 meta-arm/recipes-kernel/linux/linux-yocto/tee.cfg | 1 -
 1 file changed, 1 deletion(-)
meta-arm/recipes-kernel/linux/linux-yocto/tee.cfg +0 -1
index 9a25cd5b..53c452d4 100644
@@ -5,7 +5,6 @@ CONFIG_TEE=y
 # TEE drivers
 #
 CONFIG_OPTEE=y
-CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 # end of TEE drivers
 
 CONFIG_TCG_TPM=y
Signature · 1 line
2.17.1
Applied
#3 lore raw
In reply to Jon Mason
Quoted 2 lines · Jon Mason

In newer kernels, vexpress has been rolled under the versatile umbrella. Update the patch to refer to the new location

Applied, thanks!

[1/3] arm-bsp/fvp-base-arm32: Update kernel patch for v5.19

      commit: 7617120602755051ce45c6837cd8f26fb3254ef0
[2/3] arm/qemuarm64-secureboot: remove tfa memory patch
      commit: 2a92d6294d349303969b12698a151689d69fb0b6
[3/3] arm/linux-yocto: remove optee num pages kernel config variable
      commit: 769a09da7c6566db942138baae177bc95a1faa94

Best regards,

Signature · 1 line
Jon Mason <[email protected]>