From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkBGV-0002fx-Pv for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:15:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkBGT-0008MR-Ov for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:15:39 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:53272 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gkBGT-00083D-Hj for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:15:37 -0500 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id x0HHEqUB094315 for ; Thu, 17 Jan 2019 12:15:27 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2q2ub7fcrx-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Jan 2019 12:15:26 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Jan 2019 17:15:24 -0000 From: Greg Kurz Date: Thu, 17 Jan 2019 18:15:05 +0100 In-Reply-To: <154774526588.1208625.11295698301887807297.stgit@bahia.lan> References: <154774526588.1208625.11295698301887807297.stgit@bahia.lan> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <154774530571.1208625.5318753891932747707.stgit@bahia.lan> Subject: [Qemu-devel] [PATCH v3 06/19] spapr: Identify LSIs of all possible PHBs at machine init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Greg Kurz , Alexey Kardashevskiy , =?utf-8?q?C=C3=A9dric?= Le Goater , Michael Roth , Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , Eduardo Habkost , David Hildenbrand , Cornelia Huck , Gerd Hoffmann , Dmitry Fleytman , Thomas Huth Every PHB needs to claim 4 LSIs to support legacy PCI devices. This is currently done at PHB realize. When using in-kernel XICS (or upcoming in-kernel XIVE), QEMU synchronizes the state of all irqs, including these LSIs, later on at machine reset. In order to support PHB hotplug, we need a way to tell KVM about the LSIs that doesn't require a machine reset. Since these irq numbers are fixed values derived from the PHB index, let's identify them all at machine init. Older machines that don't have fixed irq numbers cannot support PHB hotplug and keep the existing behavior. Signed-off-by: Greg Kurz --- hw/ppc/spapr.c | 6 ++++++ hw/ppc/spapr_pci.c | 20 ++++++++++++++++++-- include/hw/pci-host/spapr.h | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 26f8e55cc25e..9189b4d3a9d6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2802,6 +2802,12 @@ static void spapr_machine_init(MachineState *machine) phb = spapr_create_default_phb(); + if (!smc->legacy_irq_allocation) { + for (i = 0; i < SPAPR_MAX_PHBS; i++) { + spapr_phb_set_lsis(i, spapr); + } + } + for (i = 0; i < nb_nics; i++) { NICInfo *nd = &nd_table[i]; diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index ec9d4d28004c..f5f13a4d4816 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1559,6 +1559,22 @@ static void spapr_pci_unplug_request(HotplugHandler *plug_handler, } } +static uint32_t spapr_phb_index_to_lsi(int phb_index, int irq_index) +{ + return SPAPR_IRQ_PCI_LSI + phb_index * PCI_NUM_PINS + irq_index; +} + +void spapr_phb_set_lsis(int index, sPAPRMachineState *spapr) +{ + int i; + + for (i = 0; i < PCI_NUM_PINS; i++) { + uint32_t irq = spapr_phb_index_to_lsi(index, i); + + spapr_irq_set_type(spapr, irq, true); + } +} + static void spapr_phb_realize(DeviceState *dev, Error **errp) { /* We don't use SPAPR_MACHINE() in order to exit gracefully if the user @@ -1726,7 +1742,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) /* Initialize the LSI table */ for (i = 0; i < PCI_NUM_PINS; i++) { - uint32_t irq = SPAPR_IRQ_PCI_LSI + sphb->index * PCI_NUM_PINS + i; + uint32_t irq = spapr_phb_index_to_lsi(sphb->index, i); Error *local_err = NULL; if (smc->legacy_irq_allocation) { @@ -1736,6 +1752,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) "can't allocate LSIs: "); return; } + spapr_irq_set_type(spapr, irq, true); } spapr_irq_claim(spapr, irq, &local_err); @@ -1743,7 +1760,6 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) error_propagate_prepend(errp, local_err, "can't allocate LSIs: "); return; } - spapr_irq_set_type(spapr, irq, true); sphb->lsi_table[i].irq = irq; } diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index e0e683c32469..bb0ae7fdd41d 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -164,4 +164,6 @@ static inline void spapr_phb_vfio_reset(DeviceState *qdev) void spapr_phb_dma_reset(sPAPRPHBState *sphb); +void spapr_phb_set_lsis(int index, sPAPRMachineState *spapr); + #endif /* PCI_HOST_SPAPR_H */