| Message ID | 1421684957-29884-8-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show
Return-Path: <patchwork-forward+bncBCI3N6FH3YJRB7XC6SSQKGQECDU2YAQ@linaro.org> 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 DF0312034D for <linaro@patches.linaro.org>; Mon, 19 Jan 2015 16:31:58 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id k14sf17339434wgh.2 for <linaro@patches.linaro.org>; Mon, 19 Jan 2015 08:31:58 -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=jbpBziOA8S1IZFIIZWMAF9hWRj5AlA0EpbskHl4NHtc=; b=acpm/Rq17+loAnP7nufiydDRzuueNyt6otpUUVX/t9RLGck1RDUS/8NpM9B6gZX0MY k5bgsW1uX1qFbqzliwJhBHaZRPRZSc6iFpvvW2v3uriHQy6L1jW8oRkO2bx+jajX5JOV uw9UURq/l3dIL2cIb4PGj2SOrLSYrFoTPwnjDKZvZos8hgr6RakySTzkCzABADOQGYem Na1Gl2hipbLYH1opsMaHps5QIt+5Yhu5IYh5dumH8c/kAAcgPy7knuaL1bgNj1FMSl4z ESbhL3lJ+OKYmhVldirWP6t6xmFvprvBTn0GiK/zcMibXQ3UA/LEfzbmfm4BjESh/793 lMXw== X-Gm-Message-State: ALoCoQmieD3pA9PipTKmn1g1SlsEzBwucqPTMsMSIKhSpg6Ow3vYEMRpHNBZhxxIeVZiBA54dEer X-Received: by 10.180.98.199 with SMTP id ek7mr2218330wib.1.1421685118230; Mon, 19 Jan 2015 08:31:58 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.137 with SMTP id 9ls553482lau.26.gmail; Mon, 19 Jan 2015 08:31:58 -0800 (PST) X-Received: by 10.112.130.65 with SMTP id oc1mr25605417lbb.7.1421685118070; Mon, 19 Jan 2015 08:31:58 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id yo1si12388183lbb.92.2015.01.19.08.31.57 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 08:31:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id pv20so29754394lab.13 for <patchwork-forward@linaro.org>; Mon, 19 Jan 2015 08:31:56 -0800 (PST) X-Received: by 10.152.180.136 with SMTP id do8mr6295127lac.31.1421685116398; Mon, 19 Jan 2015 08:31:56 -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.9.200 with SMTP id c8csp1144642lbb; Mon, 19 Jan 2015 08:31:55 -0800 (PST) X-Received: by 10.140.22.233 with SMTP id 96mr45829368qgn.86.1421685114394; Mon, 19 Jan 2015 08:31:54 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id q4si5946525qah.0.2015.01.19.08.31.53 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 19 Jan 2015 08:31:54 -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 <xen-devel-bounces@lists.xen.org>) id 1YDFDH-0006VP-7E; Mon, 19 Jan 2015 16:30:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from <julien.grall@linaro.org>) id 1YDFDE-0006TK-4e for xen-devel@lists.xenproject.org; Mon, 19 Jan 2015 16:30:00 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id F5/53-02697-7013DB45; Mon, 19 Jan 2015 16:29:59 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-13.tower-206.messagelabs.com!1421684997!18906496!1 X-Originating-IP: [74.125.82.50] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4740 invoked from network); 19 Jan 2015 16:29:58 -0000 Received: from mail-wg0-f50.google.com (HELO mail-wg0-f50.google.com) (74.125.82.50) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 19 Jan 2015 16:29:58 -0000 Received: by mail-wg0-f50.google.com with SMTP id b13so4237653wgh.9 for <xen-devel@lists.xenproject.org>; Mon, 19 Jan 2015 08:29:57 -0800 (PST) X-Received: by 10.180.218.39 with SMTP id pd7mr37323284wic.21.1421684997478; Mon, 19 Jan 2015 08:29:57 -0800 (PST) Received: from chilopoda.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id fw6sm14830368wib.1.2015.01.19.08.29.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 08:29:56 -0800 (PST) From: Julien Grall <julien.grall@linaro.org> To: xen-devel@lists.xenproject.org Date: Mon, 19 Jan 2015 16:29:14 +0000 Message-Id: <1421684957-29884-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421684957-29884-1-git-send-email-julien.grall@linaro.org> References: <1421684957-29884-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall <julien.grall@linaro.org>, tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH 07/10] xen/arm: vgic-v2: Correctly set GICD_TYPER.CPUNumber X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.54 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> |
diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 4dc2267..a34a0c7 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -55,7 +55,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ vgic_lock(v); - *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) + *r = ( ((v->domain->max_vcpus - 1) << GICD_TYPE_CPUS_SHIFT) ) |( ((v->domain->arch.vgic.nr_lines / 32)) & GICD_TYPE_LINES ); vgic_unlock(v); return 1;
The number of implemented CPU interfaces is one more than the value of this field. Also avoid to hardcode the shift and remove unuseful mask. Signed-off-by: Julien Grall <julien.grall@linaro.org> --- This patch should be backported to Xen 4.4 and Xen 4.5. Although this patch won't apply directly for Xen 4.4 and may require to define GICD_TYPE_CPUS_SHIFT if "xen/arm: vgic-v3: Correctly set GICD_TYPER.CPUNumber" is not backported. --- xen/arch/arm/vgic-v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)