From nobody Sun Apr 28 11:32:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529063763764426.5463143548827; Fri, 15 Jun 2018 04:56:03 -0700 (PDT) Received: from localhost ([::1]:46119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnKk-00011w-Pe for importer@patchew.org; Fri, 15 Jun 2018 07:56:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnIa-0007oy-FH for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTnIX-0000ip-As for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:48 -0400 Received: from 4.mo69.mail-out.ovh.net ([46.105.42.102]:53290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fTnIX-0000iV-1Z for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:45 -0400 Received: from player734.ha.ovh.net (unknown [10.109.105.1]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id 063AE1969E for ; Fri, 15 Jun 2018 13:53:42 +0200 (CEST) Received: from zorba.kaod.org (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id BEFAE28008B; Fri, 15 Jun 2018 13:53:38 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 15 Jun 2018 13:53:01 +0200 Message-Id: <20180615115303.31125-2-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180615115303.31125-1-clg@kaod.org> References: <20180615115303.31125-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12161407844029533158 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrleeigdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.42.102 Subject: [Qemu-devel] [PATCH 1/3] spapr: split the IRQ allocation sequence X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Today, when a device requests for IRQ number in a sPAPR machine, the spapr_irq_alloc() routine first scans the ICSState status array to find an empty slot and then performs the assignement of the selected numbers. Split this sequence in two distinct routines : spapr_irq_find() for lookups and spapr_irq_claim() for claiming the IRQ numbers. This will ease the introduction of a static layout of IRQ numbers. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr.h | 5 ++++ hw/ppc/spapr.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/ppc/spapr_events.c | 18 ++++++++++---- hw/ppc/spapr_pci.c | 19 ++++++++++++--- hw/ppc/spapr_vio.c | 10 +++++++- 5 files changed, 108 insertions(+), 8 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 3388750fc795..6088f44c1b2a 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -776,6 +776,11 @@ int spapr_irq_alloc(sPAPRMachineState *spapr, int irq_= hint, bool lsi, Error **errp); int spapr_irq_alloc_block(sPAPRMachineState *spapr, int num, bool lsi, bool align, Error **errp); +int spapr_irq_find(sPAPRMachineState *spapr, int num, bool align, + Error **errp); +#define spapr_irq_findone(spapr, errp) spapr_irq_find(spapr, 1, false, err= p) +int spapr_irq_claim(sPAPRMachineState *spapr, int irq, int num, bool lsi, + Error **errp); void spapr_irq_free(sPAPRMachineState *spapr, int irq, int num); qemu_irq spapr_qirq(sPAPRMachineState *spapr, int irq); =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f59999daacfc..b1d19b328166 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3810,6 +3810,36 @@ static int ics_find_free_block(ICSState *ics, int nu= m, int alignnum) return -1; } =20 +int spapr_irq_find(sPAPRMachineState *spapr, int num, bool align, Error **= errp) +{ + ICSState *ics =3D spapr->ics; + int first =3D -1; + + assert(ics); + + /* + * MSIMesage::data is used for storing VIRQ so + * it has to be aligned to num to support multiple + * MSI vectors. MSI-X is not affected by this. + * The hint is used for the first IRQ, the rest should + * be allocated continuously. + */ + if (align) { + assert((num =3D=3D 1) || (num =3D=3D 2) || (num =3D=3D 4) || + (num =3D=3D 8) || (num =3D=3D 16) || (num =3D=3D 32)); + first =3D ics_find_free_block(ics, num, num); + } else { + first =3D ics_find_free_block(ics, num, 1); + } + + if (first < 0) { + error_setg(errp, "can't find a free %d-IRQ block", num); + return -1; + } + + return first + ics->offset; +} + /* * Allocate the IRQ number and set the IRQ type, LSI or MSI */ @@ -3888,6 +3918,40 @@ int spapr_irq_alloc_block(sPAPRMachineState *spapr, = int num, bool lsi, return first; } =20 +int spapr_irq_claim(sPAPRMachineState *spapr, int irq, int num, bool lsi, + Error **errp) +{ + ICSState *ics =3D spapr->ics; + int i; + int srcno =3D irq - ics->offset; + int ret =3D 0; + + assert(ics); + + if (!ics_valid_irq(ics, irq) || !ics_valid_irq(ics, irq + num)) { + return -1; + } + + for (i =3D srcno; i < srcno + num; ++i) { + if (ICS_IRQ_FREE(ics, i)) { + spapr_irq_set_lsi(spapr, i + ics->offset, lsi); + } else { + error_setg(errp, "IRQ %d is not free", i + ics->offset); + ret =3D -1; + break; + } + } + + /* we could call spapr_irq_free() when rolling back */ + if (ret) { + while (--i >=3D srcno) { + memset(&ics->irqs[i], 0, sizeof(ICSIRQState)); + } + } + + return ret; +} + void spapr_irq_free(sPAPRMachineState *spapr, int irq, int num) { ICSState *ics =3D spapr->ics; diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 86836f0626dc..3b6ae7272092 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -707,13 +707,18 @@ void spapr_clear_pending_events(sPAPRMachineState *sp= apr) =20 void spapr_events_init(sPAPRMachineState *spapr) { + int epow_irq; + + epow_irq =3D spapr_irq_findone(spapr, &error_fatal); + + spapr_irq_claim(spapr, epow_irq, 1, false, &error_fatal); + QTAILQ_INIT(&spapr->pending_events); =20 spapr->event_sources =3D spapr_event_sources_new(); =20 spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_EPOW, - spapr_irq_alloc(spapr, 0, false, - &error_fatal)); + epow_irq); =20 /* NOTE: if machine supports modern/dedicated hotplug event source, * we add it to the device-tree unconditionally. This means we may @@ -724,9 +729,14 @@ void spapr_events_init(sPAPRMachineState *spapr) * checking that it's enabled. */ if (spapr->use_hotplug_event_source) { + int hp_irq; + + hp_irq =3D spapr_irq_findone(spapr, &error_fatal); + + spapr_irq_claim(spapr, hp_irq, 1, false, &error_fatal); + spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_HOT= _PLUG, - spapr_irq_alloc(spapr, 0, false, - &error_fatal)); + hp_irq); } =20 spapr->epow_notifier.notify =3D spapr_powerdown_req; diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index f936ce63effa..7394c62b4a8b 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -371,8 +371,14 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPR= MachineState *spapr, } =20 /* Allocate MSIs */ - irq =3D spapr_irq_alloc_block(spapr, req_num, false, - ret_intr_type =3D=3D RTAS_TYPE_MSI, &err); + irq =3D spapr_irq_find(spapr, req_num, ret_intr_type =3D=3D RTAS_TYPE_= MSI, &err); + if (err) { + error_reportf_err(err, "Can't allocate MSIs for device %x: ", + config_addr); + rtas_st(rets, 0, RTAS_OUT_HW_ERROR); + return; + } + spapr_irq_claim(spapr, irq, req_num, false, &err); if (err) { error_reportf_err(err, "Can't allocate MSIs for device %x: ", config_addr); @@ -1698,7 +1704,14 @@ static void spapr_phb_realize(DeviceState *dev, Erro= r **errp) uint32_t irq; Error *local_err =3D NULL; =20 - irq =3D spapr_irq_alloc_block(spapr, 1, true, false, &local_err); + irq =3D spapr_irq_findone(spapr, &local_err); + if (local_err) { + error_propagate(errp, local_err); + error_prepend(errp, "can't allocate LSIs: "); + return; + } + + spapr_irq_claim(spapr, irq, 1, true, &local_err); if (local_err) { error_propagate(errp, local_err); error_prepend(errp, "can't allocate LSIs: "); diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 4555c648a8e2..ad9b56e28447 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -475,7 +475,15 @@ static void spapr_vio_busdev_realize(DeviceState *qdev= , Error **errp) dev->qdev.id =3D id; } =20 - dev->irq =3D spapr_irq_alloc(spapr, dev->irq, false, &local_err); + if (!dev->irq) { + dev->irq =3D spapr_irq_findone(spapr, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } + + spapr_irq_claim(spapr, dev->irq, 1, false, &local_err); if (local_err) { error_propagate(errp, local_err); return; --=20 2.13.6 From nobody Sun Apr 28 11:32:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529063834119690.035488331533; Fri, 15 Jun 2018 04:57:14 -0700 (PDT) Received: from localhost ([::1]:46128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnLt-00028S-I8 for importer@patchew.org; Fri, 15 Jun 2018 07:57:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnIe-0007sh-5j for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTnIa-0000jj-T2 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:52 -0400 Received: from 9.mo3.mail-out.ovh.net ([87.98.184.141]:43568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fTnIa-0000jF-Lv for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:48 -0400 Received: from player734.ha.ovh.net (unknown [10.109.120.50]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 2E5041BDA20 for ; Fri, 15 Jun 2018 13:53:47 +0200 (CEST) Received: from zorba.kaod.org (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id EBF5B28008B; Fri, 15 Jun 2018 13:53:42 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 15 Jun 2018 13:53:02 +0200 Message-Id: <20180615115303.31125-3-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180615115303.31125-1-clg@kaod.org> References: <20180615115303.31125-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12162815222394948582 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrleeigdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 87.98.184.141 Subject: [Qemu-devel] [PATCH 2/3] spapr: remove unused spapr_irq routines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" spapr_irq_alloc_block and spapr_irq_alloc() are now deprecated. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: David Gibson Reviewed-by: Greg Kurz --- include/hw/ppc/spapr.h | 4 --- hw/ppc/spapr.c | 80 +---------------------------------------------= ---- 2 files changed, 1 insertion(+), 83 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 6088f44c1b2a..49cda04b1493 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -772,10 +772,6 @@ int spapr_get_vcpu_id(PowerPCCPU *cpu); void spapr_set_vcpu_id(PowerPCCPU *cpu, int cpu_index, Error **errp); PowerPCCPU *spapr_find_cpu(int vcpu_id); =20 -int spapr_irq_alloc(sPAPRMachineState *spapr, int irq_hint, bool lsi, - Error **errp); -int spapr_irq_alloc_block(sPAPRMachineState *spapr, int num, bool lsi, - bool align, Error **errp); int spapr_irq_find(sPAPRMachineState *spapr, int num, bool align, Error **errp); #define spapr_irq_findone(spapr, errp) spapr_irq_find(spapr, 1, false, err= p) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b1d19b328166..c464951747e3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3840,84 +3840,6 @@ int spapr_irq_find(sPAPRMachineState *spapr, int num= , bool align, Error **errp) return first + ics->offset; } =20 -/* - * Allocate the IRQ number and set the IRQ type, LSI or MSI - */ -static void spapr_irq_set_lsi(sPAPRMachineState *spapr, int irq, bool lsi) -{ - ics_set_irq_type(spapr->ics, irq - spapr->ics->offset, lsi); -} - -int spapr_irq_alloc(sPAPRMachineState *spapr, int irq_hint, bool lsi, - Error **errp) -{ - ICSState *ics =3D spapr->ics; - int irq; - - assert(ics); - - if (irq_hint) { - if (!ICS_IRQ_FREE(ics, irq_hint - ics->offset)) { - error_setg(errp, "can't allocate IRQ %d: already in use", irq_= hint); - return -1; - } - irq =3D irq_hint; - } else { - irq =3D ics_find_free_block(ics, 1, 1); - if (irq < 0) { - error_setg(errp, "can't allocate IRQ: no IRQ left"); - return -1; - } - irq +=3D ics->offset; - } - - spapr_irq_set_lsi(spapr, irq, lsi); - trace_spapr_irq_alloc(irq); - - return irq; -} - -/* - * Allocate block of consecutive IRQs, and return the number of the first = IRQ in - * the block. If align=3D=3Dtrue, aligns the first IRQ number to num. - */ -int spapr_irq_alloc_block(sPAPRMachineState *spapr, int num, bool lsi, - bool align, Error **errp) -{ - ICSState *ics =3D spapr->ics; - int i, first =3D -1; - - assert(ics); - - /* - * MSIMesage::data is used for storing VIRQ so - * it has to be aligned to num to support multiple - * MSI vectors. MSI-X is not affected by this. - * The hint is used for the first IRQ, the rest should - * be allocated continuously. - */ - if (align) { - assert((num =3D=3D 1) || (num =3D=3D 2) || (num =3D=3D 4) || - (num =3D=3D 8) || (num =3D=3D 16) || (num =3D=3D 32)); - first =3D ics_find_free_block(ics, num, num); - } else { - first =3D ics_find_free_block(ics, num, 1); - } - if (first < 0) { - error_setg(errp, "can't find a free %d-IRQ block", num); - return -1; - } - - first +=3D ics->offset; - for (i =3D first; i < first + num; ++i) { - spapr_irq_set_lsi(spapr, i, lsi); - } - - trace_spapr_irq_alloc_block(first, num, lsi, align); - - return first; -} - int spapr_irq_claim(sPAPRMachineState *spapr, int irq, int num, bool lsi, Error **errp) { @@ -3934,7 +3856,7 @@ int spapr_irq_claim(sPAPRMachineState *spapr, int irq= , int num, bool lsi, =20 for (i =3D srcno; i < srcno + num; ++i) { if (ICS_IRQ_FREE(ics, i)) { - spapr_irq_set_lsi(spapr, i + ics->offset, lsi); + ics_set_irq_type(ics, i, lsi); } else { error_setg(errp, "IRQ %d is not free", i + ics->offset); ret =3D -1; --=20 2.13.6 From nobody Sun Apr 28 11:32:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529063910358255.83451551053417; Fri, 15 Jun 2018 04:58:30 -0700 (PDT) Received: from localhost ([::1]:46136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnN6-0002p6-0x for importer@patchew.org; Fri, 15 Jun 2018 07:58:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnIi-0007wc-Ht for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTnIf-0000l7-EY for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:56 -0400 Received: from 13.mo6.mail-out.ovh.net ([188.165.56.124]:51403) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fTnIf-0000kk-4d for qemu-devel@nongnu.org; Fri, 15 Jun 2018 07:53:53 -0400 Received: from player734.ha.ovh.net (unknown [10.109.120.106]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id 6A706164762 for ; Fri, 15 Jun 2018 13:53:51 +0200 (CEST) Received: from zorba.kaod.org (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 25EB52800A1; Fri, 15 Jun 2018 13:53:47 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 15 Jun 2018 13:53:03 +0200 Message-Id: <20180615115303.31125-4-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180615115303.31125-1-clg@kaod.org> References: <20180615115303.31125-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12163941122683931622 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrleeigdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 188.165.56.124 Subject: [Qemu-devel] [PATCH 3/3] spapr: introduce a fixed IRQ number space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This proposal introduces a new IRQ number space layout using static numbers for all devices and a bitmap allocator for the MSI numbers which are negotiated by the guest at runtime. The previous layout is kept in machines raising the 'xics_legacy' flag. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr.h | 4 ++++ include/hw/ppc/spapr_irq.h | 30 ++++++++++++++++++++++++ hw/ppc/spapr.c | 31 +++++++++++++++++++++++++ hw/ppc/spapr_events.c | 12 ++++++++-- hw/ppc/spapr_irq.c | 57 ++++++++++++++++++++++++++++++++++++++++++= ++++ hw/ppc/spapr_pci.c | 28 ++++++++++++++++++----- hw/ppc/spapr_vio.c | 15 ++++++++---- hw/ppc/Makefile.objs | 2 +- 8 files changed, 166 insertions(+), 13 deletions(-) create mode 100644 include/hw/ppc/spapr_irq.h create mode 100644 hw/ppc/spapr_irq.c diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 49cda04b1493..094c7780130e 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -7,6 +7,7 @@ #include "hw/ppc/spapr_drc.h" #include "hw/mem/pc-dimm.h" #include "hw/ppc/spapr_ovec.h" +#include "hw/ppc/spapr_irq.h" =20 struct VIOsPAPRBus; struct sPAPRPHBState; @@ -164,6 +165,9 @@ struct sPAPRMachineState { char *kvm_type; =20 const char *icp_type; + bool xics_legacy; + int32_t irq_map_nr; + unsigned long *irq_map; =20 bool cmd_line_caps[SPAPR_CAP_NUM]; sPAPRCapabilities def, eff, mig; diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h new file mode 100644 index 000000000000..07e36d1c7e74 --- /dev/null +++ b/include/hw/ppc/spapr_irq.h @@ -0,0 +1,30 @@ +/* + * QEMU PowerPC sPAPR IRQ backend definitions + * + * Copyright (c) 2018, IBM Corporation. + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ +#ifndef HW_SPAPR_IRQ_H +#define HW_SPAPR_IRQ_H + +/* + * IRQ ranges per type + */ +#define SPAPR_IRQ_EPOW 0x1000 /* XICS_IRQ_BASE offset */ +#define SPAPR_IRQ_HOTPLUG 0x1001 +#define SPAPR_IRQ_VIO 0x1040 +#define SPAPR_IRQ_PCI_LSI 0x1080 + +#define SPAPR_IRQ_MSI 0x1100 /* Offset of the dynamic range covered + * by the bitmap allocator */ + +void spapr_irq_msi_init(sPAPRMachineState *spapr, uint32_t nr_irqs, + Error **errp); +int spapr_irq_msi_alloc(sPAPRMachineState *spapr, uint32_t num, bool align, + Error **errp); +void spapr_irq_msi_free(sPAPRMachineState *spapr, int irq, uint32_t num); +void spapr_irq_msi_reset(sPAPRMachineState *spapr); + +#endif diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c464951747e3..32aa5d869d9c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -187,6 +187,11 @@ static void xics_system_init(MachineState *machine, in= t nr_irqs, Error **errp) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(machine); =20 + /* Initialize the MSI IRQ allocator. */ + if (!spapr->xics_legacy) { + spapr_irq_msi_init(spapr, nr_irqs, &error_fatal); + } + if (kvm_enabled()) { if (machine_kernel_irqchip_allowed(machine) && !xics_kvm_init(spapr, errp)) { @@ -1629,6 +1634,10 @@ static void spapr_machine_reset(void) ppc_set_compat(first_ppc_cpu, spapr->max_compat_pvr, &error_fatal); } =20 + if (!spapr->xics_legacy) { + spapr_irq_msi_reset(spapr); + } + qemu_devices_reset(); =20 /* DRC reset may cause a device to be unplugged. This will cause troub= les @@ -1903,6 +1912,24 @@ static const VMStateDescription vmstate_spapr_patb_e= ntry =3D { }, }; =20 +static bool spapr_irq_map_needed(void *opaque) +{ + sPAPRMachineState *spapr =3D opaque; + + return spapr->irq_map && !bitmap_empty(spapr->irq_map, spapr->irq_map_= nr); +} + +static const VMStateDescription vmstate_spapr_irq_map =3D { + .name =3D "spapr_irq_map", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D spapr_irq_map_needed, + .fields =3D (VMStateField[]) { + VMSTATE_BITMAP(irq_map, sPAPRMachineState, 0, irq_map_nr), + VMSTATE_END_OF_LIST() + }, +}; + static const VMStateDescription vmstate_spapr =3D { .name =3D "spapr", .version_id =3D 3, @@ -1930,6 +1957,7 @@ static const VMStateDescription vmstate_spapr =3D { &vmstate_spapr_cap_cfpc, &vmstate_spapr_cap_sbbc, &vmstate_spapr_cap_ibs, + &vmstate_spapr_irq_map, NULL } }; @@ -4101,7 +4129,10 @@ DEFINE_SPAPR_MACHINE(3_0, "3.0", true); =20 static void spapr_machine_2_12_instance_options(MachineState *machine) { + sPAPRMachineState *spapr =3D SPAPR_MACHINE(machine); + spapr_machine_3_0_instance_options(machine); + spapr->xics_legacy =3D true; } =20 static void spapr_machine_2_12_class_options(MachineClass *mc) diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 3b6ae7272092..1ef7ce7f1509 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -709,7 +709,11 @@ void spapr_events_init(sPAPRMachineState *spapr) { int epow_irq; =20 - epow_irq =3D spapr_irq_findone(spapr, &error_fatal); + if (spapr->xics_legacy) { + epow_irq =3D spapr_irq_findone(spapr, &error_fatal); + } else { + epow_irq =3D SPAPR_IRQ_EPOW; + } =20 spapr_irq_claim(spapr, epow_irq, 1, false, &error_fatal); =20 @@ -731,7 +735,11 @@ void spapr_events_init(sPAPRMachineState *spapr) if (spapr->use_hotplug_event_source) { int hp_irq; =20 - hp_irq =3D spapr_irq_findone(spapr, &error_fatal); + if (spapr->xics_legacy) { + hp_irq =3D spapr_irq_findone(spapr, &error_fatal); + } else { + hp_irq =3D SPAPR_IRQ_HOTPLUG; + } =20 spapr_irq_claim(spapr, hp_irq, 1, false, &error_fatal); =20 diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c new file mode 100644 index 000000000000..55fa764c85d1 --- /dev/null +++ b/hw/ppc/spapr_irq.c @@ -0,0 +1,57 @@ +/* + * QEMU PowerPC sPAPR IRQ interface + * + * Copyright (c) 2018, IBM Corporation. + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/xics.h" + +void spapr_irq_msi_init(sPAPRMachineState *spapr, uint32_t nr_irqs, + Error **errp) +{ + spapr->irq_map_nr =3D XICS_IRQ_BASE + nr_irqs - SPAPR_IRQ_MSI; + spapr->irq_map =3D bitmap_new(spapr->irq_map_nr); +} + +int spapr_irq_msi_alloc(sPAPRMachineState *spapr, uint32_t num, bool align, + Error **errp) +{ + int irq; + + /* + * The 'align_mask' parameter of bitmap_find_next_zero_area() + * should be one less than a power of 2; 0 means no + * alignment. Adapt the 'align' value of the former allocator + * to fit the requirements of bitmap_find_next_zero_area() + */ + align -=3D 1; + + irq =3D bitmap_find_next_zero_area(spapr->irq_map, spapr->irq_map_nr, = 0, num, + align); + if (irq =3D=3D spapr->irq_map_nr) { + error_setg(errp, "can't find a free %d-IRQ block", num); + return -1; + } + + bitmap_set(spapr->irq_map, irq, num); + + return irq + SPAPR_IRQ_MSI; +} + +void spapr_irq_msi_free(sPAPRMachineState *spapr, int irq, uint32_t num) +{ + bitmap_clear(spapr->irq_map, irq - SPAPR_IRQ_MSI, num); +} + +void spapr_irq_msi_reset(sPAPRMachineState *spapr) +{ + bitmap_clear(spapr->irq_map, 0, spapr->irq_map_nr); +} diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 7394c62b4a8b..f3c4a25fb482 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -333,6 +333,9 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, return; } =20 + if (!spapr->xics_legacy) { + spapr_irq_msi_free(spapr, msi->first_irq, msi->num); + } spapr_irq_free(spapr, msi->first_irq, msi->num); if (msi_present(pdev)) { spapr_msi_setmsg(pdev, 0, false, 0, 0); @@ -371,7 +374,13 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPR= MachineState *spapr, } =20 /* Allocate MSIs */ - irq =3D spapr_irq_find(spapr, req_num, ret_intr_type =3D=3D RTAS_TYPE_= MSI, &err); + if (spapr->xics_legacy) { + irq =3D spapr_irq_find(spapr, req_num, ret_intr_type =3D=3D RTAS_T= YPE_MSI, + &err); + } else { + irq =3D spapr_irq_msi_alloc(spapr, req_num, + ret_intr_type =3D=3D RTAS_TYPE_MSI, &err= ); + } if (err) { error_reportf_err(err, "Can't allocate MSIs for device %x: ", config_addr); @@ -388,6 +397,9 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, =20 /* Release previous MSIs */ if (msi) { + if (!spapr->xics_legacy) { + spapr_irq_msi_free(spapr, msi->first_irq, msi->num); + } spapr_irq_free(spapr, msi->first_irq, msi->num); g_hash_table_remove(phb->msi, &config_addr); } @@ -1704,11 +1716,15 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) uint32_t irq; Error *local_err =3D NULL; =20 - irq =3D spapr_irq_findone(spapr, &local_err); - if (local_err) { - error_propagate(errp, local_err); - error_prepend(errp, "can't allocate LSIs: "); - return; + if (spapr->xics_legacy) { + irq =3D spapr_irq_findone(spapr, &local_err); + if (local_err) { + error_propagate(errp, local_err); + error_prepend(errp, "can't allocate LSIs: "); + return; + } + } else { + irq =3D SPAPR_IRQ_PCI_LSI + sphb->index * PCI_NUM_PINS + i; } =20 spapr_irq_claim(spapr, irq, 1, true, &local_err); diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index ad9b56e28447..7707bda6a38d 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -436,6 +436,9 @@ static void spapr_vio_busdev_reset(DeviceState *qdev) } } =20 +/* TODO : poor VIO device indexing ... */ +static uint32_t vio_index; + static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); @@ -476,10 +479,14 @@ static void spapr_vio_busdev_realize(DeviceState *qde= v, Error **errp) } =20 if (!dev->irq) { - dev->irq =3D spapr_irq_findone(spapr, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; + if (spapr->xics_legacy) { + dev->irq =3D spapr_irq_findone(spapr, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } else { + dev->irq =3D SPAPR_IRQ_VIO + vio_index++; } } =20 diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 86d82a6ec3ac..4fe3b7804d43 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -4,7 +4,7 @@ obj-y +=3D ppc.o ppc_booke.o fdt.o obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_caps.o spapr_vio.o spapr_events.o obj-$(CONFIG_PSERIES) +=3D spapr_hcall.o spapr_iommu.o spapr_rtas.o obj-$(CONFIG_PSERIES) +=3D spapr_pci.o spapr_rtc.o spapr_drc.o spapr_rng.o -obj-$(CONFIG_PSERIES) +=3D spapr_cpu_core.o spapr_ovec.o +obj-$(CONFIG_PSERIES) +=3D spapr_cpu_core.o spapr_ovec.o spapr_irq.o # IBM PowerNV obj-$(CONFIG_POWERNV) +=3D pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.= o pnv_occ.o pnv_bmc.o ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy) --=20 2.13.6