From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.mainlining.org (mail.mainlining.org [5.75.144.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4677311C35 for ; Tue, 25 Aug 2026 20:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=5.75.144.95 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787691530; cv=none; b=e4xQ661TUQQNFXI/k+mPT366bcE02CvlqyhH464USp7xfhAbfWQAuIOg4vl48GnrYq4UTRYz2IMhHN0Cy89H2vmZnliEj5FW17BDtUufKWGXOpwlgtH/TWj6Jrnbhxbo7qviBs2OiYQVpb9/ERHnJuuQ7yObN/7qQuAp3scMVOQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787691530; c=relaxed/simple; bh=c1SWEETqf2l0p+tx/WkJBIQVomgRM80hRvx+1LRJBU4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=or46JbzaRFP3LfRQunIP84ASnKMi4KHgRfXpktTX5+kjfXWSSCzqVtSaNmik4Pq3/DjRBwdDROqylfZN6qz9cbo+2yXNVgE8IOcqdaC4/sJ7AV8FuRGxDdFW4cVGd3z30xUUTuq0gcVC2IrggTUdTM8V0PDhHbCkB7H402Ntr4Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=mainlining.org; spf=pass smtp.mailfrom=mainlining.org; dkim=pass (2048-bit key) header.d=mainlining.org header.i=@mainlining.org header.b=M/MJ/HBJ; dkim=permerror (0-bit key) header.d=mainlining.org header.i=@mainlining.org header.b=N72sBd+3; arc=none smtp.client-ip=5.75.144.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=mainlining.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mainlining.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mainlining.org header.i=@mainlining.org header.b="M/MJ/HBJ"; dkim=permerror (0-bit key) header.d=mainlining.org header.i=@mainlining.org header.b="N72sBd+3" DKIM-Signature: v=1; a=rsa-sha256; s=202507r; d=mainlining.org; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1787691521; bh=lsilY3pcpndhM3GC4RwYhLV g2Hao2DERRjYOE6c8cGs=; b=M/MJ/HBJQ+4UZ1l2RmvSWPYWAdLvK1ycEm6DJFK77zBV+/S4HJ qDILleprP2JdyH30UwU9m8coRmGG4XSBHeXVY1hhp61z0HryRse029NvNgD7+3VX1xaVkQ4PN3e k0NhCq+taS+LjWUAXdqtFzuqe0LTucSqHGUknu8WSkn3CZRotJ7EgNyZXdHq4cywUYpFBJtab9y 6sSHak8wAU37OGY4CInzGRs5o3s/MfbwlZGAmha53EHwm0FoMfSMkeIk5Z/vJN1zKw4u1wsBmU8 2DdQNy7rHg/0JvlRHYvhui6oEnAw1K5zyHZ4IQbz6YCAServ0sOm/mMSMohp9e9xPVQ==; DKIM-Signature: v=1; a=ed25519-sha256; s=202507e; d=mainlining.org; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1787691521; bh=lsilY3pcpndhM3GC4RwYhLV g2Hao2DERRjYOE6c8cGs=; b=N72sBd+3MF91/FwudEKpSBdcsaleaQ35HTU+sLGJkMxythNVye aiDzIDzeuURnn0PYqGf944r5kwDc9OKiFLDQ==; From: Bradley Morgan To: Will Deacon Cc: Catalin Marinas , Mark Rutland , James Morse , Marc Zyngier , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, brads@mainlining.org Subject: [PATCH 2/7] arm64: head: correct comment for init_kernel_el() Date: Tue, 25 Aug 2026 20:58:34 +0000 Message-ID: <20260825205839.14571-3-brads@mainlining.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260825205839.14571-1-brads@mainlining.org> References: <20260825205839.14571-1-brads@mainlining.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The comment above init_kernel_el() still says the function configures the CPU to execute at the highest reachable EL, but that stopped being true a while back. Ever since commit ae4b7e38e9a94798 ("arm64: Allow sticky E2H when entering EL1"), init_kernel_el() always drops to EL1, and it is finalise_el2() that brings us back up to EL2 when we want it. Update the comment to match what the code actually does. Signed-off-by: Bradley Morgan Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: James Morse Cc: Marc Zyngier Cc: Will Deacon --- arch/arm64/kernel/head.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 87a822e5c4ca..c6301557eee1 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -254,9 +254,9 @@ SYM_FUNC_END(__primary_switched) .section ".idmap.text","a" /* - * Starting from EL2 or EL1, configure the CPU to execute at the highest - * reachable EL supported by the kernel in a chosen default state. If dropping - * from EL2 to EL1, configure EL2 before configuring EL1. + * Starting from EL2 or EL1, configure the CPU to execute at EL1. + * If dropping from EL2 to EL1, configure EL2 before configuring EL1. + * To use VHE we'll upgrade back to EL2 later in finalise_el2(). * * Since we cannot always rely on ERET synchronizing writes to sysregs (e.g. if * SCTLR_ELx.EOS is clear), we place an ISB prior to ERET. -- 2.47.3