summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-04-18 17:41:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-20 11:56:06 +0100
commit78ddb9f87ee4ea8f112442763b76e5573532bb5c (patch)
treede2c30c0b7f9102765efa0ebcf96b7f00c702f04
parentc1e24cee0edae07611e3ddb2659f6109df14e9ae (diff)
downloadpoky-78ddb9f87ee4ea8f112442763b76e5573532bb5c.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 (From OE-Core rev: 816dd95320ba2e4a0f6b816e4f58999c0f235ae2) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
17QB_MACHINE = "-machine virt,highmem=off" 17QB_MACHINE = "-machine virt,highmem=off"
18QB_CPU = "-cpu cortex-a15" 18QB_CPU = "-cpu cortex-a15"
19QB_SMP ?= "-smp 4" 19QB_SMP ?= "-smp 4"
20# Standard Serial console
21QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
22# For graphics to work we need to define the VGA device as well as the necessary USB devices 20# For graphics to work we need to define the VGA device as well as the necessary USB devices
23QB_GRAPHICS = "-device virtio-gpu-pci" 21QB_GRAPHICS = "-device virtio-gpu-pci"
24QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 22QB_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"
12# For runqemu 12# For runqemu
13QB_SYSTEM_NAME = "qemu-system-arm" 13QB_SYSTEM_NAME = "qemu-system-arm"
14QB_MACHINE = "-machine versatilepb" 14QB_MACHINE = "-machine versatilepb"
15QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
16QB_GRAPHICS = "-device virtio-gpu-pci" 15QB_GRAPHICS = "-device virtio-gpu-pci"
17QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 16QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 17QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"