From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH] powerpc/kexec: Fix build failure on 32-bit SMP
Date: Tue, 26 Apr 2011 14:25:59 -0400 [thread overview]
Message-ID: <4DB70E37.9040407@windriver.com> (raw)
In-Reply-To: <1303693471.3032.212.camel@localhost>
On 11-04-24 09:04 PM, Ben Hutchings wrote:
> Commit b987812b3fcaf70fdf0037589e5d2f5f2453e6ce left
> crash_kexec_wait_realmode() undefined for UP.
>
> Commit 7c7a81b53e581d727d069cc45df5510516faac31 defined it for UP but
> left it undefined for 32-bit SMP.
Crap, I'd originally tested it for 32-SMP too, but not retested after
fixing the UP regression. I'm resolving to not touch this file again. :)
>
> Seems like people are getting confused by nested #ifdef's, so move the
So true.
> definitions of crash_kexec_wait_realmode() after the #ifdef CONFIG_SMP
> section.
I probably should have done this from the get-go as well. Oh well.
At least we are progressing towards a more readable file.
>
> Compile-tested with 32-bit UP, 32-bit SMP and 64-bit SMP configurations.
Since it seems I always get bit by the one combo I skip testing on,
I also tested 64-bit UP as well - just to be extra sure. Thanks for
fixing my brown paper bag moment.
>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Tested-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Paul.
> ---
> --- a/arch/powerpc/kernel/crash.c
> +++ b/arch/powerpc/kernel/crash.c
> @@ -162,34 +162,6 @@
> /* Leave the IPI callback set */
> }
>
> -/* wait for all the CPUs to hit real mode but timeout if they don't come in */
> -#ifdef CONFIG_PPC_STD_MMU_64
> -static void crash_kexec_wait_realmode(int cpu)
> -{
> - unsigned int msecs;
> - int i;
> -
> - msecs = 10000;
> - for (i=0; i < NR_CPUS && msecs > 0; i++) {
> - if (i == cpu)
> - continue;
> -
> - while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
> - barrier();
> - if (!cpu_possible(i)) {
> - break;
> - }
> - if (!cpu_online(i)) {
> - break;
> - }
> - msecs--;
> - mdelay(1);
> - }
> - }
> - mb();
> -}
> -#endif /* CONFIG_PPC_STD_MMU_64 */
> -
> /*
> * This function will be called by secondary cpus or by kexec cpu
> * if soft-reset is activated to stop some CPUs.
> @@ -234,7 +206,6 @@
> }
>
> #else /* ! CONFIG_SMP */
> -static inline void crash_kexec_wait_realmode(int cpu) {}
>
> static void crash_kexec_prepare_cpus(int cpu)
> {
> @@ -257,6 +228,36 @@
> }
> #endif /* CONFIG_SMP */
>
> +/* wait for all the CPUs to hit real mode but timeout if they don't come in */
> +#if defined(CONFIG_SMP) && defined(CONFIG_PPC_STD_MMU_64)
> +static void crash_kexec_wait_realmode(int cpu)
> +{
> + unsigned int msecs;
> + int i;
> +
> + msecs = 10000;
> + for (i=0; i < NR_CPUS && msecs > 0; i++) {
> + if (i == cpu)
> + continue;
> +
> + while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
> + barrier();
> + if (!cpu_possible(i)) {
> + break;
> + }
> + if (!cpu_online(i)) {
> + break;
> + }
> + msecs--;
> + mdelay(1);
> + }
> + }
> + mb();
> +}
> +#else
> +static inline void crash_kexec_wait_realmode(int cpu) {}
> +#endif /* CONFIG_SMP && CONFIG_PPC_STD_MMU_64 */
> +
> /*
> * Register a function to be called on shutdown. Only use this if you
> * can't reset your device in the second kernel.
>
prev parent reply other threads:[~2011-04-26 18:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-25 1:04 [PATCH] powerpc/kexec: Fix build failure on 32-bit SMP Ben Hutchings
2011-04-26 18:25 ` Paul Gortmaker [this message]
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=4DB70E37.9040407@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=ben@decadent.org.uk \
--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).