From patchwork Mon Feb 16 14:50:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 44708 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C4F242156B for ; Mon, 16 Feb 2015 14:52:39 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id b13sf19599685wgh.2 for ; Mon, 16 Feb 2015 06:52:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=nsgdLSs62WKEkbxZnrgN1tjOPBdK03H7Dxp53XVXjxY=; b=CH7uhqIWr1BerHfmD6eMvhdBiHv4mJTZZBhHIztTa50qa953OC3RydQGWzZzGvx2iJ G0AP8xHmsbm3I0GYsrKEz3HJOqNWxzAAvH9s0Ee8qiifj3cplhVSdO8FohnaZpVeKiIg f2YtWtAkBsm2oWAASWx0BSj8TTMQfjNOtxV7pIYQz4i1kjsFM05fdXH43NlR0lsjAt19 UEyQr9Po6z0KNbcs7W4tQVPv4M2mdw+vAAk7LgJo01YeebpDdFMT0IuCF2i6/8n+Nh/k aTSaI2qv2nwpkqVkF45mSMGoFR18eK+kcf07HU53z95VaLNHvaxcrF67ZPZmj7CC2LrC eUzA== X-Gm-Message-State: ALoCoQkmHEORKzsKS7WYyhpjn6H41xm8hfJlQRFHXaYRGQdQofVaYTkE3hcAp6MMFGZE/8eQ8O5z X-Received: by 10.180.89.194 with SMTP id bq2mr2904154wib.4.1424098359128; Mon, 16 Feb 2015 06:52:39 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.134 with SMTP id dc6ls475678lad.87.gmail; Mon, 16 Feb 2015 06:52:38 -0800 (PST) X-Received: by 10.152.23.233 with SMTP id p9mr8990761laf.123.1424098358965; Mon, 16 Feb 2015 06:52:38 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id g5si9801213lbm.150.2015.02.16.06.52.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 06:52:38 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labgd6 with SMTP id gd6so29280246lab.7 for ; Mon, 16 Feb 2015 06:52:38 -0800 (PST) X-Received: by 10.112.26.110 with SMTP id k14mr22727206lbg.29.1424098358874; Mon, 16 Feb 2015 06:52:38 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1629367lbj; Mon, 16 Feb 2015 06:52:38 -0800 (PST) X-Received: by 10.140.97.203 with SMTP id m69mr1329894qge.39.1424098356441; Mon, 16 Feb 2015 06:52:36 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id 6si5983622qhr.11.2015.02.16.06.52.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Feb 2015 06:52:36 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YNN1S-0001i2-1l; Mon, 16 Feb 2015 14:51:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YNN1O-0001dF-QV for xen-devel@lists.xenproject.org; Mon, 16 Feb 2015 14:51:39 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 64/05-02898-9F302E45; Mon, 16 Feb 2015 14:51:37 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-6.tower-31.messagelabs.com!1424098296!7567642!1 X-Originating-IP: [209.85.212.178] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22408 invoked from network); 16 Feb 2015 14:51:36 -0000 Received: from mail-wi0-f178.google.com (HELO mail-wi0-f178.google.com) (209.85.212.178) by server-6.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 16 Feb 2015 14:51:36 -0000 Received: by mail-wi0-f178.google.com with SMTP id em10so26741175wid.5 for ; Mon, 16 Feb 2015 06:51:36 -0800 (PST) X-Received: by 10.180.105.40 with SMTP id gj8mr31867540wib.67.1424098294927; Mon, 16 Feb 2015 06:51:34 -0800 (PST) Received: from chilopoda.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id dj5sm23172398wjb.28.2015.02.16.06.51.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Feb 2015 06:51:34 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 16 Feb 2015 14:50:47 +0000 Message-Id: <1424098255-22490-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1424098255-22490-1-git-send-email-julien.grall@linaro.org> References: <1424098255-22490-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Vijaya.Kumar@caviumnetworks.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v3 07/15] xen/arm: vgic-v3: Use a struct to describe contiguous rdist regions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Also update the different comment to make clear that we register one MMIO region per contiguous regions and not per re-distributor. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v3: - Add Ian's ack Changes in v2: - Patch added --- xen/arch/arm/gic-v3.c | 20 ++++++++++---------- xen/arch/arm/vgic-v3.c | 11 ++++++----- xen/include/asm-arm/domain.h | 11 +++++++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 7b33ff7..fdfda0b 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -909,10 +909,10 @@ static int gicv_v3_init(struct domain *d) for ( i = 0; i < gicv3.rdist_count; i++ ) { - d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; - d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].base = gicv3.rdist_regions[i].base; + d->arch.vgic.rdist_regions[i].size = gicv3.rdist_regions[i].size; } - d->arch.vgic.rdist_count = gicv3.rdist_count; + d->arch.vgic.nr_regions = gicv3.rdist_count; } else { @@ -922,13 +922,13 @@ static int gicv_v3_init(struct domain *d) /* XXX: Only one Re-distributor region mapped for the guest */ BUILD_BUG_ON(GUEST_GICV3_RDIST_REGIONS != 1); - d->arch.vgic.rdist_count = GUEST_GICV3_RDIST_REGIONS; + d->arch.vgic.nr_regions = GUEST_GICV3_RDIST_REGIONS; d->arch.vgic.rdist_stride = GUEST_GICV3_RDIST_STRIDE; /* The first redistributor should contain enough space for all CPUs */ BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); - d->arch.vgic.rbase[0] = GUEST_GICV3_GICR0_BASE; - d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; + d->arch.vgic.rdist_regions[0].base = GUEST_GICV3_GICR0_BASE; + d->arch.vgic.rdist_regions[0].size = GUEST_GICV3_GICR0_SIZE; } return 0; @@ -1107,7 +1107,7 @@ static int gicv3_make_dt_node(const struct domain *d, * CPU interface and virtual cpu interfaces accessesed as System registers * So cells are created only for Distributor and rdist regions */ - len = len * (d->arch.vgic.rdist_count + 1); + len = len * (d->arch.vgic.nr_regions + 1); new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) return -FDT_ERR_XEN(ENOMEM); @@ -1116,9 +1116,9 @@ static int gicv3_make_dt_node(const struct domain *d, dt_set_range(&tmp, node, d->arch.vgic.dbase, d->arch.vgic.dbase_size); - for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) - dt_set_range(&tmp, node, d->arch.vgic.rbase[i], - d->arch.vgic.rbase_size[i]); + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) + dt_set_range(&tmp, node, d->arch.vgic.rdist_regions[i].base, + d->arch.vgic.rdist_regions[i].size); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c5a743a..1d0e52d 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1108,13 +1108,14 @@ static int vgic_v3_domain_init(struct domain *d) d->arch.vgic.dbase_size); /* - * Register mmio handler per redistributor region but not for - * every sgi rdist region which is per core. - * The redistributor region encompasses per core sgi region. + * Register mmio handler per contiguous region occupied by the + * redistributors. The handler will take care to choose which + * redistributor is targeted. */ - for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) register_mmio_handler(d, &vgic_rdistr_mmio_handler, - d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + d->arch.vgic.rdist_regions[i].base, + d->arch.vgic.rdist_regions[i].size); d->arch.vgic.ctlr = VGICD_CTLR_DEFAULT; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 9018c6a..3eaa7f0 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -102,10 +102,13 @@ struct arch_domain #ifdef CONFIG_ARM_64 /* GIC V3 addressing */ paddr_t dbase_size; /* Distributor base size */ - paddr_t rbase[MAX_RDIST_COUNT]; /* Re-Distributor base address */ - paddr_t rbase_size[MAX_RDIST_COUNT]; /* Re-Distributor size */ - uint32_t rdist_stride; /* Re-Distributor stride */ - int rdist_count; /* No. of Re-Distributors */ + /* List of contiguous occupied by the redistributors */ + struct vgic_rdist_region { + paddr_t base; /* Base address */ + paddr_t size; /* Size */ + } rdist_regions[MAX_RDIST_COUNT]; + int nr_regions; /* Number of rdist regions */ + uint32_t rdist_stride; /* Re-Distributor stride */ #endif } vgic;