From patchwork Wed Jun 7 17:11:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9772045 Return-Path: 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 286276034B for ; Wed, 7 Jun 2017 17:12:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF692283B9 for ; Wed, 7 Jun 2017 17:12:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE2AD28438; Wed, 7 Jun 2017 17:12:38 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E77E26785 for ; Wed, 7 Jun 2017 17:12:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751713AbdFGRMP (ORCPT ); Wed, 7 Jun 2017 13:12:15 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35196 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517AbdFGRML (ORCPT ); Wed, 7 Jun 2017 13:12:11 -0400 Received: by mail-wm0-f49.google.com with SMTP id x70so62270668wme.0 for ; Wed, 07 Jun 2017 10:12:11 -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=kSJcxCq52VEJcAP+FSoEreKvX3VzBwSlYqjYM02+oAg=; b=HkjynrHZOljt+sR9rV9wiihu3pHiPeC3MNSoRicCuadL1Tnj6CgbqUAv86kY/wo7QN owcFUbZOSYQBoZg7f4Etgwirxf0DzNlMmUmDX2wmliytHXPdYHF8S0F16pUZr4gEQAzV +pln5YVx8VEiec49obsm93a9ybnvp9Xb6tO+g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kSJcxCq52VEJcAP+FSoEreKvX3VzBwSlYqjYM02+oAg=; b=Rat/39r7UaZl37BJVr/PkhtFmhVrQBXCHuzp0L5cc7Rdtd+XSqU/wp/6JFELcN5NV7 x/RyfZW8cvbWqDKLR0Y/7mDW6CdjaGHg3vCzmp7mkpvweQ3YLF52Jp7Hmw5hetZoqVR2 pihwfAzN3ZsBFvdJx0FcJAMrHGKKKOTuV+y6kZ1T5CDgSO2EH1ROqzJtBDUtOD3J8eiv qMpSg0BHaDatOHxlL0ym7K6XM5ZgPUH2zy7kqW5LiyMIxii8CFYfk/py8iyIeWxbnttJ aUOfwF3m1l9AKRWaDI68pZSv+AS+04zBY8hKXXbg22kK7b0y1SvFCvmSsPIATWH/RHKs sHBw== X-Gm-Message-State: AODbwcBkE+yHlu8r/r2NVcD+8G+eCCMjo8XPneVLYsDIoyscjPYY0AQt IRW4Luj6UQAInpWO X-Received: by 10.80.131.67 with SMTP id 61mr26039903edh.21.1496855530304; Wed, 07 Jun 2017 10:12:10 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id c2sm966244edc.34.2017.06.07.10.12.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 10:12:09 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org, Christoffer Dall Subject: [PULL v2 4/6] arm64: KVM: Preserve RES1 bits in SCTLR_EL2 Date: Wed, 7 Jun 2017 19:11:50 +0200 Message-Id: <20170607171152.21874-5-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170607171152.21874-1-cdall@linaro.org> References: <20170607171152.21874-1-cdall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc Zyngier __do_hyp_init has the rather bad habit of ignoring RES1 bits and writing them back as zero. On a v8.0-8.2 CPU, this doesn't do anything bad, but may end-up being pretty nasty on future revisions of the architecture. Let's preserve those bits so that we don't have to fix this later on. Cc: stable@vger.kernel.org Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm64/include/asm/sysreg.h | 4 ++++ arch/arm64/kvm/hyp-init.S | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 15c142c..b4d13d9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -286,6 +286,10 @@ #define SCTLR_ELx_A (1 << 1) #define SCTLR_ELx_M 1 +#define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ + (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ + (1 << 28) | (1 << 29)) + #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ SCTLR_ELx_SA | SCTLR_ELx_I) diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S index 839425c..4072d40 100644 --- a/arch/arm64/kvm/hyp-init.S +++ b/arch/arm64/kvm/hyp-init.S @@ -106,10 +106,12 @@ __do_hyp_init: tlbi alle2 dsb sy - mrs x4, sctlr_el2 - and x4, x4, #SCTLR_ELx_EE // preserve endianness of EL2 - ldr x5, =SCTLR_ELx_FLAGS - orr x4, x4, x5 + /* + * Preserve all the RES1 bits while setting the default flags, + * as well as the EE bit on BE. + */ + ldr x4, =(SCTLR_EL2_RES1 | SCTLR_ELx_FLAGS) +CPU_BE( orr x4, x4, #SCTLR_ELx_EE) msr sctlr_el2, x4 isb