| Message ID | 20180910204631.24106-2-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/2] lsi53c895a: add optional external IRQ via qdev | expand |
On Mon, Sep 10, 2018 at 09:46:30PM +0100, Mark Cave-Ayland wrote: > On some early machines the on-board PCI devices IRQs are wired directly to > the interrupt controller instead of via the PCI host bridge. > > Add an optional external IRQ that if wired up via qdev will replace the > in-built PCI IRQ. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Fam, if I get an Acked-by from you I'm happy to take this through my tree. > --- > hw/scsi/lsi53c895a.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c > index f5cbbf653c..996b40650d 100644 > --- a/hw/scsi/lsi53c895a.c > +++ b/hw/scsi/lsi53c895a.c > @@ -207,6 +207,7 @@ typedef struct { > PCIDevice parent_obj; > /*< public >*/ > > + qemu_irq ext_irq; > MemoryRegion mmio_io; > MemoryRegion ram_io; > MemoryRegion io_io; > @@ -443,9 +444,19 @@ static void lsi_stop_script(LSIState *s) > s->istat1 &= ~LSI_ISTAT1_SRUN; > } > > -static void lsi_update_irq(LSIState *s) > +static void lsi_set_irq(LSIState *s, int level) > { > PCIDevice *d = PCI_DEVICE(s); > + > + if (s->ext_irq) { > + qemu_set_irq(s->ext_irq, level); > + } else { > + pci_set_irq(d, level); > + } > +} > + > +static void lsi_update_irq(LSIState *s) > +{ > int level; > static int last_level; > lsi_request *p; > @@ -477,7 +488,7 @@ static void lsi_update_irq(LSIState *s) > level, s->dstat, s->sist1, s->sist0); > last_level = level; > } > - pci_set_irq(d, level); > + lsi_set_irq(s, level); > > if (!level && lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON)) { > DPRINTF("Handled IRQs & disconnected, looking for pending " > @@ -2213,6 +2224,7 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) > "lsi-io", 256); > > address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io"); > + qdev_init_gpio_out(d, &s->ext_irq, 1); > > pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_io); > pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_io);
On Tue, 09/11 11:27, David Gibson wrote: > On Mon, Sep 10, 2018 at 09:46:30PM +0100, Mark Cave-Ayland wrote: > > On some early machines the on-board PCI devices IRQs are wired directly to > > the interrupt controller instead of via the PCI host bridge. > > > > Add an optional external IRQ that if wired up via qdev will replace the > > in-built PCI IRQ. > > > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > Fam, if I get an Acked-by from you I'm happy to take this through my tree. This looks good to me, but I'm only 'R:' of scsi code. You'd perhaps need Paolo to ack. But anyway: Reviewed-by: Fam Zheng <famz@redhat.com> > > > --- > > hw/scsi/lsi53c895a.c | 16 ++++++++++++++-- > > 1 file changed, 14 insertions(+), 2 deletions(-) > > > > diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c > > index f5cbbf653c..996b40650d 100644 > > --- a/hw/scsi/lsi53c895a.c > > +++ b/hw/scsi/lsi53c895a.c > > @@ -207,6 +207,7 @@ typedef struct { > > PCIDevice parent_obj; > > /*< public >*/ > > > > + qemu_irq ext_irq; > > MemoryRegion mmio_io; > > MemoryRegion ram_io; > > MemoryRegion io_io; > > @@ -443,9 +444,19 @@ static void lsi_stop_script(LSIState *s) > > s->istat1 &= ~LSI_ISTAT1_SRUN; > > } > > > > -static void lsi_update_irq(LSIState *s) > > +static void lsi_set_irq(LSIState *s, int level) > > { > > PCIDevice *d = PCI_DEVICE(s); > > + > > + if (s->ext_irq) { > > + qemu_set_irq(s->ext_irq, level); > > + } else { > > + pci_set_irq(d, level); > > + } > > +} > > + > > +static void lsi_update_irq(LSIState *s) > > +{ > > int level; > > static int last_level; > > lsi_request *p; > > @@ -477,7 +488,7 @@ static void lsi_update_irq(LSIState *s) > > level, s->dstat, s->sist1, s->sist0); > > last_level = level; > > } > > - pci_set_irq(d, level); > > + lsi_set_irq(s, level); > > > > if (!level && lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON)) { > > DPRINTF("Handled IRQs & disconnected, looking for pending " > > @@ -2213,6 +2224,7 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) > > "lsi-io", 256); > > > > address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io"); > > + qdev_init_gpio_out(d, &s->ext_irq, 1); > > > > pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_io); > > pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_io); > > -- > 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
On 11/09/2018 08:38, Fam Zheng wrote: > On Tue, 09/11 11:27, David Gibson wrote: >> On Mon, Sep 10, 2018 at 09:46:30PM +0100, Mark Cave-Ayland wrote: >>> On some early machines the on-board PCI devices IRQs are wired directly to >>> the interrupt controller instead of via the PCI host bridge. >>> >>> Add an optional external IRQ that if wired up via qdev will replace the >>> in-built PCI IRQ. >>> >>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >> >> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> >> >> Fam, if I get an Acked-by from you I'm happy to take this through my tree. > > This looks good to me, but I'm only 'R:' of scsi code. You'd perhaps need Paolo > to ack. Not really. :) Mark, go ahead! Paolo
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index f5cbbf653c..996b40650d 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -207,6 +207,7 @@ typedef struct { PCIDevice parent_obj; /*< public >*/ + qemu_irq ext_irq; MemoryRegion mmio_io; MemoryRegion ram_io; MemoryRegion io_io; @@ -443,9 +444,19 @@ static void lsi_stop_script(LSIState *s) s->istat1 &= ~LSI_ISTAT1_SRUN; } -static void lsi_update_irq(LSIState *s) +static void lsi_set_irq(LSIState *s, int level) { PCIDevice *d = PCI_DEVICE(s); + + if (s->ext_irq) { + qemu_set_irq(s->ext_irq, level); + } else { + pci_set_irq(d, level); + } +} + +static void lsi_update_irq(LSIState *s) +{ int level; static int last_level; lsi_request *p; @@ -477,7 +488,7 @@ static void lsi_update_irq(LSIState *s) level, s->dstat, s->sist1, s->sist0); last_level = level; } - pci_set_irq(d, level); + lsi_set_irq(s, level); if (!level && lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON)) { DPRINTF("Handled IRQs & disconnected, looking for pending " @@ -2213,6 +2224,7 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) "lsi-io", 256); address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io"); + qdev_init_gpio_out(d, &s->ext_irq, 1); pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_io); pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_io);
On some early machines the on-board PCI devices IRQs are wired directly to the interrupt controller instead of via the PCI host bridge. Add an optional external IRQ that if wired up via qdev will replace the in-built PCI IRQ. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/scsi/lsi53c895a.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)