From nobody Thu Oct 2 12:04:50 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 22B5A3195F1; Wed, 17 Sep 2025 14:56:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758121001; cv=none; b=RdAnEexcuOXjcsmjucHX6R+1F6uhsmyRN0heNX01zVDXVrjkBCdj9p2i4NoPlqNxYKFSlyd5/qzmIW3RgtAcjApSVrjSlx6nXo/4KnAuWtykutzFDrmyO9NrRTuXPm6163PFmpvKRwRBg/nFx6ixNBhOTOQH72dW7fV5ddnOouQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758121001; c=relaxed/simple; bh=aITkWGOBS37TSRZ45joX1KaJcqBbWgQMFBXQ/ZLns4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Mqt2yIw+3gOIm4vFV9WFpxFM1+7thy/djb7sNHqcHYAmBS1v4bFUbU90a5eEry9WPcGssS4yl4zBhJN8zVm6ZHyPvb6iyPo0tfxbqoakdzHe3egqOcqnEGeJK89b7p/TGMyf7+04yMPILCwYlrjtiEcg4uSVHXqwpViRKCyoNvo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 484E3267F; Wed, 17 Sep 2025 07:56:31 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EBAAE3F66E; Wed, 17 Sep 2025 07:56:35 -0700 (PDT) From: Yeoreum Yun To: catalin.marinas@arm.com, will@kernel.org, broonie@kernel.org, oliver.upton@linux.dev, anshuman.khandual@arm.com, robh@kernel.org, james.morse@arm.com, mark.rutland@arm.com, joey.gouly@arm.com, Dave.Martin@arm.com, ahmed.genidi@arm.com, kevin.brodsky@arm.com, scott@os.amperecomputing.com, mbenes@suse.cz, james.clark@linaro.org, frederic@kernel.org, rafael@kernel.org, pavel@kernel.org, ryan.roberts@arm.com, suzuki.poulose@arm.com, maz@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, kvmarm@lists.linux.dev, Yeoreum Yun Subject: [PATCH v5 4/6] arm64: initialise SCTLR2_EL1 at cpu_soft_restart() Date: Wed, 17 Sep 2025 15:56:16 +0100 Message-Id: <20250917145618.1232329-5-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250917145618.1232329-1-yeoreum.yun@arm.com> References: <20250917145618.1232329-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Explicitly initialize the SCTLR2_ELx register before launching a new kernel via kexec() to avoid leaving SCTLR2_ELx with an arbitrary value when the new kernel runs. Signed-off-by: Yeoreum Yun --- arch/arm64/kernel/cpu-reset.S | 3 +++ arch/arm64/kvm/hyp/nvhe/hyp-init.S | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index c87445dde674..e2abc8f8c067 100644 --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -30,6 +30,9 @@ * flat identity mapping. */ SYM_TYPED_FUNC_START(cpu_soft_restart) + mov_q x12, INIT_SCTLR2_EL1 + set_sctlr2_elx 1, x12, x8 + mov_q x12, INIT_SCTLR_EL1_MMU_OFF pre_disable_mmu_workaround /* diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/h= yp-init.S index aada42522e7b..cc569656fe35 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -255,6 +255,9 @@ SYM_CODE_START(__kvm_handle_stub_hvc) mov x0, xzr reset: /* Reset kvm back to the hyp stub. */ + mov_q x5, INIT_SCTLR2_EL2 + set_sctlr2_elx 2, x5, x4 + mov_q x5, INIT_SCTLR_EL2_MMU_OFF pre_disable_mmu_workaround msr sctlr_el2, x5 --=20 LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}