[PATCH 1/2] powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
This patch introduces PPC64 specific #ifdef bits from the upstream
commit: b3df895aebe091b1657a42a8c859bd49fc96646b.
Reported-and-tested-by: dann frazier da...@dannf.org
Signed-off-by: Kumar Gala ga...@kernel.crashing.org
Signed-off-by: Kamalesh Babulal kamal...@linux.vnet.ibm.com
cc: Benjamin Herrenschmidt b...@kernel.crashing.org
cc: Anton Blanchard an...@samba.org
---
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index fe02e71..4de36b8 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
}
/* 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;
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
}
mb();
}
+#endif
/*
* This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
crash_kexec_prepare_cpus(crashing_cpu);
cpu_set(crashing_cpu, cpus_in_crash);
crash_kexec_stop_spus();
+#ifdef CONFIG_PPC_STD_MMU_64
crash_kexec_wait_realmode(crashing_cpu);
+#endif
if (ppc_md.kexec_cpu_down)
ppc_md.kexec_cpu_down(1, 0);
}
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110406130145.gk28...@linux.vnet.ibm.com
[PATCH 2/2] powerpc: Fix default_machine_crash_shutdown #ifdef botch
powerpc: Fix default_machine_crash_shutdown #ifdef botch Commit: c2be05481f6125254c45b78f334d4dd09c701c82 upstream crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64 and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP. Fix the conditional compilation around the invocation. Reported-by: Ben Hutchings b...@decadent.org.uk Signed-off-by: Paul E. McKenney paul...@linux.vnet.ibm.com Acked-by: Michael Neuling mi...@neuling.org Signed-off-by: Benjamin Herrenschmidt b...@kernel.crashing.org Signed-off-by: Kamalesh Babulal kamal...@linux.vnet.ibm.com cc: Anton Blanchard an...@samba.org --- arch/powerpc/kernel/crash.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 4de36b8..5009198 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -447,7 +447,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) crash_kexec_prepare_cpus(crashing_cpu); cpu_set(crashing_cpu, cpus_in_crash); crash_kexec_stop_spus(); -#ifdef CONFIG_PPC_STD_MMU_64 +#if defined(CONFIG_PPC_STD_MMU_64) defined(CONFIG_SMP) crash_kexec_wait_realmode(crashing_cpu); #endif if (ppc_md.kexec_cpu_down) -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110406130448.gl28...@linux.vnet.ibm.com
[PATCH 0/2] powerpc/kexec build failure fixes
Hi Greg, Can you please pull the powerpc build failure fixes patch series into 2.6.32-stable. Kumar Gala (1): powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code Paul E. McKenney (1): powerpc: Fix default_machine_crash_shutdown #ifdef botch arch/powerpc/kernel/crash.c |4 1 files changed, 4 insertions(+), 0 deletions(-) -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110406125849.gj28...@linux.vnet.ibm.com
Re: Stable update of linux-2.6
* dann frazier da...@dannf.org [2011-04-04 15:57:55]:
On Sun, Apr 03, 2011 at 01:21:03PM +0530, Kamalesh Babulal wrote:
* dann frazier da...@dannf.org [2011-04-02 11:23:03]:
2.6.32.36 also fails to build on powerpc/SMP:
CC arch/powerpc/kernel/crash.o
arch/powerpc/kernel/crash.c: In function 'crash_kexec_wait_realmode':
arch/powerpc/kernel/crash.c:176: error: 'paca' undeclared (first use in
this function)
arch/powerpc/kernel/crash.c:176: error: (Each undeclared identifier is
reported only once
arch/powerpc/kernel/crash.c:176: error: for each function it appears in.)
make[1]: *** [arch/powerpc/kernel/crash.o] Error 1
make: *** [arch/powerpc/kernel] Error 2
Hi Dann,
Can you please try the following patch, which adds the changes
introduced by Kumar Gala to the commit b3df895aeb to my previous patch.
Yep, that fixes the build.
Thanks for testing.
-dann
Hi Greg,
Can you please pick up the patch for 2.6.32-stable, resending the
patch with some checkpatch warnings fixed.
powerpc: Fix default_machine_crash_shutdown #ifdef build failure
Introducing #ifdef to fix the build failure caused by
crash_kexec_wait_realmode(), with powerpc build with !SMP.
Reported-by: Ben Hutchings b...@decadent.org.uk
Reported-and-tested-by: dann frazier da...@dannf.org
Signed-off-by: Kamalesh Babulal kamal...@linux.vnet.ibm.com
cc: Paul E. McKenney paul...@linux.vnet.ibm.com
cc: Michael Neuling mi...@neuling.org
cc: Benjamin Herrenschmidt b...@kernel.crashing.org
cc: Anton Blanchard an...@samba.org
cc: Kumar Gala ga...@kernel.crashing.org
---
arch/powerpc/kernel/crash.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index fe02e71..5009198 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
}
/* 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;
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
}
mb();
}
+#endif
/*
* This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
crash_kexec_prepare_cpus(crashing_cpu);
cpu_set(crashing_cpu, cpus_in_crash);
crash_kexec_stop_spus();
+#if defined(CONFIG_PPC_STD_MMU_64) defined(CONFIG_SMP)
crash_kexec_wait_realmode(crashing_cpu);
+#endif
if (ppc_md.kexec_cpu_down)
ppc_md.kexec_cpu_down(1, 0);
}
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110405105133.ge28...@linux.vnet.ibm.com
Re: Stable update of linux-2.6
* Greg KH g...@kroah.com [2011-04-05 07:08:30]: On Tue, Apr 05, 2011 at 04:21:33PM +0530, Kamalesh Babulal wrote: * dann frazier da...@dannf.org [2011-04-04 15:57:55]: On Sun, Apr 03, 2011 at 01:21:03PM +0530, Kamalesh Babulal wrote: * dann frazier da...@dannf.org [2011-04-02 11:23:03]: 2.6.32.36 also fails to build on powerpc/SMP: CC arch/powerpc/kernel/crash.o arch/powerpc/kernel/crash.c: In function 'crash_kexec_wait_realmode': arch/powerpc/kernel/crash.c:176: error: 'paca' undeclared (first use in this function) arch/powerpc/kernel/crash.c:176: error: (Each undeclared identifier is reported only once arch/powerpc/kernel/crash.c:176: error: for each function it appears in.) make[1]: *** [arch/powerpc/kernel/crash.o] Error 1 make: *** [arch/powerpc/kernel] Error 2 Hi Dann, Can you please try the following patch, which adds the changes introduced by Kumar Gala to the commit b3df895aeb to my previous patch. Yep, that fixes the build. Thanks for testing. -dann Hi Greg, Can you please pick up the patch for 2.6.32-stable, resending the patch with some checkpatch warnings fixed. powerpc: Fix default_machine_crash_shutdown #ifdef build failure Is this patch upstream in Linus's tree? If so, what is the git commit id? If not, why isn't it needed there? [...] the #ifdef CONFIG_PPC_STD_MMU_64 bits are taken from upstream commit b3df895aebe09 and the build failure incase of SMP=n is from the upstream commit c2be05481f61. Should I resend the patch in rebase format including both the commits id and message. thanks, Kamalesh -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110405151150.gf28...@linux.vnet.ibm.com
Re: Stable update of linux-2.6
* Greg KH g...@kroah.com [2011-04-05 08:47:37]:
On Tue, Apr 05, 2011 at 08:41:50PM +0530, Kamalesh Babulal wrote:
* Greg KH g...@kroah.com [2011-04-05 07:08:30]:
On Tue, Apr 05, 2011 at 04:21:33PM +0530, Kamalesh Babulal wrote:
* dann frazier da...@dannf.org [2011-04-04 15:57:55]:
On Sun, Apr 03, 2011 at 01:21:03PM +0530, Kamalesh Babulal wrote:
* dann frazier da...@dannf.org [2011-04-02 11:23:03]:
[...]
Hi Greg,
Can you please pick up the patch for 2.6.32-stable, resending
the
patch with some checkpatch warnings fixed.
powerpc: Fix default_machine_crash_shutdown #ifdef build failure
Is this patch upstream in Linus's tree? If so, what is the git commit
id? If not, why isn't it needed there?
[...]
the #ifdef CONFIG_PPC_STD_MMU_64 bits are taken from upstream commit
b3df895aebe09 and the build failure incase of SMP=n is from the
upstream commit c2be05481f61.
Should I resend the patch in rebase format including both the commits
id and message.
Yes, please do.
Hi Greg,
Resending the patch with commit id and message included. Please let
me know, incase the patch needs any other changes to be made.
powerpc: Fix default_machine_crash_shutdown #ifdef build failure
This patch introduces #ifdef bits from below commits, to fix the
build failure on powerpc caused by crash_kexec_wait_realmode()
when compiled with !SMP.
Commit: c2be05481f6125254c45b78f334d4dd09c701c82 upstream
powerpc: Fix default_machine_crash_shutdown #ifdef botch
crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64
and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP.
Fix the conditional compilation around the invocation.
Commit: b3df895aebe091b1657a42a8c859bd49fc96646b upstream
powerpc/kexec: Add support for FSL-BookE
This adds support kexec on FSL-BookE where the MMU can not be simply
switched off. The code borrows the initial MMU-setup code to create the
identical mapping mapping. The only difference to the original boot code
is the size of the mapping(s) and the executeable address.
The kexec code maps the first 2 GiB of memory in 256 MiB steps. This
should work also on e500v1 boxes.
SMP support is still not available.
(Kumar: Added minor change to build to ifdef CONFIG_PPC_STD_MMU_64 some
code that was PPC64 specific)
Reported-by: Ben Hutchings b...@decadent.org.uk
Reported-and-tested-by: dann frazier da...@dannf.org
Signed-off-by: Kamalesh Babulal kamal...@linux.vnet.ibm.com
cc: Paul E. McKenney paul...@linux.vnet.ibm.com
cc: Michael Neuling mi...@neuling.org
cc: Benjamin Herrenschmidt b...@kernel.crashing.org
cc: Anton Blanchard an...@samba.org
cc: Kumar Gala ga...@kernel.crashing.org
---
arch/powerpc/kernel/crash.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index fe02e71..5009198 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
}
/* 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;
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
}
mb();
}
+#endif
/*
* This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
crash_kexec_prepare_cpus(crashing_cpu);
cpu_set(crashing_cpu, cpus_in_crash);
crash_kexec_stop_spus();
+#if defined(CONFIG_PPC_STD_MMU_64) defined(CONFIG_SMP)
crash_kexec_wait_realmode(crashing_cpu);
+#endif
if (ppc_md.kexec_cpu_down)
ppc_md.kexec_cpu_down(1, 0);
}
thanks,
Kamalesh
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110405162652.gg28...@linux.vnet.ibm.com
Re: Stable update of linux-2.6
* dann frazier da...@dannf.org [2011-04-02 11:23:03]:
2.6.32.36 also fails to build on powerpc/SMP:
CC arch/powerpc/kernel/crash.o
arch/powerpc/kernel/crash.c: In function 'crash_kexec_wait_realmode':
arch/powerpc/kernel/crash.c:176: error: 'paca' undeclared (first use in this
function)
arch/powerpc/kernel/crash.c:176: error: (Each undeclared identifier is
reported only once
arch/powerpc/kernel/crash.c:176: error: for each function it appears in.)
make[1]: *** [arch/powerpc/kernel/crash.o] Error 1
make: *** [arch/powerpc/kernel] Error 2
Hi Dann,
Can you please try the following patch, which adds the changes
introduced by Kumar Gala to the commit b3df895aeb to my previous patch.
powerpc: Fix default_machine_crash_shutdown #ifdef build failure
Introducing #ifdef to fix the build failure caused by
crash_kexec_wait_realmode(), with powerpc build with !SMP.
Reported-by: Ben Hutchings b...@decadent.org.uk
Reported-by: dann frazier da...@dannf.org
Signed-off-by: Kamalesh Babulal kamal...@linux.vnet.ibm.com
cc: Paul E. McKenney paul...@linux.vnet.ibm.com
cc: Michael Neuling mi...@neuling.org
cc: Benjamin Herrenschmidt b...@kernel.crashing.org
cc: Anton Blanchard an...@samba.org
cc: Kumar Gala ga...@kernel.crashing.org
--
arch/powerpc/kernel/crash.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index fe02e71..175d1a7 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
}
/* 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;
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
}
mb();
}
+#endif
/*
* This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
crash_kexec_prepare_cpus(crashing_cpu);
cpu_set(crashing_cpu, cpus_in_crash);
crash_kexec_stop_spus();
+#if defined(CONFIG_PPC_STD_MMU_64) defined(CONFIG_SMP)
crash_kexec_wait_realmode(crashing_cpu);
+#endif
if (ppc_md.kexec_cpu_down)
ppc_md.kexec_cpu_down(1, 0);
}
Kamalesh
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110403075103.gb4...@linux.vnet.ibm.com
Re: Stable update of linux-2.6
* dann frazier da...@dannf.org [2011-04-02 11:23:03]: 2.6.32.36 also fails to build on powerpc/SMP: CC arch/powerpc/kernel/crash.o arch/powerpc/kernel/crash.c: In function 'crash_kexec_wait_realmode': arch/powerpc/kernel/crash.c:176: error: 'paca' undeclared (first use in this function) arch/powerpc/kernel/crash.c:176: error: (Each undeclared identifier is reported only once arch/powerpc/kernel/crash.c:176: error: for each function it appears in.) make[1]: *** [arch/powerpc/kernel/crash.o] Error 1 make: *** [arch/powerpc/kernel] Error 2 This build is not reproducible locally, can you please send the .config file. Thanks, Kamalesh -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110402184007.ga4...@linux.vnet.ibm.com
Re: Stable update of linux-2.6
* Ben Hutchings b...@decadent.org.uk [2011-03-30 00:11:59]: On Tue, 2011-03-29 at 23:26 +0100, Adam D. Barratt wrote: On Sun, 2011-03-27 at 20:31 +0100, Ben Hutchings wrote: There were a couple of regressions in linux-2.6 version 2.6.32-31 (i.e. Debian 6.0.1) that should be fixed a.s.a.p: [...] Either Dann or I will upload an update to stable-proposed-updates, intended for early release through stable-updates. Unfortunately, the powerpc build reproducibly FTBFS: Introduced by: commit 4d4d502715479044f02ae7464474bbb615b2d158 Author: Michael Neuling mi...@neuling.org Date: Thu May 13 19:40:11 2010 + powerpc/kdump: Fix race in kdump shutdown commit 60adec6226bbcf061d4c2d10944fced209d1847d upstream. The new function crash_kexec_wait_realmode() is only defined if CONFIG_SMP is defined, but is used unconditionally. Of course, this was quickly fixed upstream: commit c2be05481f6125254c45b78f334d4dd09c701c82 Author: Paul E. McKenney paul...@linux.vnet.ibm.com Date: Tue Jun 15 14:48:39 2010 + powerpc: Fix default_machine_crash_shutdown #ifdef botch but that doesn't appear to have been sent to stable. Ben. CC arch/powerpc/kernel/crash.o /build/buildd-linux-2.6_2.6.32-32-powerpc-emhBwA/linux-2.6-2.6.32/debian/build/source_powerpc_none/arch/powerpc/kernel/crash.c: In function 'default_machine_crash_shutdown': /build/buildd-linux-2.6_2.6.32-32-powerpc-emhBwA/linux-2.6-2.6.32/debian/build/source_powerpc_none/arch/powerpc/kernel/crash.c:448: error: implicit declaration of function 'crash_kexec_wait_realmode' make[6]: *** [arch/powerpc/kernel/crash.o] Error 1 make[5]: *** [arch/powerpc/kernel] Error 2 make[4]: *** [sub-make] Error 2 make[3]: *** [all] Error 2 make[3]: Leaving directory `/build/buildd-linux-2.6_2.6.32-32-powerpc-emhBwA/linux-2.6-2.6.32/debian/build/build_powerpc_none_powerpc' make[2]: *** [debian/stamps/build_powerpc_none_powerpc_plain] Error 2 make[1]: *** [build_powerpc_none_powerpc_real] Error 2 make[2]: Leaving directory `/build/buildd-linux-2.6_2.6.32-32-powerpc-emhBwA/linux-2.6-2.6.32' make: make[1]: Leaving directory `/build/buildd-linux-2.6_2.6.32-32-powerpc-emhBwA/linux-2.6-2.6.32' *** [debian/stamps/build-base] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 snip Thanks for testing, I have added smp=n to my powerpc build test bucket. The upstream commit c2be05481f fixes the issues based upon the upstream commit b3df895aebe0, latter commit is not available in the 2.6.32-stable tree. The patch below introduces only the partial changes introduced by Paul McKenney's patch. Greg can you please pull the patch into 2.6.32-stable. powerpc: Fix default_machine_crash_shutdown #ifdef build failure Introducing #ifdef to fix the build failure caused by crash_kexec_wait_realmode(), with powerpc build with !SMP. Reported-by: Ben Hutchings b...@decadent.org.uk Signed-off-by: Kamalesh Babulal kamal...@linux.vnet.ibm.com cc: Paul E. McKenney paul...@linux.vnet.ibm.com cc: Michael Neuling mi...@neuling.org cc: Benjamin Herrenschmidt b...@kernel.crashing.org cc: Anton Blanchard an...@samba.org --- arch/powerpc/kernel/crash.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index fe02e71..6ff7701 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -445,7 +445,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs) crash_kexec_prepare_cpus(crashing_cpu); cpu_set(crashing_cpu, cpus_in_crash); crash_kexec_stop_spus(); +#ifdef CONFIG_SMP crash_kexec_wait_realmode(crashing_cpu); +#endif if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down(1, 0); } Kamalesh -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110330084109.ga8...@linux.vnet.ibm.com
