From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 5/6] powerpc/64: don't set boot CPU's r13 to paca until the structure is set up
Date: Thu, 15 Sep 2022 22:10:57 +1000 [thread overview]
Message-ID: <20220915121058.2288916-6-npiggin@gmail.com> (raw)
In-Reply-To: <20220915121058.2288916-1-npiggin@gmail.com>
The idea is to get to the point where if r13 is non-zero, then it should
contain a reasonable paca. This can be used in early boot program check
and machine check handlers to avoid running off into the weeds if they
hit before r13 has a paca.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/setup_64.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 08173eea8977..214d10caf458 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -177,23 +177,23 @@ early_param("smt-enabled", early_smt_enabled);
#endif /* CONFIG_SMP */
/** Fix up paca fields required for the boot cpu */
-static void __init fixup_boot_paca(void)
+static void __init fixup_boot_paca(struct paca_struct *boot_paca)
{
/* The boot cpu is started */
- get_paca()->cpu_start = 1;
+ boot_paca->cpu_start = 1;
/*
* Give the early boot machine check stack somewhere to use, use
* half of the init stack. This is a bit hacky but there should not be
* deep stack usage in early init so shouldn't overflow it or overwrite
* things.
*/
- get_paca()->mc_emergency_sp = (void *)&init_thread_union +
+ boot_paca->mc_emergency_sp = (void *)&init_thread_union +
(THREAD_SIZE/2);
/* Allow percpu accesses to work until we setup percpu data */
- get_paca()->data_offset = 0;
+ boot_paca->data_offset = 0;
/* Mark interrupts soft and hard disabled in PACA */
- irq_soft_mask_set(IRQS_DISABLED);
- get_paca()->irq_happened = PACA_IRQ_HARD_DIS;
+ boot_paca->irq_soft_mask = IRQS_DISABLED;
+ boot_paca->irq_happened = PACA_IRQ_HARD_DIS;
WARN_ON(mfmsr() & MSR_EE);
}
@@ -361,8 +361,8 @@ void __init early_setup(unsigned long dt_ptr)
* what CPU we are on.
*/
initialise_paca(&boot_paca, 0);
- setup_paca(&boot_paca);
- fixup_boot_paca();
+ fixup_boot_paca(&boot_paca);
+ setup_paca(&boot_paca); /* install the paca into registers */
/* -------- printk is now safe to use ------- */
@@ -391,8 +391,8 @@ void __init early_setup(unsigned long dt_ptr)
/* Poison paca_ptrs[0] again if it's not the boot cpu */
memset(&paca_ptrs[0], 0x88, sizeof(paca_ptrs[0]));
}
- setup_paca(paca_ptrs[boot_cpuid]);
- fixup_boot_paca();
+ fixup_boot_paca(paca_ptrs[boot_cpuid]);
+ setup_paca(paca_ptrs[boot_cpuid]); /* install the paca into registers */
/*
* Configure exception handlers. This include setting up trampolines
--
2.37.2
next prev parent reply other threads:[~2022-09-15 12:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 12:10 [PATCH 0/6] powerpc/64: improve boot debugging Nicholas Piggin
2022-09-15 12:10 ` [PATCH 1/6] powerpc/64: mark irqs hard disabled in boot paca Nicholas Piggin
2022-09-15 12:10 ` [PATCH 2/6] powerpc/64s/interrupt: move early boot ILE fixup into a macro Nicholas Piggin
2022-09-15 12:10 ` [PATCH 3/6] powerpc/64s: early boot machine check handler Nicholas Piggin
2022-09-15 12:10 ` [PATCH 4/6] powerpc/64: avoid using r13 in relocate Nicholas Piggin
2022-09-15 12:10 ` Nicholas Piggin [this message]
2022-09-15 12:10 ` [PATCH 6/6] powerpc/64s/interrupt: halt early boot interrupts if paca is not set up Nicholas Piggin
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=20220915121058.2288916-6-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.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).