| Message ID | 1406651521-10144-1-git-send-email-drjones@redhat.com |
|---|---|
| State | Accepted |
| Commit | 1373e140f0b0554a8b3aba9761cd96df49520f97 |
| Headers | show |
On 29 July 2014 17:32, Andrew Jones <drjones@redhat.com> wrote: > pl031's base address should be 0x9010000, not 0x90010000, otherwise > it sits in ram when configuring a guest with greater than 1G. > > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > v2: > - pl031 needs 64K alignment > - don't change the formatting, will send another patch, which may > get ignored :-) > --- Reviewed-by: Peter Maydell <peter.maydell@linaro.org> I decided we really do need to fix this for 2.1, so my plan is to commit this today and tag an -rc5. The -rc4 tarball hasn't been done yet so this just means there'll be an odd hiccup in the rc numbering from most peoples' perspective. -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 405c61d39c1e9..89532bd786436 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -104,7 +104,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_GIC_DIST] = { 0x8000000, 0x10000 }, [VIRT_GIC_CPU] = { 0x8010000, 0x10000 }, [VIRT_UART] = { 0x9000000, 0x1000 }, - [VIRT_RTC] = { 0x90010000, 0x1000 }, + [VIRT_RTC] = { 0x9010000, 0x1000 }, [VIRT_MMIO] = { 0xa000000, 0x200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */
pl031's base address should be 0x9010000, not 0x90010000, otherwise it sits in ram when configuring a guest with greater than 1G. Signed-off-by: Andrew Jones <drjones@redhat.com> --- v2: - pl031 needs 64K alignment - don't change the formatting, will send another patch, which may get ignored :-) --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)