From patchwork Thu Jan 29 18:25:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 43956 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28FC624128 for ; Thu, 29 Jan 2015 18:27:55 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id n3sf15074499wiv.0 for ; Thu, 29 Jan 2015 10:27:54 -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=cUaol3QGAFkEU/CPNvwljiLRoxm66W+xQXQb71TqCGw=; b=TaTWnOHCv8dfDxdX2ZTcCaV1EaArJcM9h4hodJV5CNtv9SjBPz0uCdl9j7SEu5gQPr Hu84XEaRcDoR9lAGXMPVXxZsVzbjvyLGMDZ8L5vGgfqxe+wGAqdPlFkHfc9LPsWBSg4M 5fYD7IHtEvHFs5KByw/DtPs0KjPFZ11e8AxSpoxtVGPjOmzwnS9+0KWgTVekHqkFpk/9 2UXk0WJ4CST52ngMEAgRvqIk7QM+VzVb1c2hyrdEpCGQmcBrM0s/0M8+ga53iIQVlyUU uhWaRjtv0woDS2Dj410IL56US06P5FoJd93tdLEQPRpja20YJgk4b8Y/l00H3Wz8Qumh 85hw== X-Gm-Message-State: ALoCoQmQgOYvhatGK37M6h0rHN2cWtYQZSFeIU2Yg/XexD9P3u6IjDWQh2JbbS++55ieho+sFZ93 X-Received: by 10.180.105.129 with SMTP id gm1mr309988wib.3.1422556074489; Thu, 29 Jan 2015 10:27:54 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.13 with SMTP id n13ls347149laa.80.gmail; Thu, 29 Jan 2015 10:27:54 -0800 (PST) X-Received: by 10.112.83.104 with SMTP id p8mr2593242lby.70.1422556074241; Thu, 29 Jan 2015 10:27:54 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id ci8si628105lad.81.2015.01.29.10.27.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Jan 2015 10:27:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id 10so31236910lbg.6 for ; Thu, 29 Jan 2015 10:27:54 -0800 (PST) X-Received: by 10.112.44.230 with SMTP id h6mr2530502lbm.98.1422556073957; Thu, 29 Jan 2015 10:27:53 -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 h5csp34150lbj; Thu, 29 Jan 2015 10:27:53 -0800 (PST) X-Received: by 10.220.166.77 with SMTP id l13mr1128023vcy.26.1422556072514; Thu, 29 Jan 2015 10:27:52 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id x19si1193059vcu.21.2015.01.29.10.27.51 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 29 Jan 2015 10:27:52 -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 1YGtnv-0004qF-5s; Thu, 29 Jan 2015 18:26:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGtnt-0004ma-7v for xen-devel@lists.xenproject.org; Thu, 29 Jan 2015 18:26:57 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 2C/8C-02754-07B7AC45; Thu, 29 Jan 2015 18:26:56 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1422556015!13320137!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 642 invoked from network); 29 Jan 2015 18:26:55 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 29 Jan 2015 18:26:55 -0000 Received: by mail-wi0-f179.google.com with SMTP id l15so28209354wiw.0 for ; Thu, 29 Jan 2015 10:26:55 -0800 (PST) X-Received: by 10.194.61.65 with SMTP id n1mr4034253wjr.36.1422556015430; Thu, 29 Jan 2015 10:26:55 -0800 (PST) Received: from chilopoda.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id x18sm3518503wia.12.2015.01.29.10.26.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jan 2015 10:26:54 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 29 Jan 2015 18:25:48 +0000 Message-Id: <1422555950-31821-14-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422555950-31821-1-git-send-email-julien.grall@linaro.org> References: <1422555950-31821-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 v2 13/15] xen/arm: vgic-v2: GICD_I{S, C}PENDR* are only word-accessible 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.217.175 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: Signed-off-by: Julien Grall --- This patch is candidate for backporting to Xen 4.4 and Xen 4.5. Although, this patch won't apply directly to Xen 4.4. Changes in v2: - Patch added --- xen/arch/arm/vgic-v2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index e7cdf9e..1a02541 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -95,7 +95,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank, flags); @@ -104,8 +104,8 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 0, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); @@ -331,17 +331,17 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk(XENLOG_G_ERR - "%pv: vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", - v, dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); + "%pv: vGICD: unhandled word write %#"PRIregister" to ISPENDR%d\n", + v, *r, gicd_reg - GICD_ISPENDR); return 0; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk(XENLOG_G_ERR - "%pv: vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", - v, dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); + "%pv: vGICD: unhandled word write %#"PRIregister" to ICPENDR%d\n", + v, *r, gicd_reg - GICD_ICPENDR); return 0; case GICD_ISACTIVER ... GICD_ISACTIVERN: