[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/16] hw/arm/bcm2836: Use per CPU address spaces
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 07/16] hw/arm/bcm2836: Use per CPU address spaces |
Date: |
Sun, 20 Oct 2019 01:47:06 +0200 |
Currently all CPUs access the main system bus. Let each CPU have
his own address space.
Before:
(qemu) info mtree
address-space: memory
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-000000003fffffff (prio 0, ram): ram
000000003f000000-000000003fffffff (prio 1, i/o): bcm2835-peripherals
000000003f003000-000000003f00301f (prio 0, i/o): bcm2835-sys-timer
000000003f007000-000000003f007fff (prio 0, i/o): bcm2835-dma
000000003f00b200-000000003f00b3ff (prio 0, i/o): bcm2835-ic
000000003f00b400-000000003f00b43f (prio -1000, i/o): bcm2835-sp804
000000003f00b800-000000003f00bbff (prio 0, i/o): bcm2835-mbox
000000003f100000-000000003f100fff (prio -1000, i/o): bcm2835-cprman
000000003f102000-000000003f102fff (prio -1000, i/o): bcm2835-a2w
000000003f104000-000000003f10400f (prio 0, i/o): bcm2835-rng
000000003f200000-000000003f200fff (prio 0, i/o): bcm2835_gpio
000000003f201000-000000003f201fff (prio 0, i/o): pl011
000000003f202000-000000003f202fff (prio 0, i/o): bcm2835-sdhost
000000003f203000-000000003f2030ff (prio -1000, i/o): bcm2835-i2s
000000003f204000-000000003f20401f (prio -1000, i/o): bcm2835-spi0
000000003f205000-000000003f20501f (prio -1000, i/o): bcm2835-i2c0
000000003f20f000-000000003f20f07f (prio -1000, i/o): bcm2835-otp
000000003f212000-000000003f212007 (prio 0, i/o): bcm2835-thermal
000000003f214000-000000003f2140ff (prio -1000, i/o): bcm2835-spis
000000003f215000-000000003f2150ff (prio 0, i/o): bcm2835-aux
000000003f300000-000000003f3000ff (prio 0, i/o): sdhci
000000003f600000-000000003f6000ff (prio -1000, i/o): bcm2835-smi
000000003f804000-000000003f80401f (prio -1000, i/o): bcm2835-i2c1
000000003f805000-000000003f80501f (prio -1000, i/o): bcm2835-i2c2
000000003f900000-000000003f907fff (prio -1000, i/o): bcm2835-dbus
000000003f910000-000000003f917fff (prio -1000, i/o): bcm2835-ave0
000000003f980000-000000003f980fff (prio -1000, i/o): dwc-usb2
000000003fe00000-000000003fe000ff (prio -1000, i/o): bcm2835-sdramc
000000003fe05000-000000003fe050ff (prio 0, i/o): bcm2835-dma-chan15
0000000040000000-00000000400000ff (prio 0, i/o): bcm2836-control
address-space: cpu-secure-memory-0
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-000000003fffffff (prio 0, ram): ram
000000003f000000-000000003fffffff (prio 1, i/o): bcm2835-peripherals
000000003f003000-000000003f00301f (prio 0, i/o): bcm2835-sys-timer
000000003f007000-000000003f007fff (prio 0, i/o): bcm2835-dma
000000003f00b200-000000003f00b3ff (prio 0, i/o): bcm2835-ic
000000003f00b400-000000003f00b43f (prio -1000, i/o): bcm2835-sp804
000000003f00b800-000000003f00bbff (prio 0, i/o): bcm2835-mbox
000000003f100000-000000003f100fff (prio -1000, i/o): bcm2835-cprman
000000003f102000-000000003f102fff (prio -1000, i/o): bcm2835-a2w
000000003f104000-000000003f10400f (prio 0, i/o): bcm2835-rng
000000003f200000-000000003f200fff (prio 0, i/o): bcm2835_gpio
000000003f201000-000000003f201fff (prio 0, i/o): pl011
000000003f202000-000000003f202fff (prio 0, i/o): bcm2835-sdhost
000000003f203000-000000003f2030ff (prio -1000, i/o): bcm2835-i2s
000000003f204000-000000003f20401f (prio -1000, i/o): bcm2835-spi0
000000003f205000-000000003f20501f (prio -1000, i/o): bcm2835-i2c0
000000003f20f000-000000003f20f07f (prio -1000, i/o): bcm2835-otp
000000003f212000-000000003f212007 (prio 0, i/o): bcm2835-thermal
000000003f214000-000000003f2140ff (prio -1000, i/o): bcm2835-spis
000000003f215000-000000003f2150ff (prio 0, i/o): bcm2835-aux
000000003f300000-000000003f3000ff (prio 0, i/o): sdhci
000000003f600000-000000003f6000ff (prio -1000, i/o): bcm2835-smi
000000003f804000-000000003f80401f (prio -1000, i/o): bcm2835-i2c1
000000003f805000-000000003f80501f (prio -1000, i/o): bcm2835-i2c2
000000003f900000-000000003f907fff (prio -1000, i/o): bcm2835-dbus
000000003f910000-000000003f917fff (prio -1000, i/o): bcm2835-ave0
000000003f980000-000000003f980fff (prio -1000, i/o): dwc-usb2
000000003fe00000-000000003fe000ff (prio -1000, i/o): bcm2835-sdramc
000000003fe05000-000000003fe050ff (prio 0, i/o): bcm2835-dma-chan15
0000000040000000-00000000400000ff (prio 0, i/o): bcm2836-control
address-space: cpu-memory-0
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-000000003fffffff (prio 0, ram): ram
000000003f000000-000000003fffffff (prio 1, i/o): bcm2835-peripherals
000000003f003000-000000003f00301f (prio 0, i/o): bcm2835-sys-timer
000000003f007000-000000003f007fff (prio 0, i/o): bcm2835-dma
000000003f00b200-000000003f00b3ff (prio 0, i/o): bcm2835-ic
000000003f00b400-000000003f00b43f (prio -1000, i/o): bcm2835-sp804
000000003f00b800-000000003f00bbff (prio 0, i/o): bcm2835-mbox
000000003f100000-000000003f100fff (prio -1000, i/o): bcm2835-cprman
000000003f102000-000000003f102fff (prio -1000, i/o): bcm2835-a2w
000000003f104000-000000003f10400f (prio 0, i/o): bcm2835-rng
000000003f200000-000000003f200fff (prio 0, i/o): bcm2835_gpio
000000003f201000-000000003f201fff (prio 0, i/o): pl011
000000003f202000-000000003f202fff (prio 0, i/o): bcm2835-sdhost
000000003f203000-000000003f2030ff (prio -1000, i/o): bcm2835-i2s
000000003f204000-000000003f20401f (prio -1000, i/o): bcm2835-spi0
000000003f205000-000000003f20501f (prio -1000, i/o): bcm2835-i2c0
000000003f20f000-000000003f20f07f (prio -1000, i/o): bcm2835-otp
000000003f212000-000000003f212007 (prio 0, i/o): bcm2835-thermal
000000003f214000-000000003f2140ff (prio -1000, i/o): bcm2835-spis
000000003f215000-000000003f2150ff (prio 0, i/o): bcm2835-aux
000000003f300000-000000003f3000ff (prio 0, i/o): sdhci
000000003f600000-000000003f6000ff (prio -1000, i/o): bcm2835-smi
000000003f804000-000000003f80401f (prio -1000, i/o): bcm2835-i2c1
000000003f805000-000000003f80501f (prio -1000, i/o): bcm2835-i2c2
000000003f900000-000000003f907fff (prio -1000, i/o): bcm2835-dbus
000000003f910000-000000003f917fff (prio -1000, i/o): bcm2835-ave0
000000003f980000-000000003f980fff (prio -1000, i/o): dwc-usb2
000000003fe00000-000000003fe000ff (prio -1000, i/o): bcm2835-sdramc
000000003fe05000-000000003fe050ff (prio 0, i/o): bcm2835-dma-chan15
0000000040000000-00000000400000ff (prio 0, i/o): bcm2836-control
memory-region: ram
0000000000000000-000000003fffffff (prio 0, ram): ram
memory-region: bcm2835-peripherals
000000003f000000-000000003fffffff (prio 1, i/o): bcm2835-peripherals
000000003f003000-000000003f00301f (prio 0, i/o): bcm2835-sys-timer
000000003f007000-000000003f007fff (prio 0, i/o): bcm2835-dma
000000003f00b200-000000003f00b3ff (prio 0, i/o): bcm2835-ic
000000003f00b400-000000003f00b43f (prio -1000, i/o): bcm2835-sp804
000000003f00b800-000000003f00bbff (prio 0, i/o): bcm2835-mbox
000000003f100000-000000003f100fff (prio -1000, i/o): bcm2835-cprman
000000003f102000-000000003f102fff (prio -1000, i/o): bcm2835-a2w
000000003f104000-000000003f10400f (prio 0, i/o): bcm2835-rng
000000003f200000-000000003f200fff (prio 0, i/o): bcm2835_gpio
000000003f201000-000000003f201fff (prio 0, i/o): pl011
000000003f202000-000000003f202fff (prio 0, i/o): bcm2835-sdhost
000000003f203000-000000003f2030ff (prio -1000, i/o): bcm2835-i2s
000000003f204000-000000003f20401f (prio -1000, i/o): bcm2835-spi0
000000003f205000-000000003f20501f (prio -1000, i/o): bcm2835-i2c0
000000003f20f000-000000003f20f07f (prio -1000, i/o): bcm2835-otp
000000003f212000-000000003f212007 (prio 0, i/o): bcm2835-thermal
000000003f214000-000000003f2140ff (prio -1000, i/o): bcm2835-spis
000000003f215000-000000003f2150ff (prio 0, i/o): bcm2835-aux
000000003f300000-000000003f3000ff (prio 0, i/o): sdhci
000000003f600000-000000003f6000ff (prio -1000, i/o): bcm2835-smi
000000003f804000-000000003f80401f (prio -1000, i/o): bcm2835-i2c1
000000003f805000-000000003f80501f (prio -1000, i/o): bcm2835-i2c2
000000003f900000-000000003f907fff (prio -1000, i/o): bcm2835-dbus
000000003f910000-000000003f917fff (prio -1000, i/o): bcm2835-ave0
000000003f980000-000000003f980fff (prio -1000, i/o): dwc-usb2
000000003fe00000-000000003fe000ff (prio -1000, i/o): bcm2835-sdramc
000000003fe05000-000000003fe050ff (prio 0, i/o): bcm2835-dma-chan15
After:
(qemu) info mtree
address-space: memory
0000000000000000-ffffffffffffffff (prio 0, i/o): system
address-space: cpu-secure-memory-0
0000000000000000-00000000ffffffff (prio 0, i/o): cpu-bus
0000000000000000-000000003fffffff (prio 1, i/o): alias arm-ram @ram
0000000000000000-000000003fffffff
000000003f000000-000000003fffffff (prio 2, i/o): alias arm-peripherals
@bcm2835-peripherals 0000000000000000-0000000000ffffff
0000000040000000-0000000040003fff (prio 2, i/o): alias arm-control
@bcm2836-control 0000000000000000-0000000000003fff
address-space: cpu-memory-0
0000000000000000-00000000ffffffff (prio 0, i/o): cpu-bus
0000000000000000-000000003fffffff (prio 1, i/o): alias arm-ram @ram
0000000000000000-000000003fffffff
000000003f000000-000000003fffffff (prio 2, i/o): alias arm-peripherals
@bcm2835-peripherals 0000000000000000-0000000000ffffff
0000000040000000-0000000040003fff (prio 2, i/o): alias arm-control
@bcm2836-control 0000000000000000-0000000000003fff
memory-region: ram
0000000000000000-000000003fffffff (prio 0, ram): ram
memory-region: bcm2835-peripherals
0000000000000000-0000000000ffffff (prio 0, i/o): bcm2835-peripherals
0000000000003000-000000000000301f (prio 0, i/o): bcm2835-sys-timer
0000000000007000-0000000000007fff (prio 0, i/o): bcm2835-dma
000000000000b200-000000000000b3ff (prio 0, i/o): bcm2835-ic
000000000000b400-000000000000b43f (prio -1000, i/o): bcm2835-sp804
000000000000b800-000000000000bbff (prio 0, i/o): bcm2835-mbox
0000000000100000-0000000000100fff (prio -1000, i/o): bcm2835-cprman
0000000000102000-0000000000102fff (prio -1000, i/o): bcm2835-a2w
0000000000104000-000000000010400f (prio 0, i/o): bcm2835-rng
0000000000200000-0000000000200fff (prio 0, i/o): bcm2835_gpio
0000000000201000-0000000000201fff (prio 0, i/o): pl011
0000000000202000-0000000000202fff (prio 0, i/o): bcm2835-sdhost
0000000000203000-00000000002030ff (prio -1000, i/o): bcm2835-i2s
0000000000204000-000000000020401f (prio -1000, i/o): bcm2835-spi0
0000000000205000-000000000020501f (prio -1000, i/o): bcm2835-i2c0
000000000020f000-000000000020f07f (prio -1000, i/o): bcm2835-otp
0000000000212000-0000000000212007 (prio 0, i/o): bcm2835-thermal
0000000000214000-00000000002140ff (prio -1000, i/o): bcm2835-spis
0000000000215000-00000000002150ff (prio 0, i/o): bcm2835-aux
0000000000300000-00000000003000ff (prio 0, i/o): sdhci
0000000000600000-00000000006000ff (prio -1000, i/o): bcm2835-smi
0000000000804000-000000000080401f (prio -1000, i/o): bcm2835-i2c1
0000000000805000-000000000080501f (prio -1000, i/o): bcm2835-i2c2
0000000000900000-0000000000907fff (prio -1000, i/o): bcm2835-dbus
0000000000910000-0000000000917fff (prio -1000, i/o): bcm2835-ave0
0000000000980000-0000000000980fff (prio -1000, i/o): dwc-usb2
0000000000e00000-0000000000e000ff (prio -1000, i/o): bcm2835-sdramc
0000000000e05000-0000000000e050ff (prio 0, i/o): bcm2835-dma-chan15
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/bcm2836.c | 39 ++++++++++++++++++++++++++++++++++-----
hw/arm/raspi.c | 2 --
include/hw/arm/bcm2836.h | 4 ++++
3 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 221ff06895..374a44b38c 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -9,6 +9,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/module.h"
#include "cpu.h"
@@ -51,6 +52,8 @@ static void bcm2836_init(Object *obj)
int n;
for (n = 0; n < BCM283X_NCPUS; n++) {
+ memory_region_init(&s->cpu[n].container, obj, "cpu-bus", 4 * GiB);
+
object_initialize_child(obj, "cpu[*]", &s->cpu[n].core,
sizeof(s->cpu[n].core), info->cpu_type,
&error_abort, NULL);
@@ -72,9 +75,11 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
BCM283XState *s = BCM283X(dev);
BCM283XClass *bc = BCM283X_GET_CLASS(dev);
const BCM283XInfo *info = bc->info;
+ MemoryRegion *ram_mr, *peri_mr, *ctrl_mr;
Object *obj;
Error *err = NULL;
int n;
+ uint64_t ram_size;
/* common peripherals from bcm2835 */
@@ -84,13 +89,14 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
__func__, error_get_pretty(err));
return;
}
+ ram_mr = MEMORY_REGION(obj);
+ ram_size = memory_region_size(ram_mr);
object_property_add_const_link(OBJECT(&s->peripherals), "ram", obj, &err);
if (err) {
error_propagate(errp, err);
return;
}
-
object_property_set_bool(OBJECT(&s->peripherals), true, "realized", &err);
if (err) {
error_propagate(errp, err);
@@ -104,8 +110,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
return;
}
- sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0,
- info->peri_base, 1);
+ peri_mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->peripherals), 0);
/* bcm2836 interrupt controller (and mailboxes, etc.) */
object_property_set_bool(OBJECT(&s->control), true, "realized", &err);
@@ -113,8 +118,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
error_propagate(errp, err);
return;
}
-
- sysbus_mmio_map(SYS_BUS_DEVICE(&s->control), 0, info->ctrl_base);
+ ctrl_mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->control), 0);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 0,
qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-irq", 0));
@@ -122,6 +126,31 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-fiq", 0));
for (n = 0; n < BCM283X_NCPUS; n++) {
+ memory_region_init_alias(&s->cpu[n].ram_alias, OBJECT(s),
+ "arm-ram", ram_mr, 0, ram_size);
+ memory_region_add_subregion_overlap(&s->cpu[n].container, 0,
+ &s->cpu[n].ram_alias, 1);
+
+ memory_region_init_alias(&s->cpu[n].peri_alias, OBJECT(s),
+ "arm-peripherals", peri_mr, 0, 16 * MiB);
+ memory_region_add_subregion_overlap(&s->cpu[n].container,
+ info->peri_base,
+ &s->cpu[n].peri_alias, 2);
+
+ memory_region_init_alias(&s->cpu[n].control_alias, OBJECT(s),
+ "arm-control", ctrl_mr, 0, 16 * KiB);
+ memory_region_add_subregion_overlap(&s->cpu[n].container,
+ info->ctrl_base,
+ &s->cpu[n].control_alias, 2);
+
+ object_property_set_link(OBJECT(&s->cpu[n].core),
+ OBJECT(&s->cpu[n].container),
+ "memory", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
/* TODO: this should be converted to a property of ARM_CPU */
s->cpu[n].core.mp_affinity = (info->clusterid << 8) | n;
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 615d755879..a12459bc41 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -184,8 +184,6 @@ static void raspi_init(MachineState *machine, int version)
/* Allocate and map RAM */
memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram",
machine->ram_size);
- /* FIXME: Remove when we have custom CPU address space support */
- memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0);
/* Setup the SOC */
object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),
diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h
index 92a6544816..e3498cb861 100644
--- a/include/hw/arm/bcm2836.h
+++ b/include/hw/arm/bcm2836.h
@@ -37,6 +37,10 @@ typedef struct BCM283XState {
struct {
ARMCPU core;
+ MemoryRegion container;
+ MemoryRegion ram_alias;
+ MemoryRegion peri_alias;
+ MemoryRegion control_alias;
} cpu[BCM283X_NCPUS];
BCM2836ControlState control;
BCM2835PeripheralState peripherals;
--
2.21.0
- [PATCH v3 04/16] hw/arm/bcm2835_peripherals: Use the SYS_timer, (continued)
- [PATCH v3 04/16] hw/arm/bcm2835_peripherals: Use the SYS_timer, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 03/16] hw/timer/bcm2835: Add the BCM2835 SYS_timer, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 05/16] hw/arm/bcm2836: Make the SoC code modular, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 06/16] hw/arm/bcm2836: Rename cpus[] as cpu[].core, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 08/16] hw/arm/bcm2835_peripherals: Add const link property in realize(), Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 07/16] hw/arm/bcm2836: Use per CPU address spaces,
Philippe Mathieu-Daudé <=
- [PATCH v3 09/16] hw/arm/bcm2836: Create VideoCore address space in the SoC, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 10/16] hw/arm/raspi: Use AddressSpace when using arm_boot::write_secondary_boot, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 11/16] hw/arm/raspi: Use -smp cores=<N> option to restrict enabled cores, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 12/16] hw/arm/bcm2836: Rename enabled_cpus -> enabled_cores, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 13/16] hw/arm/raspi: Make the board code modular, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH v3 15/16] python/qemu/machine: Allow to use other serial consoles than default, Philippe Mathieu-Daudé, 2019/10/19