From patchwork Thu Jul 14 16:18:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shanker Donthineni X-Patchwork-Id: 9230115 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 121BE607D0 for ; Thu, 14 Jul 2016 16:21:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02DA627FA4 for ; Thu, 14 Jul 2016 16:21:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7A8927F96; Thu, 14 Jul 2016 16:21:02 +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 78BDA27F96 for ; Thu, 14 Jul 2016 16:21:02 +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 1bNjLd-0002Kn-6W; Thu, 14 Jul 2016 16:18:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNjLb-0002JY-Re for xen-devel@lists.xensource.com; Thu, 14 Jul 2016 16:18:47 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id F2/D9-07949-76BB7875; Thu, 14 Jul 2016 16:18:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeJIrShJLcpLzFFi42I5NlE2QTdtd3u 4wd9f+hb3prxnd2D02N63iz2AMYo1My8pvyKBNWP+t83sBe81Ks79v8zawLhfoYuRk0NIoEhi y5qbjCC2hEC0xLoNx9ghbD6Jiy9+MEHYpRILb+xm7WLkAqq/xSTxftMvti5GDg42ASOJf725I DUiAo2MEn2dbiA2s0C9xMbeNWC9wkAzd654DDafRUBV4sqhhawgNq+Au8TlB59YIebLSZw8Nh nM5hTwkHjS18cMcZu7xL1X/ewTGPkWMDKsYtQoTi0qSy3SNTLWSyrKTM8oyU3MzNE1NDDWy00 tLk5MT81JTCrWS87P3cQIDJJ6BgbGHYx9e/0OMUpyMCmJ8mr3t4UL8SXlp1RmJBZnxBeV5qQW H2LU4OAQ6F2z+gKjFEtefl6qkgSv6a72cCHBotT01Iq0zBxgGMOUSnDwKInw5oCkeYsLEnOLM 9MhUqcYFaXEedNAEgIgiYzSPLg2WOxcYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMawMyhS czrwRu+iugxUxAi63NwRaXJCKkpBoYZ753uV3edpu1/72m3twXL2Yy6W0z6rIyDavhDQnb/zf r0/Su/wt2T2UOmXh+dkvwSqcP575zWmyWOM9mJ13eayp9c8W7vUdFRCbKn3oQy6TidqfGKGDD KZVpB09Mr3x3hddvzZqtnrFarcyHDfY7JXiu82X55ypSx/vlj534jAvuM9eeOF1jqsRSnJFoq MVcVJwIAOADgXuYAgAA X-Env-Sender: shankerd@codeaurora.org X-Msg-Ref: server-15.tower-31.messagelabs.com!1468513125!46697121!1 X-Originating-IP: [198.145.29.96] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46812 invoked from network); 14 Jul 2016 16:18:46 -0000 Received: from smtp.codeaurora.org (HELO smtp.codeaurora.org) (198.145.29.96) by server-15.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Jul 2016 16:18:46 -0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0D513611E2; Thu, 14 Jul 2016 16:18:45 +0000 (UTC) Received: from shankerd-ubuntu.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: shankerd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0D05F611DD; Thu, 14 Jul 2016 16:18:43 +0000 (UTC) From: Shanker Donthineni To: xen-devel , Julien Grall , Stefano Stabellini Date: Thu, 14 Jul 2016 11:18:01 -0500 Message-Id: <1468513081-12002-3-git-send-email-shankerd@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468513081-12002-1-git-send-email-shankerd@codeaurora.org> References: <1468513081-12002-1-git-send-email-shankerd@codeaurora.org> Cc: Philip Elcan , Shanker Donthineni , Vikram Sethi Subject: [Xen-devel] [PATCH V4 11/11] arm/vgic: Change fixed number of mmio handlers to variable number 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 Compute the number of mmio handlers that are required for vGICv3 and vGICv2 emulation drivers in vgic_v3_init()/vgic_v2_init(). Augment this variable number of mmio handers to a fixed number MAX_IO_HANDLER and pass it to domain_io_init() to allocate enough memory. New code path: domain_vgic_register(&count) domain_io_init(count + MAX_IO_HANDLER) domain_vgic_init() Signed-off-by: Shanker Donthineni --- Changes since v3: Removed the variable 'mmio_count' from structure 'arch_domain', handle through a function argument. xen/arch/arm/domain.c | 12 +++++++----- xen/arch/arm/vgic-v2.c | 3 ++- xen/arch/arm/vgic-v3.c | 5 ++++- xen/arch/arm/vgic.c | 10 +++------- xen/include/asm-arm/vgic.h | 5 +++-- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 4010ff2..ddecd45 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -527,7 +527,7 @@ void vcpu_destroy(struct vcpu *v) int arch_domain_create(struct domain *d, unsigned int domcr_flags, struct xen_arch_domainconfig *config) { - int rc, count; + int rc, count = 0; d->arch.relmem = RELMEM_not_started; @@ -550,10 +550,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, share_xen_page_with_guest( virt_to_page(d->shared_info), d, XENSHARE_writable); - count = MAX_IO_HANDLER; - if ( (rc = domain_io_init(d, count)) != 0 ) - goto fail; - if ( (rc = p2m_alloc_table(d)) != 0 ) goto fail; @@ -590,6 +586,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, goto fail; } + if ( (rc = domain_vgic_register(d, &count)) != 0 ) + goto fail; + + if ( (rc = domain_io_init(d, count + MAX_IO_HANDLER)) != 0 ) + goto fail; + if ( (rc = domain_vgic_init(d, config->nr_spis)) != 0 ) goto fail; diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index f5778e6..928f9af 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -711,7 +711,7 @@ static const struct vgic_ops vgic_v2_ops = { .max_vcpus = 8, }; -int vgic_v2_init(struct domain *d) +int vgic_v2_init(struct domain *d, int *mmio_count) { if ( !vgic_v2_hw.enabled ) { @@ -721,6 +721,7 @@ int vgic_v2_init(struct domain *d) return -ENODEV; } + *mmio_count = 1; /* Only GICD region */ register_vgic_ops(d, &vgic_v2_ops); return 0; diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index be9a9a3..f926fe6 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1499,7 +1499,7 @@ static const struct vgic_ops v3_ops = { .max_vcpus = 4096, }; -int vgic_v3_init(struct domain *d) +int vgic_v3_init(struct domain *d, int *mmio_count) { if ( !vgic_v3_hw.enabled ) { @@ -1509,6 +1509,9 @@ int vgic_v3_init(struct domain *d) return -ENODEV; } + /* GICD region + number of Redistributors */ + *mmio_count = vgic_v3_rdist_count(d) + 1; + register_vgic_ops(d, &v3_ops); return 0; diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index f5e89af..de8a94d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -88,18 +88,18 @@ static void vgic_rank_init(struct vgic_irq_rank *rank, uint8_t index, rank->vcpu[i] = vcpu; } -static int domain_vgic_register(struct domain *d) +int domain_vgic_register(struct domain *d, int *mmio_count) { switch ( d->arch.vgic.version ) { #ifdef CONFIG_HAS_GICV3 case GIC_V3: - if ( vgic_v3_init(d) ) + if ( vgic_v3_init(d, mmio_count) ) return -ENODEV; break; #endif case GIC_V2: - if ( vgic_v2_init(d) ) + if ( vgic_v2_init(d, mmio_count) ) return -ENODEV; break; default: @@ -124,10 +124,6 @@ int domain_vgic_init(struct domain *d, unsigned int nr_spis) d->arch.vgic.nr_spis = nr_spis; - ret = domain_vgic_register(d); - if ( ret < 0 ) - return ret; - spin_lock_init(&d->arch.vgic.lock); d->arch.vgic.shared_irqs = diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index c3cc4f6..300f461 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -304,9 +304,10 @@ extern int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr); extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); -int vgic_v2_init(struct domain *d); -int vgic_v3_init(struct domain *d); +int vgic_v2_init(struct domain *d, int *mmio_count); +int vgic_v3_init(struct domain *d, int *mmio_count); +extern int domain_vgic_register(struct domain *d, int *mmio_count); extern int vcpu_vgic_free(struct vcpu *v); extern int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq,