mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
177cd674d6
qemu/hw/arm
History
Peter Maydell 67505c114e hw/arm/boot: Further improve initrd positioning code 
In commit e6b2b20d97 we made the boot loader code try to avoid
putting the initrd on top of the kernel.  However the expression used
to calculate the start of the initrd:

    info->initrd_start = info->loader_start +
        MAX(MIN(info->ram_size / 2, 128 * 1024 * 1024), kernel_size);

incorrectly uses 'kernel_size' as the offset within RAM of the
highest address to avoid.  This is incorrect because the kernel
doesn't start at address 0, but slightly higher than that.  This
means that we can still incorrectly end up overlaying the initrd on
the kernel in some cases, for example:

* The kernel's image_size is 0x0a7a8000
* The kernel was loaded at   0x40080000
* The end of the kernel is   0x4A828000
* The DTB was loaded at      0x4a800000

To get this right we need to track the actual highest address used
by the kernel and use that rather than kernel_size. We already
set image_low_addr and image_high_addr for ELF images; set them
also for the various other image types we support, and then use
image_high_addr as the lowest allowed address for the initrd.
(We don't use image_low_addr, but we set it for consistency
with the existing code path for ELF files.)

Fixes: e6b2b20d97
Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Message-id: 20190722151804.25467-3-peter.maydell@linaro.org
2019-07-26 16:17:56 +01:00
..
allwinner-a10.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
armsse.c hw/arm: Correctly disable FPU/DSP for some ARMSSE-based boards 2019-06-17 15:12:25 +01:00
armv7m.c hw/arm/armv7m: Forward "vfp" and "dsp" properties to CPU 2019-06-17 15:12:25 +01:00
aspeed_soc.c aspeed: Link SCU to the watchdog 2019-07-01 17:29:00 +01:00
aspeed.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
bcm2835_peripherals.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
bcm2836.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
boot.c hw/arm/boot: Further improve initrd positioning code 2019-07-26 16:17:56 +01:00
collie.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
cubieboard.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
digic_boards.c pflash: Clean up after commit 368a354f02, part 2 2019-03-11 22:53:44 +01:00
digic.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
exynos4_boards.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
exynos4210.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
fsl-imx6.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
fsl-imx6ul.c hw/arm/fsl-imx6ul.c: Remove dead SMP-related code 2019-07-22 14:07:39 +01:00
fsl-imx7.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
fsl-imx25.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
fsl-imx31.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
gumstix.c hw/devices: Move SMSC 91C111 declaration into a new header 2019-04-29 17:57:21 +01:00
highbank.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
imx25_pdk.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
integratorcp.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
Kconfig hw/arm: Add arm SBSA reference machine, skeleton part 2019-07-01 17:29:00 +01:00
kzm.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
mainstone.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
Makefile.objs hw/arm: Add arm SBSA reference machine, skeleton part 2019-07-01 17:29:00 +01:00
mcimx6ul-evk.c hw/arm/fsl-imx6ul.c: Remove dead SMP-related code 2019-07-22 14:07:39 +01:00
mcimx7d-sabre.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
microbit.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
mps2-tz.c hw/arm/mps2: Use object_initialize_child for correct reference counting 2019-05-24 15:29:02 -03:00
mps2.c hw/arm/mps2: Use object_initialize_child for correct reference counting 2019-05-24 15:29:02 -03:00
msf2-soc.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
msf2-som.c hw/arm/msf2-som: Exit when the cpu is not the expected one 2019-07-01 17:28:59 +01:00
musca.c hw/arm: Correctly disable FPU/DSP for some ARMSSE-based boards 2019-06-17 15:12:25 +01:00
musicpal.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
netduino2.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
nrf51_soc.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
nseries.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
omap1.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
omap2.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
omap_sx1.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
palm.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
pxa2xx_gpio.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
pxa2xx_pic.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
pxa2xx.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
raspi.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
realview.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
sabrelite.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
sbsa-ref.c hw/arm/sbsa-ref: Remove unnecessary check for secure_sysmem == NULL 2019-07-08 14:11:31 +01:00
smmu-common.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
smmu-internal.h hw/arm/smmu-common: VMSAv8-64 page table walk 2018-05-04 18:05:51 +01:00
smmuv3-internal.h Clean up header guards that don't match their file name 2019-05-13 08:58:55 +02:00
smmuv3.c hw/arm/smmuv3: Fix decoding of ID register range 2019-06-13 15:14:03 +01:00
spitz.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
stellaris.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
stm32f205_soc.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
strongarm.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
strongarm.h Move target-* CPU file into a target/ folder 2016-12-20 21:52:12 +01:00
sysbus-fdt.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
tosa.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00
trace-events trace-events: Fix attribution of trace points to source 2019-03-22 16:18:07 +00:00
versatilepb.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
vexpress.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
virt-acpi-build.c hw/acpi: extract acpi_add_rom_blob() 2019-06-16 16:16:52 -04:00
virt.c hw/arm/virt: Fix non-secure flash mode 2019-07-15 14:17:04 +01:00
xilinx_zynq.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
xlnx-versal-virt.c hw/arm: versal: Plug memory leaks 2019-01-07 15:23:46 +00:00
xlnx-versal.c Include qemu/module.h where needed, drop it from qemu-common.h 2019-06-12 13:18:33 +02:00
xlnx-zcu102.c Include qemu-common.h exactly where needed 2019-06-12 13:20:20 +02:00
xlnx-zynqmp.c hw/arm: Replace global smp variables with machine smp properties 2019-07-05 17:08:03 -03:00
z2.c arm: Rename hw/arm/arm.h to hw/arm/boot.h 2019-05-23 14:47:43 +01:00