From: Ryo Takakura <takakura@valinux.co.jp>

DAIF_PROCCTX_NOIRQ contains FIQ bit.
Update the comment as only asynchronous aborts are unmasked
and FIQ is still masked.

Signed-off-by: Ryo Takakura <takakura@valinux.co.jp>
---
 arch/arm64/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 0ea45b6d0177..9b9fdb64c684 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -298,7 +298,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
 	dynamic_scs_init();
 
 	/*
-	 * Unmask asynchronous aborts and fiq after bringing up possible
+	 * Unmask asynchronous aborts after bringing up possible
 	 * earlycon. (Report possible System Errors once we can report this
 	 * occurred).
 	 */
-- 
2.34.1

On Sun, Feb 25, 2024 at 11:18:12AM +0900, takakura@valinux.co.jp wrote:
> From: Ryo Takakura <takakura@valinux.co.jp>
> 
> DAIF_PROCCTX_NOIRQ contains FIQ bit.
> Update the comment as only asynchronous aborts are unmasked
> and FIQ is still masked.
> 
> Signed-off-by: Ryo Takakura <takakura@valinux.co.jp>
> ---
>  arch/arm64/kernel/setup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> index 0ea45b6d0177..9b9fdb64c684 100644
> --- a/arch/arm64/kernel/setup.c
> +++ b/arch/arm64/kernel/setup.c
> @@ -298,7 +298,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
>  	dynamic_scs_init();
>  
>  	/*
> -	 * Unmask asynchronous aborts and fiq after bringing up possible
> +	 * Unmask asynchronous aborts after bringing up possible
>  	 * earlycon. (Report possible System Errors once we can report this
>  	 * occurred).
>  	 */

I think we can further simplify/clarify that as:

	/*
	 * Unmask SError as soon as possible after initializing earlycon so
	 * that we can report any SErrors immediately.
	 */

With that wording:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

From: Ryo Takakura <takakura@valinux.co.jp>

Hi Mark,

Thanks for reviewing!
I agree that it is more simple/clear with the suggested wording.

Sincerely,
Ryo Takakura

Signed-off-by: Ryo Takakura <takakura@valinux.co.jp>
---
 arch/arm64/kernel/setup.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 0ea45b6d0177..65a052bf741f 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -298,9 +298,8 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
 	dynamic_scs_init();
 
 	/*
-	 * Unmask asynchronous aborts and fiq after bringing up possible
-	 * earlycon. (Report possible System Errors once we can report this
-	 * occurred).
+	 * Unmask SError as soon as possible after initializing earlycon so
+	 * that we can report any SErrors immediately.
 	 */
 	local_daif_restore(DAIF_PROCCTX_NOIRQ);
 
-- 
2.34.1

On Wed, 28 Feb 2024 11:28:36 +0900, takakura@valinux.co.jp wrote:
> Thanks for reviewing!
> I agree that it is more simple/clear with the suggested wording.
> 
> Sincerely,
> Ryo Takakura
> 
> 
> [...]

Applied to arm64 (for-next/misc), thanks! I also picked up the commit
log from the first patch as it made more sense than this one ;).

[1/1] arm64/kernel/setup: Update comment on interrupt masking
      https://git.kernel.org/arm64/c/6d1ce806e17f

-- 
Catalin