diff options
| author | Shannon Zhao <shannon.zhao@linaro.org> | 2015-09-24 01:29:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 01:29:37 +0100 |
| commit | cd37aaf876717a75d7af3a7465e8706cc4e13661 (patch) | |
| tree | 622faf9a81743aec7219901223f4b324c09286c3 | |
| parent | b92ad3949bc9cacd1652b4e07e7f6003b9e512af (diff) | |
| download | qemu-cd37aaf876717a75d7af3a7465e8706cc4e13661.tar.gz qemu-cd37aaf876717a75d7af3a7465e8706cc4e13661.tar.bz2 qemu-cd37aaf876717a75d7af3a7465e8706cc4e13661.zip | |
hw/arm/virt-acpi-build: Fix wrong size of flash in ACPI table
While virt machine creates two flash devices with total size 0x08000000,
the ACPI table generation code was wrongly using this total size as the
size of each flash device, so it would overlap other MMIO spaces.
Make each device entry in the table half the total; this brings the
ACPI table into line with the code which generates the device tree
and which creates the flash devices themselves.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Wei Huang <wei@redhat.com>
Tested-by: Graeme Gregory <graeme.gregory@linaro.org>
Message-id: 1442455041-6596-1-git-send-email-shannon.zhao@linaro.org
[PMM: edited commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/arm/virt-acpi-build.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 59c84ff27e..1aaff1f662 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -114,7 +114,7 @@ static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap) { Aml *dev, *crs; hwaddr base = flash_memmap->base; - hwaddr size = flash_memmap->size; + hwaddr size = flash_memmap->size / 2; dev = aml_device("FLS0"); aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015"))); |