From nobody Tue Feb 10 16:18:30 2026 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 1528387497095844.8311646465767; Thu, 7 Jun 2018 09:04:57 -0700 (PDT) Received: from localhost ([::1]:58846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQxPE-0005M7-6Z for importer@patchew.org; Thu, 07 Jun 2018 12:04:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQxBa-0001oV-FE for qemu-devel@nongnu.org; Thu, 07 Jun 2018 11:50:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQxBV-0003Z4-IP for qemu-devel@nongnu.org; Thu, 07 Jun 2018 11:50:50 -0400 Received: from 8.mo69.mail-out.ovh.net ([46.105.56.233]:42199) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQxBV-0003Xy-8f for qemu-devel@nongnu.org; Thu, 07 Jun 2018 11:50:45 -0400 Received: from player169.ha.ovh.net (unknown [10.109.105.34]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id 6C84615923 for ; Thu, 7 Jun 2018 17:50:43 +0200 (CEST) Received: from zorba.kaod.org.com (deibp9eh1--blueice1n0.emea.ibm.com [195.212.29.162]) (Authenticated sender: clg@kaod.org) by player169.ha.ovh.net (Postfix) with ESMTPSA id 0B7A55800A3; Thu, 7 Jun 2018 17:50:37 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-ppc@nongnu.org Date: Thu, 7 Jun 2018 17:49:40 +0200 Message-Id: <20180607155003.1580-6-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180607155003.1580-1-clg@kaod.org> References: <20180607155003.1580-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6076200323369503571 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrjeejgdelgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.56.233 Subject: [Qemu-devel] [PATCH v4 05/28] ppc/xive: add support for the LSI interrupt sources 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: Greg Kurz , qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson 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" The 'sent' status of the LSI interrupt source is modeled with the 'P' bit of the ESB and the assertion status of the source is maintained in an array under the main sPAPRXive object. The type of the source is stored in the same array for practical reasons. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/xive.h | 20 ++++++++++++++- hw/intc/xive.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++-= ---- 2 files changed, 81 insertions(+), 7 deletions(-) diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 5fec4b08705d..e118acd59f1e 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -32,8 +32,10 @@ typedef struct XiveSource { /* IRQs */ uint32_t nr_irqs; qemu_irq *qirqs; + unsigned long *lsi_map; + int32_t lsi_map_size; /* for VMSTATE_BITMAP */ =20 - /* PQ bits */ + /* PQ bits and LSI assertion bit */ uint8_t *status; =20 /* ESB memory region */ @@ -89,6 +91,7 @@ static inline hwaddr xive_source_esb_mgmt(XiveSource *xsr= c, int srcno) * When doing an EOI, the Q bit will indicate if the interrupt * needs to be re-triggered. */ +#define XIVE_STATUS_ASSERTED 0x4 /* Extra bit for LSI */ #define XIVE_ESB_VAL_P 0x2 #define XIVE_ESB_VAL_Q 0x1 =20 @@ -127,4 +130,19 @@ static inline qemu_irq xive_source_qirq(XiveSource *xs= rc, uint32_t srcno) return xsrc->qirqs[srcno]; } =20 +static inline bool xive_source_irq_is_lsi(XiveSource *xsrc, uint32_t srcno) +{ + assert(srcno < xsrc->nr_irqs); + return test_bit(srcno, xsrc->lsi_map); +} + +static inline void xive_source_irq_set(XiveSource *xsrc, uint32_t srcno, + bool lsi) +{ + assert(srcno < xsrc->nr_irqs); + if (lsi) { + bitmap_set(xsrc->lsi_map, srcno, 1); + } +} + #endif /* PPC_XIVE_H */ diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 4d1cb2497237..3ad8c151b9dc 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -91,11 +91,37 @@ uint8_t xive_source_esb_set(XiveSource *xsrc, uint32_t = srcno, uint8_t pq) /* * Returns whether the event notification should be forwarded. */ +static bool xive_source_lsi_trigger(XiveSource *xsrc, uint32_t srcno) +{ + uint8_t old_pq =3D xive_source_esb_get(xsrc, srcno); + + switch (old_pq) { + case XIVE_ESB_RESET: + xive_source_esb_set(xsrc, srcno, XIVE_ESB_PENDING); + return true; + default: + return false; + } +} + +/* + * Returns whether the event notification should be forwarded. + */ static bool xive_source_esb_trigger(XiveSource *xsrc, uint32_t srcno) { + bool ret; + assert(srcno < xsrc->nr_irqs); =20 - return xive_esb_trigger(&xsrc->status[srcno]); + ret =3D xive_esb_trigger(&xsrc->status[srcno]); + + if (xive_source_irq_is_lsi(xsrc, srcno) && + xive_source_esb_get(xsrc, srcno) =3D=3D XIVE_ESB_QUEUED) { + qemu_log_mask(LOG_GUEST_ERROR, + "XIVE: queued an event on LSI IRQ %d\n", srcno); + } + + return ret; } =20 /* @@ -103,9 +129,22 @@ static bool xive_source_esb_trigger(XiveSource *xsrc, = uint32_t srcno) */ static bool xive_source_esb_eoi(XiveSource *xsrc, uint32_t srcno) { + bool ret; + assert(srcno < xsrc->nr_irqs); =20 - return xive_esb_eoi(&xsrc->status[srcno]); + ret =3D xive_esb_eoi(&xsrc->status[srcno]); + + /* LSI sources do not set the Q bit but they can still be + * asserted, in which case we should forward a new event + * notification + */ + if (xive_source_irq_is_lsi(xsrc, srcno) && + xsrc->status[srcno] & XIVE_STATUS_ASSERTED) { + ret =3D xive_source_lsi_trigger(xsrc, srcno); + } + + return ret; } =20 /* @@ -266,8 +305,17 @@ static void xive_source_set_irq(void *opaque, int srcn= o, int val) XiveSource *xsrc =3D XIVE_SOURCE(opaque); bool notify =3D false; =20 - if (val) { - notify =3D xive_source_esb_trigger(xsrc, srcno); + if (xive_source_irq_is_lsi(xsrc, srcno)) { + if (val) { + xsrc->status[srcno] |=3D XIVE_STATUS_ASSERTED; + notify =3D xive_source_lsi_trigger(xsrc, srcno); + } else { + xsrc->status[srcno] &=3D ~XIVE_STATUS_ASSERTED; + } + } else { + if (val) { + notify =3D xive_source_esb_trigger(xsrc, srcno); + } } =20 /* Forward the source event notification for routing */ @@ -289,9 +337,11 @@ void xive_source_pic_print_info(XiveSource *xsrc, uint= 32_t offset, Monitor *mon) continue; } =20 - monitor_printf(mon, " %8x %c%c\n", i + offset, + monitor_printf(mon, " %8x %s %c%c%c\n", i + offset, + xive_source_irq_is_lsi(xsrc, i) ? "LSI" : "MSI", pq & XIVE_ESB_VAL_P ? 'P' : '-', - pq & XIVE_ESB_VAL_Q ? 'Q' : '-'); + pq & XIVE_ESB_VAL_Q ? 'Q' : '-', + xsrc->status[i] & XIVE_STATUS_ASSERTED ? 'A' : ' '); } } =20 @@ -299,6 +349,8 @@ static void xive_source_reset(DeviceState *dev) { XiveSource *xsrc =3D XIVE_SOURCE(dev); =20 + /* Do not clear the LSI bitmap */ + /* PQs are initialized to 0b01 which corresponds to "ints off" */ memset(xsrc->status, 0x1, xsrc->nr_irqs); } @@ -325,6 +377,9 @@ static void xive_source_realize(DeviceState *dev, Error= **errp) =20 xsrc->status =3D g_malloc0(xsrc->nr_irqs); =20 + xsrc->lsi_map =3D bitmap_new(xsrc->nr_irqs); + xsrc->lsi_map_size =3D xsrc->nr_irqs; + memory_region_init_io(&xsrc->esb_mmio, OBJECT(xsrc), &xive_source_esb_ops, xsrc, "xive.esb", (1ull << xsrc->esb_shift) * xsrc->nr_irqs); @@ -338,6 +393,7 @@ static const VMStateDescription vmstate_xive_source =3D= { .fields =3D (VMStateField[]) { VMSTATE_UINT32_EQUAL(nr_irqs, XiveSource, NULL), VMSTATE_VBUFFER_UINT32(status, XiveSource, 1, NULL, nr_irqs), + VMSTATE_BITMAP(lsi_map, XiveSource, 1, lsi_map_size), VMSTATE_END_OF_LIST() }, }; --=20 2.13.6