From patchwork Wed Feb 5 19:55:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 24231 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C892E202B2 for ; Wed, 5 Feb 2014 20:19:56 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id a41sf2046788yho.8 for ; Wed, 05 Feb 2014 12:19:55 -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:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=8ZBhlL/aR/JhioGvirtX5XO2p5iXatM1omZ6Wxs1QYc=; b=gtmRagJn1/CrL3BBv4gzcEvlBrY14unUK9B2m1H7Sr6RlfvtR1/BkuSApWUYfebtwH I7z5dS4PEeAva0hljLwfpuSbGvsiqAkBONEgo65SECsy7aUbAQOoGbFUdUNb0KNdOuEI yECy296tOSRjQ1TGLO4btei/N6u7ZnjfYIn7LUWPk4pA+zc3bHjzg46mf0URODnvirmB IZLQYPvxzxdKMejH+Nq1r0iZ3SFHJR0jdKRS9voS2KBIfgB+3iqctM6F6vbF53TLSyj3 trJp1FKyFHXYA+pQsK4FxmNu8gMEBRh4LE+H2kU1Vy+xkbCe/efzNhkPryuW8qjIQvod rHBQ== X-Gm-Message-State: ALoCoQkoG9shAB9lVSmWNwPtQMTcZZEY1eY/7UXcOU7sjBV3wXvZk6nU5fFxpqrnWjZhG9tN3UEw X-Received: by 10.58.145.233 with SMTP id sx9mr1573969veb.0.1391631595942; Wed, 05 Feb 2014 12:19:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.135 with SMTP id j7ls282353qgf.88.gmail; Wed, 05 Feb 2014 12:19:55 -0800 (PST) X-Received: by 10.52.248.138 with SMTP id ym10mr1942114vdc.18.1391631595806; Wed, 05 Feb 2014 12:19:55 -0800 (PST) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id ec3si10046041vcb.47.2014.02.05.12.19.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 12:19:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id p17so691136vbe.26 for ; Wed, 05 Feb 2014 12:19:55 -0800 (PST) X-Received: by 10.220.193.132 with SMTP id du4mr1296546vcb.39.1391631595669; Wed, 05 Feb 2014 12:19:55 -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.220.174.196 with SMTP id u4csp83350vcz; Wed, 5 Feb 2014 12:19:54 -0800 (PST) X-Received: by 10.180.218.171 with SMTP id ph11mr18158145wic.7.1391631594240; Wed, 05 Feb 2014 12:19:54 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id tc2si10092530wic.10.2014.02.05.12.19.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2014 12:19:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB8c9-0006cB-0i; Wed, 05 Feb 2014 19:58:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB8bQ-0007sB-M9; Wed, 05 Feb 2014 19:57:44 +0000 Received: from fw-tnat.austin.arm.com ([217.140.110.23] helo=collaborate-mta1.arm.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB8aN-0007hQ-FD for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2014 19:56:45 +0000 Received: from e102391-lin.cambridge.arm.com (e102391-lin.cambridge.arm.com [10.1.209.166]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 2B4B61401C4; Wed, 5 Feb 2014 13:56:00 -0600 (CST) From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH v3 08/11] ARM: KVM: fix ordering of 64bit coprocessor accesses Date: Wed, 5 Feb 2014 19:55:48 +0000 Message-Id: <1391630151-7875-9-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1391630151-7875-1-git-send-email-marc.zyngier@arm.com> References: <1391630151-7875-1-git-send-email-marc.zyngier@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140205_145639_637464_2DB48979 X-CRM114-Status: UNSURE ( 8.34 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.4 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: catalin.marinas@arm.com, Christoffer Dall X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: marc.zyngier@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 Commit 240e99cbd00a (ARM: KVM: Fix 64-bit coprocessor handling) added an ordering dependency for the 64bit registers. The order described is: CRn, CRm, Op1, Op2, 64bit-first. Unfortunately, the implementation is: CRn, 64bit-first, CRm... Move the 64bit test to be last in order to match the documentation. Signed-off-by: Marc Zyngier Reviewed-by: Christoffer Dall Acked-by: Catalin Marinas --- arch/arm/kvm/coproc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kvm/coproc.h b/arch/arm/kvm/coproc.h index c5ad7ff..8dda870 100644 --- a/arch/arm/kvm/coproc.h +++ b/arch/arm/kvm/coproc.h @@ -135,13 +135,13 @@ static inline int cmp_reg(const struct coproc_reg *i1, return -1; if (i1->CRn != i2->CRn) return i1->CRn - i2->CRn; - if (i1->is_64 != i2->is_64) - return i2->is_64 - i1->is_64; if (i1->CRm != i2->CRm) return i1->CRm - i2->CRm; if (i1->Op1 != i2->Op1) return i1->Op1 - i2->Op1; - return i1->Op2 - i2->Op2; + if (i1->Op2 != i2->Op2) + return i1->Op2 - i2->Op2; + return i2->is_64 - i1->is_64; }