summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-05-12 16:22:05 +0100
committerSteve Sakoman <steve@sakoman.com>2023-05-12 05:31:11 -1000
commit2c5af07819b4a555737da9f07aa5236579300027 (patch)
treefd4204609e89f9f1a5f330f7a2d72811cadd2e4d
parent0b5bab7aa8bae98ee7fcb2a8863d4c10ac0ca37f (diff)
downloadopenembedded-core-2c5af07819b4a555737da9f07aa5236579300027.tar.gz
machine/qemuarm*: don't explicitly set vmalloc
In 5c6064 the qemuarm* machines gained vmalloc=256, because in testing Bruce was seeing problems when the vmalloc area was too big for the memory size of the machine (eg 256MB). The intention was for the area to be very small, but 256 bytes is too small and the kernel sets a minimal vmalloc area of 16MiB: [ 0.000000] vmalloc area is too small, limiting to 16MiB However, a 16MiB area is too small and results in pages of messages when you try and use the system: [ 242.822481] vmap allocation for size 4100096 failed: use vmalloc=<size> to increase size There have been a number of changes since this commit, remove the explicit vmalloc argument and use the default. I've tested that the system still boots locally. [1] early_vmalloc(), https://elixir.bootlin.com/linux/latest/source/arch/arm/mm/mmu.c#L1170 Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarmv5.conf1
2 files changed, 0 insertions, 3 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index c5234231e2..aa9ce88203 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -17,8 +17,6 @@ QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine virt,highmem=off"
QB_CPU = "-cpu cortex-a15"
QB_SMP ?= "-smp 4"
-# Standard Serial console
-QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
# For graphics to work we need to define the VGA device as well as the necessary USB devices
QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 6e59e42c3a..ef1b4ece23 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -12,7 +12,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
# For runqemu
QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine versatilepb"
-QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"