[v2][PATCH 2/7] book3e/kexec/kdump: enable kexec for kernel

[tiejun.chen]

On 07/02/2013 01:17 PM, Bhushan Bharat-R65777 wrote:
>
>
>> -----Original Message-----
>> From: Linuxppc-dev [mailto:linuxppc-dev-
>> bounces+bharat.bhushan=freescale.com at lists.ozlabs.org] On Behalf Of Tiejun Chen
>> Sent: Thursday, June 20, 2013 1:23 PM
>> To: benh at kernel.crashing.org
>> Cc: linuxppc-dev at lists.ozlabs.org; linux-kernel at vger.kernel.org
>> Subject: [v2][PATCH 2/7] book3e/kexec/kdump: enable kexec for kernel
>>
>> We need to active KEXEC for book3e and bypass or convert non-book3e stuff
>> in kexec coverage.
>>
>> Signed-off-by: Tiejun Chen <tiejun.chen at windriver.com>
>> ---
>>   arch/powerpc/Kconfig                   |    2 +-
>>   arch/powerpc/kernel/machine_kexec_64.c |    6 ++++++
>>   arch/powerpc/kernel/misc_64.S          |    6 ++++++
>>   3 files changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
>> index c33e3ad..6ecf3c9 100644
>> --- a/arch/powerpc/Kconfig
>> +++ b/arch/powerpc/Kconfig
>> @@ -364,7 +364,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
>>
>>   config KEXEC
>>   	bool "kexec system call"
>> -	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
>> +	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) || PPC_BOOK3E
>>   	help
>>   	  kexec is a system call that implements the ability to shutdown your
>>   	  current kernel, and to start another kernel.  It is like a reboot
>> diff --git a/arch/powerpc/kernel/machine_kexec_64.c
>> b/arch/powerpc/kernel/machine_kexec_64.c
>> index 611acdf..ef39271 100644
>> --- a/arch/powerpc/kernel/machine_kexec_64.c
>> +++ b/arch/powerpc/kernel/machine_kexec_64.c
>> @@ -33,6 +33,7 @@
>>   int default_machine_kexec_prepare(struct kimage *image)
>>   {
>>   	int i;
>> +#ifndef CONFIG_PPC_BOOK3E
>>   	unsigned long begin, end;	/* limits of segment */
>>   	unsigned long low, high;	/* limits of blocked memory range */
>>   	struct device_node *node;
>> @@ -41,6 +42,7 @@ int default_machine_kexec_prepare(struct kimage *image)
>>
>>   	if (!ppc_md.hpte_clear_all)
>>   		return -ENOENT;
>> +#endif
>
> Do we really need this function for book3e? can we have a separate function rather than multiple confusing ifdef?

I prefer we have a separate function to book3e.

Thanks

Tiejun