Message ID | 1464080993-10884-2-git-send-email-christoffer.dall@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1A3D1607D7 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 24 May 2016 09:20:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DDAC27CB2 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 24 May 2016 09:20:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 027EA28288; Tue, 24 May 2016 09:20:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ACF0827CB2 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 24 May 2016 09:20:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b58Um-0003Yn-EM; Tue, 24 May 2016 09:19:24 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b58Lx-0006gA-E5 for linux-arm-kernel@lists.infradead.org; Tue, 24 May 2016 09:10:18 +0000 Received: by mail-wm0-x22b.google.com with SMTP id n129so15327627wmn.1 for <linux-arm-kernel@lists.infradead.org>; Tue, 24 May 2016 02:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Gw1KkZwAq03w2Uixso406BEGaiBUUhbw/xZvOpgttL8=; b=KAZd1U4PAduobHjVDM64wg4oEhh0gVZS395mYPHZNKXDnbo7ZuEDr3iIiIpCFMOfED xEFS2liWp1uYHDkRja/Sqx2/BczKN+dDMPCjbH2AMwtkQqA5sQIHEeFlRyXnDXaz8pHN 08x9bhL5VAu/XLctQzmTcSZBqYz5oLapt86lY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Gw1KkZwAq03w2Uixso406BEGaiBUUhbw/xZvOpgttL8=; b=L7/a7KjK0uF7c6wLQVyfce504q5v4Hu/05o1ekeks0nrGy0k2gEYrpS6a+dRQDwgxS qClV0LME4BExDjsyjkuHe5NVAqmOyGxGQbdTUCyQa4ucod1VwyoxUuRYD4EFJQQvkU54 0AncYKjd3FYzvcTEIQ6KVDDS3f+dgbx3pXS+aJYpd4BO4YXwoZUr9S4LRnyTDfJgapnW o93lnNhL0p391dPPfenRdIYC8dBh2Lwfwz5H5lcRVpHPVze0Ayn4w+uoXqKN2ArMamGP mE0Vl3X1RyrBtXqQ6tmoHmKVMOzd8wI+FPTAou5fxpqx0y1cTLoCSUSBAylu/o7s7gRr SALg== X-Gm-Message-State: ALyK8tKrLP1XuLzs+Wp9G0h3UUDYTUpHEOys7rzcw3yrB2P6ed7WVFFIzHvRjMk0dykzVX46 X-Received: by 10.194.148.142 with SMTP id ts14mr3065863wjb.39.1464080995757; Tue, 24 May 2016 02:09:55 -0700 (PDT) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id f11sm18163246wmf.22.2016.05.24.02.09.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 May 2016 02:09:55 -0700 (PDT) From: Christoffer Dall <christoffer.dall@linaro.org> To: Paolo Bonzini <pbonzini@redhat.com>, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com> Subject: [PULL 01/59] kvm: arm64: Fix EC field in inject_abt64 Date: Tue, 24 May 2016 11:08:55 +0200 Message-Id: <1464080993-10884-2-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1464080993-10884-1-git-send-email-christoffer.dall@linaro.org> References: <1464080993-10884-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160524_021017_705659_7F734FF0 X-CRM114-Status: GOOD ( 11.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, stable@vger.kernel.org, Christoffer Dall <christoffer.dall@linaro.org>, Matt Evans <matt.evans@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index 4d1ac81..e9e0e6d 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT); if (!is_iabt) - esr |= ESR_ELx_EC_DABT_LOW; + esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT; vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT; }