From patchwork Tue Apr 17 18:37:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 133571 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp5035704ljb; Tue, 17 Apr 2018 11:37:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx49ok9i0580GVMjtOc6rIVwNAcreNUwA22tPfnEakL1W8Qnv6ukBb2527cVEWqwnKmrFa5H0 X-Received: by 2002:a17:902:8543:: with SMTP id d3-v6mr3089916plo.20.1523990277904; Tue, 17 Apr 2018 11:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523990277; cv=none; d=google.com; s=arc-20160816; b=sJcw7bYDjs7L65TGQtD5neDWJ43IYYesoHGz9kUrJxcdaS1o+8U8AxdEe7xW+uY1j0 n0G4ZFUoAjG6VosN2EhvHsUbVxpDATGaEx9cRWHYKp5yn1wIxohjwXVEy+wZvwez5uvD DxburbYot5TTXbfIek5Ww7Jq1/RCSRMcmFp5MBjzZKKA0TVu9t25WjI1hztL7lVcEsUP 4mz4joiR0SCoJhYWKNYJdVwCzaaRoKHOZXT9/pzFUzlSe+T5Qo6j8HRGteROOZOsX5jf +rgL4lTRWfWlLLEHIFs85s8LAPzSLWlNjk6zOCS99GR9V/JvsGCafi3SwPOAukgHKo5l YNHw== 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:arc-authentication-results; bh=9MokD4Vczhq6ZyBMb42q4qiVtAiIrGFUOP4SNzShwx0=; b=gyJHMopC8b/32bYhIMqlr9I7u+T1A1iCcrS9rrORhqQzrkqQW1ySUXgb42eMPjeW85 zEC61hrQ/6l8qurw0sgdaOdrdEiyqmUuG1Ri86fvQb/6iY/Piy1EVaiH49wtCvnOsDYy KQsTgPwf2Ec+Abrr5gqgH0LVIlnnjRl/LrgUd4Aiw5Ap48ezyl8M85KhA0uvH8ePEcws M3ZSeHJDRjDYFjpOrlEx0cpCswA+wTBuoNqPMhhLP5EG6dJV9PgU3sx5/2hz9Nduouv8 u+BSD092EjIPuQO/4icnX2qIEXikS6klNaoAFXVdcLHzxjXB48/MskF+wfBu5i/ttmpP kBVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 d1-v6si11557233plr.410.2018.04.17.11.37.57; Tue, 17 Apr 2018 11:37:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752670AbeDQShy (ORCPT + 29 others); Tue, 17 Apr 2018 14:37:54 -0400 Received: from foss.arm.com ([217.140.101.70]:46958 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752604AbeDQShw (ORCPT ); Tue, 17 Apr 2018 14:37:52 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 122E115B2; Tue, 17 Apr 2018 11:37:52 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8C2D03F587; Tue, 17 Apr 2018 11:37:49 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, catalin.marinas@arm.com, cdall@kernel.org, drjones@redhat.com, kvmarm@lists.cs.columbia.edu, linux-arch@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, ramana.radhakrishnan@arm.com, suzuki.poulose@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, awallis@codeaurora.org, kernel-hardening@lists.openwall.com Subject: [PATCHv3 02/11] arm64/kvm: consistently handle host HCR_EL2 flags Date: Tue, 17 Apr 2018 19:37:26 +0100 Message-Id: <20180417183735.56985-3-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180417183735.56985-1-mark.rutland@arm.com> References: <20180417183735.56985-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In KVM we define the configuration of HCR_EL2 for a VHE HOST in HCR_HOST_VHE_FLAGS, but we don't ahve a similar definition for the non-VHE host flags, and open-code HCR_RW. Further, in head.S we open-code the flags for VHE and non-VHE configurations. In future, we're going to want to configure more flags for the host, so lets add a HCR_HOST_NVHE_FLAGS defintion, adn consistently use both HCR_HOST_VHE_FLAGS and HCR_HOST_NVHE_FLAGS in the kvm code and head.S. We now use mov_q to generate the HCR_EL2 value, as we use when configuring other registers in head.S. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: Christoffer Dall Cc: Marc Zyngier Cc: Will Deacon Cc: kvmarm@lists.cs.columbia.edu --- arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/kernel/head.S | 5 ++--- arch/arm64/kvm/hyp/switch.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.11.0 Reviewed-by: Christoffer Dall diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 6dd285e979c9..89b3dda7e3cb 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -86,6 +86,7 @@ HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \ HCR_FMO | HCR_IMO) #define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF) +#define HCR_HOST_NVHE_FLAGS (HCR_RW) #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) /* TCR_EL2 Registers bits */ diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index b0853069702f..651a06b1980f 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -494,10 +494,9 @@ ENTRY(el2_setup) #endif /* Hyp configuration. */ - mov x0, #HCR_RW // 64-bit EL1 + mov_q x0, HCR_HOST_NVHE_FLAGS cbz x2, set_hcr - orr x0, x0, #HCR_TGE // Enable Host Extensions - orr x0, x0, #HCR_E2H + mov_q x0, HCR_HOST_VHE_FLAGS set_hcr: msr hcr_el2, x0 isb diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index d9645236e474..cdae330e15e9 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -143,7 +143,7 @@ static void __hyp_text __deactivate_traps_nvhe(void) mdcr_el2 |= MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT; write_sysreg(mdcr_el2, mdcr_el2); - write_sysreg(HCR_RW, hcr_el2); + write_sysreg(HCR_HOST_NVHE_FLAGS, hcr_el2); write_sysreg(CPTR_EL2_DEFAULT, cptr_el2); }