Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3755586pxb; Mon, 1 Feb 2021 04:02:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj1iqE57vij2dey5wS7+Uj8lyB4+3DMhJei5RHRgm7512vt0boi0uYud0yH1EOhGkz6Dw3 X-Received: by 2002:aa7:d399:: with SMTP id x25mr4704561edq.237.1612180929999; Mon, 01 Feb 2021 04:02:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612180929; cv=none; d=google.com; s=arc-20160816; b=hsE+Pk2kGDQjaEcdDayL/PfpE/NEPFPJ+jvJ5pCtlm2gOTdk1whtEEsZTYDyxOAZBq L5cQGbxop33KaKbVEy8TRAnDVmxJkmDPDk/DwdLk2gcXYUvC+HebISEzhGPh/spuyu+K NSTyp5Ln6z5LEgFuVyWlZo5uH2J9t8GLWlnwhGbn8KscL05pHl1KusDyLdqlqIM9gzZj NfAyNIXeIiJ/9E7W5P1QPrQpy9vEFUWlXa0i1O1EFb4LVIC12AhIWpUD6iFBWgk9Ou70 W5B/en3qDNt5Ib2vN6sKYcOW0Bed7fqQYUKPijdpUja9lvF1rsh4aeX8hNRcRbJMIRQL 5hQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=N4pQagSIYDvCjRpPxUgzhf+HDr2SccXknCi4k7aeHFM=; b=TUsVjhIU4NdEK1gusBtq9FrIKLEd7RhgS9RWFN+Ns2QSxwi0zO8KGyBdfw/0WAOu+d lz+eV+3Sb1jO6caM+kF7D1JKFVMFQ5pYVW4MIvcXdlOqVJfgtMZ6ozXVBtcR9fa3qM2/ 35BGNHqrNRPLrocGkgBcclZexirCFsPDSXWgS7j82RKj57nbOre3skzwO0w0f6eiMdFb tjMGCaTIsFRWvvrUsUUA4ePHoKtP0SXYjPlwPtjRdOhz4GuYCH6Q+/Ekc06lLllrbMJq l37VR3v9nwsHpXrm0R+1jlBjbSXP+s5QshZ9UykZpYjrT1CNNEiyqLBCH1KSvIctG6ST zVOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m24si10551521edr.215.2021.02.01.04.01.37; Mon, 01 Feb 2021 04:02:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229969AbhBAL7k (ORCPT + 99 others); Mon, 1 Feb 2021 06:59:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:53766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231194AbhBAL6J (ORCPT ); Mon, 1 Feb 2021 06:58:09 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4EF7964EA0; Mon, 1 Feb 2021 11:56:53 +0000 (UTC) Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1l6Xp5-00BG09-H3; Mon, 01 Feb 2021 11:56:51 +0000 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Cc: Catalin Marinas , Will Deacon , Mark Rutland , David Brazdil , Alexandru Elisei , Ard Biesheuvel , Jing Zhang , Ajay Patil , Prasad Sodagudi , Srinivas Ramana , James Morse , Julien Thierry , Suzuki K Poulose , kernel-team@android.com Subject: [PATCH v6 08/21] arm64: Move SCTLR_EL1 initialisation to EL-agnostic code Date: Mon, 1 Feb 2021 11:56:24 +0000 Message-Id: <20210201115637.3123740-9-maz@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210201115637.3123740-1-maz@kernel.org> References: <20210201115637.3123740-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, dbrazdil@google.com, alexandru.elisei@arm.com, ardb@kernel.org, jingzhangos@google.com, pajay@qti.qualcomm.com, psodagud@codeaurora.org, sramana@codeaurora.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can now move the initial SCTLR_EL1 setup to be used for both EL1 and EL2 setup. Signed-off-by: Marc Zyngier Acked-by: Catalin Marinas Acked-by: David Brazdil --- arch/arm64/kernel/head.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 36212c05df42..b425d2587cdb 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -479,13 +479,14 @@ EXPORT_SYMBOL(kimage_vaddr) * booted in EL1 or EL2 respectively. */ SYM_FUNC_START(init_kernel_el) + mov_q x0, INIT_SCTLR_EL1_MMU_OFF + msr sctlr_el1, x0 + mrs x0, CurrentEL cmp x0, #CurrentEL_EL2 b.eq init_el2 SYM_INNER_LABEL(init_el1, SYM_L_LOCAL) - mov_q x0, INIT_SCTLR_EL1_MMU_OFF - msr sctlr_el1, x0 isb mov_q x0, INIT_PSTATE_EL1 msr spsr_el1, x0 @@ -494,9 +495,6 @@ SYM_INNER_LABEL(init_el1, SYM_L_LOCAL) eret SYM_INNER_LABEL(init_el2, SYM_L_LOCAL) - mov_q x0, INIT_SCTLR_EL1_MMU_OFF - msr sctlr_el1, x0 - mov_q x0, HCR_HOST_NVHE_FLAGS msr hcr_el2, x0 isb -- 2.29.2