| Message ID | 1424167806-8372-2-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | New |
| Headers | show |
On 02/17/2015 04:10 AM, Shannon Zhao wrote: > Add a GPIO controller in machine virt, in order to support cpu hotplug. > Here we use pl061. > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > --- > hw/arm/virt.c | 28 ++++++++++++++++++++++++++++ > 1 files changed, 28 insertions(+), 0 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 8a00574..43c0260 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -75,6 +75,7 @@ enum { > VIRT_MMIO, > VIRT_RTC, > VIRT_FW_CFG, > + VIRT_GPIO, > }; > > typedef struct MemMapEntry { > @@ -133,6 +134,7 @@ static const MemMapEntry a15memmap[] = { > [VIRT_UART] = { 0x09000000, 0x00001000 }, > [VIRT_RTC] = { 0x09010000, 0x00001000 }, > [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, > + [VIRT_GPIO] = { 0x09500000, 0x00001000 }, Base address can start with 0x09030000 to save some space? > [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, > /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ > /* 0x10000000 .. 0x40000000 reserved for PCI */ > @@ -142,6 +144,7 @@ static const MemMapEntry a15memmap[] = { > static const int a15irqmap[] = { > [VIRT_UART] = 1, > [VIRT_RTC] = 2, > + [VIRT_GPIO] = 3, > [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ > }; > > @@ -465,6 +468,29 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) > g_free(nodename); > } > > +static void create_gpio(const VirtBoardInfo *vbi, qemu_irq *pic) > +{ > + char *nodename; > + hwaddr base = vbi->memmap[VIRT_GPIO].base; > + hwaddr size = vbi->memmap[VIRT_GPIO].size; > + int irq = vbi->irqmap[VIRT_GPIO]; > + const char compat[] = "arm,pl061\0arm,primecell"; > + > + sysbus_create_simple("pl061", base, pic[irq]); > + > + nodename = g_strdup_printf("/pl061@%" PRIx64, base); > + qemu_fdt_add_subnode(vbi->fdt, nodename); > + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg", > + 2, base, 2, size); > + qemu_fdt_setprop(vbi->fdt, nodename, "compatible", compat, sizeof(compat)); > + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#gpio-cells", 2); > + qemu_fdt_setprop(vbi->fdt, nodename, "gpio-controller", NULL, 0); > + qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts", > + GIC_FDT_IRQ_TYPE_SPI, irq, > + GIC_FDT_IRQ_FLAGS_LEVEL_HI); Maybe also add clocks related properties (see below)? They might be optional, assuming that you already tested your patches. qemu_fdt_setprop_cell(vbi->fdt, nodename, "clocks", vbi->clock_phandle); qemu_fdt_setprop_string(vbi->fdt, nodename, "clock-names", "apb_pclk"); > + g_free(nodename); > +} > + > static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) > { > int i; > @@ -680,6 +706,8 @@ static void machvirt_init(MachineState *machine) > > create_rtc(vbi, pic); > > + create_gpio(vbi, pic); > + > /* Create mmio transports, so the user can create virtio backends > * (which will be automatically plugged in to the transports). If > * no backend is created the transport will just sit harmlessly idle. >
On 2015/2/19 1:52, Wei Huang wrote: > > > On 02/17/2015 04:10 AM, Shannon Zhao wrote: >> Add a GPIO controller in machine virt, in order to support cpu hotplug. >> Here we use pl061. >> >> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> >> --- >> hw/arm/virt.c | 28 ++++++++++++++++++++++++++++ >> 1 files changed, 28 insertions(+), 0 deletions(-) >> >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index 8a00574..43c0260 100644 >> --- a/hw/arm/virt.c >> +++ b/hw/arm/virt.c >> @@ -75,6 +75,7 @@ enum { >> VIRT_MMIO, >> VIRT_RTC, >> VIRT_FW_CFG, >> + VIRT_GPIO, >> }; >> >> typedef struct MemMapEntry { >> @@ -133,6 +134,7 @@ static const MemMapEntry a15memmap[] = { >> [VIRT_UART] = { 0x09000000, 0x00001000 }, >> [VIRT_RTC] = { 0x09010000, 0x00001000 }, >> [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, >> + [VIRT_GPIO] = { 0x09500000, 0x00001000 }, > Base address can start with 0x09030000 to save some space? > Ok >> [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, >> /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ >> /* 0x10000000 .. 0x40000000 reserved for PCI */ >> @@ -142,6 +144,7 @@ static const MemMapEntry a15memmap[] = { >> static const int a15irqmap[] = { >> [VIRT_UART] = 1, >> [VIRT_RTC] = 2, >> + [VIRT_GPIO] = 3, >> [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ >> }; >> >> @@ -465,6 +468,29 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) >> g_free(nodename); >> } >> >> +static void create_gpio(const VirtBoardInfo *vbi, qemu_irq *pic) >> +{ >> + char *nodename; >> + hwaddr base = vbi->memmap[VIRT_GPIO].base; >> + hwaddr size = vbi->memmap[VIRT_GPIO].size; >> + int irq = vbi->irqmap[VIRT_GPIO]; >> + const char compat[] = "arm,pl061\0arm,primecell"; >> + >> + sysbus_create_simple("pl061", base, pic[irq]); >> + >> + nodename = g_strdup_printf("/pl061@%" PRIx64, base); >> + qemu_fdt_add_subnode(vbi->fdt, nodename); >> + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg", >> + 2, base, 2, size); >> + qemu_fdt_setprop(vbi->fdt, nodename, "compatible", compat, sizeof(compat)); >> + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#gpio-cells", 2); >> + qemu_fdt_setprop(vbi->fdt, nodename, "gpio-controller", NULL, 0); >> + qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts", >> + GIC_FDT_IRQ_TYPE_SPI, irq, >> + GIC_FDT_IRQ_FLAGS_LEVEL_HI); > Maybe also add clocks related properties (see below)? They might be > optional, assuming that you already tested your patches. > As mentioned in cover letter I haven't tested these patches very well. I will test them seriously latter. Thanks for pointing this out. > qemu_fdt_setprop_cell(vbi->fdt, nodename, "clocks", vbi->clock_phandle); > qemu_fdt_setprop_string(vbi->fdt, nodename, "clock-names", "apb_pclk"); > > >> + g_free(nodename); >> +} >> + >> static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) >> { >> int i; >> @@ -680,6 +706,8 @@ static void machvirt_init(MachineState *machine) >> >> create_rtc(vbi, pic); >> >> + create_gpio(vbi, pic); >> + >> /* Create mmio transports, so the user can create virtio backends >> * (which will be automatically plugged in to the transports). If >> * no backend is created the transport will just sit harmlessly idle. >> > > > . >
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 8a00574..43c0260 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -75,6 +75,7 @@ enum { VIRT_MMIO, VIRT_RTC, VIRT_FW_CFG, + VIRT_GPIO, }; typedef struct MemMapEntry { @@ -133,6 +134,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, + [VIRT_GPIO] = { 0x09500000, 0x00001000 }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */ @@ -142,6 +144,7 @@ static const MemMapEntry a15memmap[] = { static const int a15irqmap[] = { [VIRT_UART] = 1, [VIRT_RTC] = 2, + [VIRT_GPIO] = 3, [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ }; @@ -465,6 +468,29 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) g_free(nodename); } +static void create_gpio(const VirtBoardInfo *vbi, qemu_irq *pic) +{ + char *nodename; + hwaddr base = vbi->memmap[VIRT_GPIO].base; + hwaddr size = vbi->memmap[VIRT_GPIO].size; + int irq = vbi->irqmap[VIRT_GPIO]; + const char compat[] = "arm,pl061\0arm,primecell"; + + sysbus_create_simple("pl061", base, pic[irq]); + + nodename = g_strdup_printf("/pl061@%" PRIx64, base); + qemu_fdt_add_subnode(vbi->fdt, nodename); + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg", + 2, base, 2, size); + qemu_fdt_setprop(vbi->fdt, nodename, "compatible", compat, sizeof(compat)); + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#gpio-cells", 2); + qemu_fdt_setprop(vbi->fdt, nodename, "gpio-controller", NULL, 0); + qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI); + g_free(nodename); +} + static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) { int i; @@ -680,6 +706,8 @@ static void machvirt_init(MachineState *machine) create_rtc(vbi, pic); + create_gpio(vbi, pic); + /* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If * no backend is created the transport will just sit harmlessly idle.
Add a GPIO controller in machine virt, in order to support cpu hotplug. Here we use pl061. Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> --- hw/arm/virt.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-)