linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Amit Daniel Kachhap <amit.kachhap@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>,
	Kees Cook <keescook@chromium.org>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Kristina Martsenko <kristina.martsenko@arm.com>,
	Dave Martin <Dave.Martin@arm.com>,
	Mark Brown <broonie@kernel.org>,
	James Morse <james.morse@arm.com>,
	Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>,
	Amit Daniel Kachhap <amit.kachhap@arm.com>,
	Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
	Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v5 05/17] arm64: create macro to park cpu in an infinite loop
Date: Mon, 17 Feb 2020 14:57:36 +0530	[thread overview]
Message-ID: <1581931668-11559-6-git-send-email-amit.kachhap@arm.com> (raw)
In-Reply-To: <1581931668-11559-1-git-send-email-amit.kachhap@arm.com>

A macro early_park_cpu is added to park the faulted cpu in an infinite
loop. Currently, this macro is substituted in two instances and may be
reused in future.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
---
 arch/arm64/kernel/head.S | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 989b194..3d18163 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -761,6 +761,17 @@ ENDPROC(__secondary_too_slow)
 	.endm
 
 /*
+ * Macro to park the cpu in an infinite loop.
+ */
+	.macro	early_park_cpu status
+	update_early_cpu_boot_status \status | CPU_STUCK_IN_KERNEL, x1, x2
+.Lepc_\@:
+	wfe
+	wfi
+	b	.Lepc_\@
+	.endm
+
+/*
  * Enable the MMU.
  *
  *  x0  = SCTLR_EL1 value for turning on the MMU.
@@ -808,24 +819,14 @@ ENTRY(__cpu_secondary_check52bitva)
 	and	x0, x0, #(0xf << ID_AA64MMFR2_LVA_SHIFT)
 	cbnz	x0, 2f
 
-	update_early_cpu_boot_status \
-		CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_52_BIT_VA, x0, x1
-1:	wfe
-	wfi
-	b	1b
-
+	early_park_cpu CPU_STUCK_REASON_52_BIT_VA
 #endif
 2:	ret
 ENDPROC(__cpu_secondary_check52bitva)
 
 __no_granule_support:
 	/* Indicate that this CPU can't boot and is stuck in the kernel */
-	update_early_cpu_boot_status \
-		CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_NO_GRAN, x1, x2
-1:
-	wfe
-	wfi
-	b	1b
+	early_park_cpu CPU_STUCK_REASON_NO_GRAN
 ENDPROC(__no_granule_support)
 
 #ifdef CONFIG_RELOCATABLE
-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-02-17  9:29 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-17  9:27 [PATCH v5 00/17] arm64: return address signing Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 01/17] arm64: cpufeature: Fix meta-capability cpufeature check Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 02/17] arm64: cpufeature: add pointer auth meta-capabilities Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 03/17] arm64: rename ptrauth key structures to be user-specific Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 04/17] arm64: install user ptrauth keys at kernel exit time Amit Daniel Kachhap
2020-02-17  9:27 ` Amit Daniel Kachhap [this message]
2020-02-17  9:27 ` [PATCH v5 06/17] arm64: add bootup/runtime flags for __cpu_setup Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 07/17] arm64: cpufeature: handle conflicts based on capability Amit Daniel Kachhap
2020-02-28 18:18   ` Catalin Marinas
2020-03-02  9:29     ` Amit Kachhap
2020-02-17  9:27 ` [PATCH v5 08/17] arm64: enable ptrauth earlier Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 09/17] arm64: initialize and switch ptrauth kernel keys Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 10/17] arm64: initialize ptrauth keys for kernel booting task Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 11/17] arm64: mask PAC bits of __builtin_return_address Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 12/17] arm64: unwind: strip PAC from kernel addresses Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 13/17] arm64: __show_regs: strip PAC from lr in printk Amit Daniel Kachhap
2020-02-17  9:27 ` [PATCH v5 14/17] arm64: suspend: restore the kernel ptrauth keys Amit Daniel Kachhap
2020-02-28 18:18   ` Catalin Marinas
2020-03-02 10:13     ` Amit Kachhap
2020-02-17  9:27 ` [PATCH v5 15/17] kconfig: Add support for 'as-option' Amit Daniel Kachhap
2020-02-17  9:39   ` Masahiro Yamada
2020-02-17 10:16     ` Vincenzo Frascino
2020-02-18  0:37       ` Masahiro Yamada
2020-02-18 10:14         ` Vincenzo Frascino
2020-02-17  9:27 ` [PATCH v5 16/17] arm64: compile the kernel with ptrauth return address signing Amit Daniel Kachhap
2020-02-28 18:23   ` Catalin Marinas
2020-03-02 10:19     ` Amit Kachhap
2020-03-02 13:16     ` Mark Brown
2020-03-04 11:01       ` Vincenzo Frascino
2020-03-03  9:28     ` Amit Kachhap
2020-03-04 10:53     ` Vincenzo Frascino
2020-02-17  9:27 ` [PATCH v5 17/17] lkdtm: arm64: test kernel pointer authentication Amit Daniel Kachhap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1581931668-11559-6-git-send-email-amit.kachhap@arm.com \
    --to=amit.kachhap@arm.com \
    --cc=Dave.Martin@arm.com \
    --cc=Vincenzo.Frascino@arm.com \
    --cc=ardb@kernel.org \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=james.morse@arm.com \
    --cc=keescook@chromium.org \
    --cc=kristina.martsenko@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=ramana.radhakrishnan@arm.com \
    --cc=suzuki.poulose@arm.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).