From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4D8A9372ED0 for ; Wed, 2 Sep 2026 13:46:40 +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=1788356802; cv=none; b=QFp9R0tah7jsl4ZXIGWMMbpjyZDpUwJ9aaqDG74VKiERAzh/eIQZ8ZQDaazBy6GepLyoM0P5FrBhLrN0ETKCdAwpWWC2ABmA3xav+eCm7+QSMwTyvk2YGyVa41Z7t02Tmsa2RLwHLaV6rTCnd6vzD5uCAlRhRk5WJlKp9SLTpHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788356802; c=relaxed/simple; bh=luQwKBwF/mx0OlYkAeYieEObOYYQKo9O4fAy3WqvBNg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=D8+45zVsCIz2wmZaNXqKjcOCQzgl1LyMhp2lRfMZ7H/iAbxCC8sE5eNhIHocNvfT9m+2PELyEb5N198Tx901MffAKO5BoUH2BW64TqZtH/+bk+jxloFN6WaGwjjHSEwhy8H4wzort7rYTIGnFBLCN8o96FrluxWMa4QO2K3zUfY= 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; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=t4X1qn8o; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="t4X1qn8o" 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 C7644165C; Wed, 2 Sep 2026 06:46:35 -0700 (PDT) Received: from J2N7QTR9R3.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 64D7D3F673; Wed, 2 Sep 2026 06:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1788356799; bh=luQwKBwF/mx0OlYkAeYieEObOYYQKo9O4fAy3WqvBNg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=t4X1qn8ooarx22djTGEjA46dyi3s+VVIuxF9lKFH7PaIZzctpsytRMziSLhofuO1C Q+jJWov3t9/fMk0QHe5OzoxYNj6YJPx++RsSVg7r7FzPZss0QTBx49aQ2HzPvlGi9J E8w7FxpQ9uuTizsOiKuuwqHDPwYrGmL72ENxU6es= Date: Wed, 2 Sep 2026 14:46:36 +0100 From: Mark Rutland To: Bradley Morgan Cc: Will Deacon , Catalin Marinas , James Morse , Marc Zyngier , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] arm64: head: correct comment for init_kernel_el() Message-ID: References: <20260825205839.14571-1-brads@mainlining.org> <20260825205839.14571-3-brads@mainlining.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260825205839.14571-3-brads@mainlining.org> On Tue, Aug 25, 2026 at 08:58:34PM +0000, Bradley Morgan wrote: > 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(-) This looks to be my patch [1], but with a (partially) rewritten commit message, and my S-o-B dropped. There was admittedly one typo in that commit message that needed to be fixed, but I don't think the rest of the changes were necessary, and I don't think it's approriate to drop my S-o-B. I think similar is true for the rest of the series. The patch fixing the _cpu_resume() only seems to have a paraphrased commit message. [1] https://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git/commit/?id=ee4323ff6a2ba4c3989b38f13b2c1a516d6c27e4 Mark. > > 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