From patchwork Thu Apr 19 12:43:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 10349939 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CE447602B7 for ; Thu, 19 Apr 2018 13:00:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD50928433 for ; Thu, 19 Apr 2018 13:00:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF5CD28A1B; Thu, 19 Apr 2018 13:00:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11F9C28433 for ; Thu, 19 Apr 2018 13:00:08 +0000 (UTC) Received: from localhost ([::1]:45161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f99AV-0003Kk-KP for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Apr 2018 09:00:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f98wE-0000UU-Qt for qemu-devel@nongnu.org; Thu, 19 Apr 2018 08:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f98wA-0000In-RV for qemu-devel@nongnu.org; Thu, 19 Apr 2018 08:45:22 -0400 Received: from 7.mo3.mail-out.ovh.net ([46.105.57.200]:57109) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f98wA-0000Ho-Fw for qemu-devel@nongnu.org; Thu, 19 Apr 2018 08:45:18 -0400 Received: from player792.ha.ovh.net (unknown [10.109.122.84]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 1C0DC1B3526 for ; Thu, 19 Apr 2018 14:45:17 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-REN-1-664-241.w81-53.abo.wanadoo.fr [81.53.234.241]) (Authenticated sender: clg@kaod.org) by player792.ha.ovh.net (Postfix) with ESMTPSA id 44471A009B; Thu, 19 Apr 2018 14:45:11 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Date: Thu, 19 Apr 2018 14:43:12 +0200 Message-Id: <20180419124331.3915-17-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180419124331.3915-1-clg@kaod.org> References: <20180419124331.3915-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10330413121869220691 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtgedrjeehgdehjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.57.200 Subject: [Qemu-devel] [PATCH v3 16/35] spapr: introduce a helper to map the XIVE memory regions 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When the XIVE exploitation interrupt mode is activated, the machine needs to expose to the guest the MMIO regions used by the controller : - Event State Buffers - Thread Interrupt Management Area for the OS and User views Migration will also need to reflect the current interrupt mode in use. Signed-off-by: Cédric Le Goater --- Changes since v2: - introduced spapr_xive_mmio_unmap() - introduced spapr_machine_reset() for reset and post_load hw/intc/spapr_xive.c | 24 ++++++++++++++++++++++++ hw/ppc/spapr.c | 22 ++++++++++++++++++++++ include/hw/ppc/spapr_xive.h | 2 ++ 3 files changed, 48 insertions(+) diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index d0d5a7d7f969..7aba6e571a93 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -239,3 +239,27 @@ bool spapr_xive_irq_disable(sPAPRXive *xive, uint32_t lisn) xive_source_irq_set(xsrc, lisn - xsrc->offset, false); return true; } + +void spapr_xive_mmio_map(sPAPRXive *xive) +{ + XiveSource *xsrc = &xive->source; + + /* ESBs */ + sysbus_mmio_map(SYS_BUS_DEVICE(xsrc), 0, xsrc->esb_base); + + /* Thread Management Interrupt Area: User and OS views */ + sysbus_mmio_map(SYS_BUS_DEVICE(xive), 0, xive->tm_base); + sysbus_mmio_map(SYS_BUS_DEVICE(xive), 1, xive->tm_base + (1 << TM_SHIFT)); +} + +void spapr_xive_mmio_unmap(sPAPRXive *xive) +{ + XiveSource *xsrc = &xive->source; + + /* ESBs */ + sysbus_mmio_unmap(SYS_BUS_DEVICE(xsrc), 0); + + /* Thread Management Interrupt Area: User and OS views */ + sysbus_mmio_unmap(SYS_BUS_DEVICE(xive), 0); + sysbus_mmio_unmap(SYS_BUS_DEVICE(xive), 1); +} diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d4bc6f56c9d4..a9770f8f0a6e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1519,6 +1519,19 @@ static int spapr_reset_drcs(Object *child, void *opaque) return 0; } +/* Setup XIVE exploitation or legacy mode as required by CAS */ +static void spapr_reset_interrupt(sPAPRMachineState *spapr, Error **errp) +{ + /* Reset XIVE if enabled */ + if (spapr->xive_exploitation) { + spapr_xive_mmio_unmap(spapr->xive); + } + + if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) { + spapr_xive_mmio_map(spapr->xive); + } +} + static void spapr_machine_reset(void) { MachineState *machine = MACHINE(qdev_get_machine()); @@ -1555,6 +1568,8 @@ static void spapr_machine_reset(void) ppc_set_compat(first_ppc_cpu, spapr->max_compat_pvr, &error_fatal); } + spapr_reset_interrupt(spapr, &error_fatal); + qemu_devices_reset(); /* DRC reset may cause a device to be unplugged. This will cause troubles @@ -1664,6 +1679,7 @@ static int spapr_post_load(void *opaque, int version_id) { sPAPRMachineState *spapr = (sPAPRMachineState *)opaque; int err = 0; + Error *local_err = NULL; err = spapr_caps_post_migration(spapr); if (err) { @@ -1698,6 +1714,12 @@ static int spapr_post_load(void *opaque, int version_id) } } + spapr_reset_interrupt(spapr, &local_err); + if (local_err) { + error_report_err(local_err); + return -EINVAL; + } + return err; } diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index 416f51404ce2..0373b1c995bc 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -35,6 +35,8 @@ typedef struct sPAPRXive { bool spapr_xive_irq_enable(sPAPRXive *xive, uint32_t lisn, bool lsi); bool spapr_xive_irq_disable(sPAPRXive *xive, uint32_t lisn); void spapr_xive_pic_print_info(sPAPRXive *xive, Monitor *mon); +void spapr_xive_mmio_map(sPAPRXive *xive); +void spapr_xive_mmio_unmap(sPAPRXive *xive); /* * sPAPR encoding of EQ indexes