From patchwork Thu May 11 17:53:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9722651 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 D26BD60236 for ; Thu, 11 May 2017 17:53:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2AB6286D0 for ; Thu, 11 May 2017 17:53:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C76F5286E5; Thu, 11 May 2017 17:53:55 +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 670B0286D0 for ; Thu, 11 May 2017 17:53:55 +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 1d8sG0-0001FF-A8; Thu, 11 May 2017 17:52:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8sFy-00019t-BY for xen-devel@lists.xenproject.org; Thu, 11 May 2017 17:52:06 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 7B/AC-02183-5C4A4195; Thu, 11 May 2017 17:52:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTffQEpF Ig9l7+Sy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyV0xvZCx4KVZztXc3YwLiev4uRi0NIYDOj xOxpH9khnOWMElfPdDN1MXJysAnoSuy4+ZoZxBYRCJV4uuA7M0gRs8AaRolzi36ygSSEBVwlT lw+zApiswioSrQcuwFm8wpYS7y/3gxmSwjISTScvw82iBMovmT6LBYQW0jASmLX7tOsExi5Fz AyrGJUL04tKkst0rXUSyrKTM8oyU3MzNE1NDDVy00tLk5MT81JTCrWS87P3cQI9DADEOxgXNv qfIhRkoNJSZSXcaJIpBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3quLgXKCRanpqRVpmTnAUINJ S3DwKInwLgFJ8xYXJOYWZ6ZDpE4xKkqJ8woCA1RIACSRUZoH1wYL70uMslLCvIxAhwjxFKQW5 WaWoMq/YhTnYFQS5t0JMp4nM68EbvoroMVMQIv7/wiDLC5JREhJNTA6eH1lttC9vittf6dEj9 Cdewpp+gpS/dJXeSV4c3/xLv5ud1L++7/I4/9Lvzx69UK+4HR83yYBBQax7VJPC3wuvnhSULV m1h7ztdaaKXemH100+dP7G7unK+oeL2O3j85pubhRvaw+7fz281Nahc2b1Es+BUw/zisnnNgv bb3Z874DA8s3lXAlluKMREMt5qLiRAAmH8lVagIAAA== X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1494525121!61353726!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 49995 invoked from network); 11 May 2017 17:52:02 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-12.tower-206.messagelabs.com with SMTP; 11 May 2017 17:52:02 -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 700DF1BBD; Thu, 11 May 2017 10:52:01 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 47F213F4FF; Thu, 11 May 2017 10:52:00 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Thu, 11 May 2017 18:53:38 +0100 Message-Id: <20170511175340.8448-27-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170511175340.8448-1-andre.przywara@arm.com> References: <20170511175340.8448-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Vijaya Kumar K , Vijay Kilari , Shanker Donthineni Subject: [Xen-devel] [PATCH v9 26/28] 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 Acked-by: Julien Grall --- 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 36faa16..8f6ff11 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -86,6 +86,21 @@ typedef uint64_t dev_table_entry_t; #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 6dbdb2e..41cda78 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1802,6 +1802,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 82d788c..927568f 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); @@ -196,6 +198,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. */