| Message ID | 20200601142930.29408-7-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Fix some incomplete memory region size | expand |
On 6/1/20 7:29 AM, Philippe Mathieu-Daudé wrote: > IEC binary prefixes ease code review: the unit is explicit. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/hppa/dino.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Le 01/06/2020 à 16:29, Philippe Mathieu-Daudé a écrit : > IEC binary prefixes ease code review: the unit is explicit. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/hppa/dino.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c > index 2b1b38c58a..7290f23962 100644 > --- a/hw/hppa/dino.c > +++ b/hw/hppa/dino.c > @@ -542,7 +542,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, > &s->parent_obj.data_mem); > > /* Dino PCI bus memory. */ > - memory_region_init(&s->pci_mem, OBJECT(s), "pci-memory", 1ull << 32); > + memory_region_init(&s->pci_mem, OBJECT(s), "pci-memory", 4 * GiB); > > b = pci_register_root_bus(dev, "pci", dino_set_irq, dino_pci_map_irq, s, > &s->pci_mem, get_system_io(), > @@ -561,7 +561,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, > } > > /* Set up PCI view of memory: Bus master address space. */ > - memory_region_init(&s->bm, OBJECT(s), "bm-dino", 1ull << 32); > + memory_region_init(&s->bm, OBJECT(s), "bm-dino", 4 * GiB); > memory_region_init_alias(&s->bm_ram_alias, OBJECT(s), > "bm-system", addr_space, 0, > 0xf0000000 + DINO_MEM_CHUNK_SIZE); > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 2b1b38c58a..7290f23962 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -542,7 +542,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, &s->parent_obj.data_mem); /* Dino PCI bus memory. */ - memory_region_init(&s->pci_mem, OBJECT(s), "pci-memory", 1ull << 32); + memory_region_init(&s->pci_mem, OBJECT(s), "pci-memory", 4 * GiB); b = pci_register_root_bus(dev, "pci", dino_set_irq, dino_pci_map_irq, s, &s->pci_mem, get_system_io(), @@ -561,7 +561,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, } /* Set up PCI view of memory: Bus master address space. */ - memory_region_init(&s->bm, OBJECT(s), "bm-dino", 1ull << 32); + memory_region_init(&s->bm, OBJECT(s), "bm-dino", 4 * GiB); memory_region_init_alias(&s->bm_ram_alias, OBJECT(s), "bm-system", addr_space, 0, 0xf0000000 + DINO_MEM_CHUNK_SIZE);