From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzcK6-0002P5-QL for qemu-devel@nongnu.org; Tue, 11 Sep 2018 02:38:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzcJr-0004KV-Cx for qemu-devel@nongnu.org; Tue, 11 Sep 2018 02:38:46 -0400 Date: Tue, 11 Sep 2018 14:38:34 +0800 From: Fam Zheng Message-ID: <20180911063834.GA19292@lemon.usersys.redhat.com> References: <20180910204631.24106-1-mark.cave-ayland@ilande.co.uk> <20180910204631.24106-2-mark.cave-ayland@ilande.co.uk> <20180911012726.GB7978@umbus.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180911012726.GB7978@umbus.fritz.box> Subject: Re: [Qemu-devel] [PATCH v3 1/2] lsi53c895a: add optional external IRQ via qdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Mark Cave-Ayland , hpoussin@reactos.org, pbonzini@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org 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 > > Reviewed-by: David Gibson > > 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 > > > --- > > 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