From patchwork Mon Dec 4 14:03:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 120543 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4473674qgn; Mon, 4 Dec 2017 06:04:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMZVnsfrRuvp13iZX5aPXzrYMuKaZUJmu0dacQxl/bx+B2aLKSAX1x0Qt/V8yjOt072+t1sa X-Received: by 10.101.81.72 with SMTP id g8mr14104538pgq.135.1512396288602; Mon, 04 Dec 2017 06:04:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512396288; cv=none; d=google.com; s=arc-20160816; b=HEe6DB4XVK6zPHWBUWY1W/KW/yBzOfpM3t2JA8kfb9kEaxr0FrRFH+DnjT/I6mITL/ 74z7WPVr8eujqpR4LZnAydx0TszmXzu6lj4hbH5ZSeBtKbIHDPegIRMkErxA5y2f0lyL M4+Vbep1yLuNrbBYE/2F0WqaJcWOTrTUhtwlkkR2Ir3LNG6FTCr/YYSdXMQ5IOcZ6++o laifCGJ6HGffvi85QqaHmTEOslrevYI61oMjm6V9U3caAr9NzjDAjf3MF7zmgOEFUP6f CGUNr3r8uENXc6rUzOe5VvophhMYssyh0Ohuasf8/njOG+2Ag3liOIANs4wZWX52sSCx jClg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=VYxmL+PZNurnmoYpZ7X7QGf0B46epS0TWuDGYyV98VI=; b=BwVxpV94oyKxtuC7IA6OQx1kABeZ7xstUACOUL8Y/tmku9QBAR4NXFarJDLREBcZhE H6us03ayqI0eeSivgXmFZZE3g5rl6XR8Ve6T2O8cdJ26t4lhFHzAubxZzEcQClrhL+70 rqlvs8nq66S6q0SZQMgMmGNNMXqK2OXz5sxmFz050XfPgDJOMoSKQ6MxAjijW4eMShKI 6MoOG8BQwp/0KLm6cp5+fd0q9Ob7v5J7DawKJBB8AKfSx5s0BRcTbsgvWEtaJn1WuDp3 JLa538dYqqMe0MVDpHcyLm4Bd8bgUlH1ikBN2OSFvFQJ+b0WKIudgI2T8ra/l1794aSr tHUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@christofferdall-dk.20150623.gappssmtp.com header.s=20150623 header.b=EhnGxpRq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bc11si9621880plb.422.2017.12.04.06.04.48; Mon, 04 Dec 2017 06:04:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@christofferdall-dk.20150623.gappssmtp.com header.s=20150623 header.b=EhnGxpRq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754246AbdLDOE0 (ORCPT + 9 others); Mon, 4 Dec 2017 09:04:26 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:42677 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754487AbdLDOEO (ORCPT ); Mon, 4 Dec 2017 09:04:14 -0500 Received: by mail-wm0-f66.google.com with SMTP id l141so6007979wmg.1 for ; Mon, 04 Dec 2017 06:04:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=christofferdall-dk.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VYxmL+PZNurnmoYpZ7X7QGf0B46epS0TWuDGYyV98VI=; b=EhnGxpRq4srcQQwPlbKAYJzdpW53Agv3lZjtjkdhIj7WWqBgPuyCzQD+ui7A7xrQwb ec78BydyisNjd0XchFM+A8IkOOCnmL+bG2s6cS1pbyyB+cVXwqo2XLhMIhcQNQtZNLrE ECxLeydHHOXg6a3KegujrpNOutZMDKGZKDs7kA5O/ggjJIoKceFw5bqS8T12zXqhD+9y chOY+USFn9+N3hJ3WfODv/8rVjG+NWCZ06Ximcc5WiTMDiEaY+sHBBssP41ugR0qX+Vv mlHjfUuvrcuiQ+g5fPYTVNpXJI3na/1RRj1F/20Ny01DolSGXE1MRrV/FtAYuzH3o0Rd jhmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=VYxmL+PZNurnmoYpZ7X7QGf0B46epS0TWuDGYyV98VI=; b=J7tHzXNSwHkriw+jlOs29LhT8Uto6rDJ3tEfzfRTDlJZn1Wz41YoQOZpqby2FYGIei YDAPE702e6VqpiglrZaAx2uSr+7CDGrl8g6JCz4YjqQAYzhW/XYsgFpERRt504C99fRh 19Z/FDK1VEBgeQOOHhNfzBheF7WwQZTtSjzvirgik1yB89n3BAwMPXy2EaV40DKEuh0L fDpzPFv7HTgA+xeK2eLv67iIZKMISxQkq7tfeBO3XCdoMHKu4hBa/UD0P6prQK8gUwDK fSbI3Z2sTi0vpp+F6K4jou/34Vfjk9dzUR9fHHniS8iRqTPzUruWYyIuQE6g9ecNlNHl rPKA== X-Gm-Message-State: AJaThX712C7UPOzkpBgLDE1K0EX2gnj4cXHIYlWbaE9a3LMrAL8ufdv0 qLvyZ8wln8Ta5my34AGgX/Ubjg== X-Received: by 10.28.28.5 with SMTP id c5mr7459230wmc.115.1512396253343; Mon, 04 Dec 2017 06:04:13 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id g7sm22794279wra.38.2017.12.04.06.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 06:04:12 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Marc Zyngier , Christoffer Dall , stable@vger.kernel.org Subject: [PULL 19/19] KVM: arm/arm64: Fix broken GICH_ELRSR big endian conversion Date: Mon, 4 Dec 2017 15:03:48 +0100 Message-Id: <20171204140348.21965-17-cdall@kernel.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171204135637.21620-1-cdall@kernel.org> References: <20171204135637.21620-1-cdall@kernel.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christoffer Dall We are incorrectly rearranging 32-bit words inside a 64-bit typed value for big endian systems, which would result in never marking a virtual interrupt as inactive on big endian systems (assuming 32 or fewer LRs on the hardware). Fix this by not doing any word order manipulation for the typed values. Cc: Acked-by: Christoffer Dall Signed-off-by: Christoffer Dall --- virt/kvm/arm/hyp/vgic-v2-sr.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.14.2 diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c index a3f18d362366..d7fd46fe9efb 100644 --- a/virt/kvm/arm/hyp/vgic-v2-sr.c +++ b/virt/kvm/arm/hyp/vgic-v2-sr.c @@ -34,11 +34,7 @@ static void __hyp_text save_elrsr(struct kvm_vcpu *vcpu, void __iomem *base) else elrsr1 = 0; -#ifdef CONFIG_CPU_BIG_ENDIAN - cpu_if->vgic_elrsr = ((u64)elrsr0 << 32) | elrsr1; -#else cpu_if->vgic_elrsr = ((u64)elrsr1 << 32) | elrsr0; -#endif } static void __hyp_text save_lrs(struct kvm_vcpu *vcpu, void __iomem *base)