On Tue, Mar 06, 2018 at 08:31:03PM +0000, Mark Cave-Ayland wrote: > Since the macio device has a link to the PIC device, we can now wire up the > IRQs directly via qdev GPIOs rather than having to use an intermediate array. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/misc/macio/macio.c | 37 ++++++++++++++++++++++---------------
> hw/ppc/mac_newworld.c | 14 --------------
> include/hw/misc/macio/macio.h | 1 -
> 3 files changed, 22 insertions(+), 30 deletions(-)
>
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index af1bd46b4b..1aa7bb7c89 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -265,11 +265,10 @@ static void macio_newworld_realize(PCIDevice *d, Error
> **errp)
> {
> MacIOState *s = MACIO(d);
> NewWorldMacIOState *ns = NEWWORLD_MACIO(d);
> + DeviceState *pic_dev = DEVICE(ns->pic);
> Error *err = NULL;
> SysBusDevice *sysbus_dev;
> MemoryRegion *timer_memory = NULL;
> - int i;
> - int cur_irq = 0;
>
> macio_common_realize(d, &err);
> if (err) {
> @@ -278,11 +277,14 @@ static void macio_newworld_realize(PCIDevice *d, Error
> **errp)
> }
>
> sysbus_dev = SYS_BUS_DEVICE(&s->cuda);
> - sysbus_connect_irq(sysbus_dev, 0, ns->irqs[cur_irq++]);
> + sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,
> + NEWWORLD_CUDA_IRQ));
>
> sysbus_dev = SYS_BUS_DEVICE(&s->escc);
> - sysbus_connect_irq(sysbus_dev, 0, ns->irqs[cur_irq++]);
> - sysbus_connect_irq(sysbus_dev, 1, ns->irqs[cur_irq++]);
> + sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,
> + NEWWORLD_ESCCB_IRQ));
> + sysbus_connect_irq(sysbus_dev, 1, qdev_get_gpio_in(pic_dev,
> + NEWWORLD_ESCCA_IRQ));
>
> /* OpenPIC */
> sysbus_dev = SYS_BUS_DEVICE(ns->pic);
> @@ -290,15 +292,22 @@ static void macio_newworld_realize(PCIDevice *d, Error
> **errp)
> sysbus_mmio_get_region(sysbus_dev, 0));
>
> /* IDE buses */
> - for (i = 0; i < ARRAY_SIZE(ns->ide); i++) {
> - qemu_irq irq0 = ns->irqs[cur_irq++];
> - qemu_irq irq1 = ns->irqs[cur_irq++];
> + macio_realize_ide(s, &ns->ide[0],
> + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_IRQ),
> + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_DMA_IRQ),
> + 0x16, &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
>
> - macio_realize_ide(s, &ns->ide[i], irq0, irq1, 0x16 + (i * 4), &err);
> - if (err) {
> - error_propagate(errp, err);
> - return;
> - }
> + macio_realize_ide(s, &ns->ide[1],
> + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_IRQ),
> + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_DMA_IRQ),
> + 0x1a, &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> }
>
> /* Timer */
> @@ -314,8 +323,6 @@ static void macio_newworld_init(Object *obj)
> NewWorldMacIOState *ns = NEWWORLD_MACIO(obj);
> int i;
>
> - qdev_init_gpio_out(DEVICE(obj), ns->irqs, ARRAY_SIZE(ns->irqs));
> -
> object_property_add_link(obj, "pic", TYPE_OPENPIC,
> (Object **) &ns->pic,
> qdev_prop_allow_set_link_before_realize,
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 3cde507065..ae2ce562a4 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -376,20 +376,6 @@ static void ppc_core99_init(MachineState *machine)
> /* MacIO */
> macio = NEWWORLD_MACIO(pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO));
> dev = DEVICE(macio);
> - qdev_connect_gpio_out(dev, 0,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_CUDA_IRQ));
> - qdev_connect_gpio_out(dev, 1,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCB_IRQ));
> - qdev_connect_gpio_out(dev, 2,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCA_IRQ));
> - qdev_connect_gpio_out(dev, 3,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_IRQ));
> - qdev_connect_gpio_out(dev, 4,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_DMA_IRQ));
> - qdev_connect_gpio_out(dev, 5,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_IRQ));
> - qdev_connect_gpio_out(dev, 6,
> - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_DMA_IRQ));
> qdev_prop_set_uint64(dev, "frequency", tbfreq);
> object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
> &error_abort);
> diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
> index 4528282b36..e3b9ef48dd 100644
> --- a/include/hw/misc/macio/macio.h
> +++ b/include/hw/misc/macio/macio.h
> @@ -72,7 +72,6 @@ typedef struct NewWorldMacIOState {
> /*< public >*/
>
> OpenPICState *pic;
> - qemu_irq irqs[7];
> MACIOIDEState ide[2];
> } NewWorldMacIOState;
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
