From patchwork Wed Apr 12 00:44:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9676253 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 16ADF60383 for ; Wed, 12 Apr 2017 00:48:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F221E28550 for ; Wed, 12 Apr 2017 00:48:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E72562857B; Wed, 12 Apr 2017 00:48:27 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A9C7828550 for ; Wed, 12 Apr 2017 00:48:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6Qw-0001JA-TH; Wed, 12 Apr 2017 00:46:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6Qv-0001GC-Gh for xen-devel@lists.xenproject.org; Wed, 12 Apr 2017 00:46:53 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id 90/5C-13192-CF87DE85; Wed, 12 Apr 2017 00:46:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTfdPxds Ig0uLhS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oye3RfYCs4JVfTf3MXWwDiXv4uRi0NIYBOj xLrFh1ghnL2MEjvbTjF1MXJysAnoSuy4+ZoZxBYRCJWY8/MRM0gRs8AaRon2T09ZQRLCAq4Sf RMus4DYLAKqEp/OdYE18Aq4S/T9+w40iINDQkBO4sq/BJAwJ1B4++6JYK1CAm4SW6ctZp7AyL 2AkWEVo0ZxalFZapGukYFeUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkaghxmAYAf jr2UBhxglOZiURHkvK7yNEOJLyk+pzEgszogvKs1JLT7EKMPBoSTBGwUMGCHBotT01Iq0zBxg qMGkJTh4lER4fUHSvMUFibnFmekQqVOMilLivO4gCQGQREZpHlwbLLwvMcpKCfMyAh0ixFOQW pSbWYIq/4pRnINRSZjXH2QKT2ZeCdz0V0CLmYAWn9n1EmRxSSJCSqqBMW2n5lXB/7x8n+beuZ pYfMZffvnbY0yFWj7lFf1eM/hnTxLa33ZdbXqMxLOKjLD1CrJ8jt+3+jkqme7n5JFW+1y2SEi pc63/Yi6Nc1bNWVeDior5me/nPorumV22/PXXoAarfdN7dmlqdDnL7AzxnPVLYo/ZYiN+qd/r 5inJTcjgsQ8szbFSYinOSDTUYi4qTgQAQE6KmmoCAAA= X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1491958011!96081587!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36365 invoked from network); 12 Apr 2017 00:46:52 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-4.tower-27.messagelabs.com with SMTP; 12 Apr 2017 00:46:52 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 96D7BCFC; Tue, 11 Apr 2017 17:46:51 -0700 (PDT) Received: from slackpad.lan (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 01EEA3F575; Tue, 11 Apr 2017 17:46:49 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Wed, 12 Apr 2017 01:44:32 +0100 Message-Id: <1491957874-31600-26-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1491957874-31600-1-git-send-email-andre.przywara@arm.com> References: <1491957874-31600-1-git-send-email-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Vijaya Kumar K , Vijay Kilari , Shanker Donthineni Subject: [Xen-devel] [PATCH v8 25/27] ARM: vITS: increase mmio_count for each ITS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Increase the count of MMIO regions needed by one for each ITS Dom0 has to emulate. We emulate the ITSes 1:1 from the hardware, so the number is the number of host ITSes. Signed-off-by: Andre Przywara --- xen/arch/arm/vgic-v3-its.c | 15 +++++++++++++++ xen/arch/arm/vgic-v3.c | 3 +++ xen/include/asm-arm/gic_v3_its.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 9b5032b..1622e53 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -83,6 +83,21 @@ struct vits_itte #define GITS_BASER_RO_MASK (GITS_BASER_TYPE_MASK | \ (31UL << GITS_BASER_ENTRY_SIZE_SHIFT)) +unsigned int vgic_v3_its_count(const struct domain *d) +{ + struct host_its *hw_its; + unsigned int ret = 0; + + /* Only Dom0 can use emulated ITSes so far. */ + if ( !is_hardware_domain(d) ) + return 0; + + list_for_each_entry(hw_its, &host_its_list, entry) + ret++; + + return ret; +} + int vgic_v3_its_init_domain(struct domain *d) { spin_lock_init(&d->arch.vgic.its_devices_lock); diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 33cd5f7..e8ed658 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1784,6 +1784,9 @@ int vgic_v3_init(struct domain *d, int *mmio_count) /* GICD region + number of Redistributors */ *mmio_count = vgic_v3_rdist_count(d) + 1; + /* one region per ITS */ + *mmio_count += vgic_v3_its_count(d); + register_vgic_ops(d, &v3_ops); return 0; diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h index ee69e9b..ae79d5c 100644 --- a/xen/include/asm-arm/gic_v3_its.h +++ b/xen/include/asm-arm/gic_v3_its.h @@ -137,6 +137,8 @@ void gicv3_its_dt_init(const struct dt_device_node *node); bool gicv3_its_host_has_its(void); +unsigned int vgic_v3_its_count(const struct domain *d); + void gicv3_do_LPI(unsigned int lpi); int gicv3_lpi_init_rdist(void __iomem * rdist_base); @@ -193,6 +195,11 @@ static inline bool gicv3_its_host_has_its(void) return false; } +static inline unsigned int vgic_v3_its_count(const struct domain *d) +{ + return 0; +} + static inline void gicv3_do_LPI(unsigned int lpi) { /* We don't enable LPIs without an ITS. */