Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf28a597 authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

s390/dump: Remove CONFIG_ZFCPDUMP 



Currently there are two s390 kernel dump config options "CONFIG_ZFCPDUMP"
and "CONFIG_CRASH_DUMP". In order to keep things simple and because the
"CONFIG_ZFCPDUMP" option already has a dependency to "CONFIG_CRASH_DUMP"
remove the CONFIG_ZFCPDUMP option.

Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: default avatarEric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 71c40f7f

Documentation/s390/zfcpdump.txt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ standalone dump format. It can be used in the same way as e.g. /dev/mem. The 
dump format defines a 4K header followed by plain uncompressed memory. The

register sets are stored in the prefix pages of the respective cpus. To build a

dump enabled kernel with the zcore driver, the kernel config option

CONFIG_ZFCPDUMP has to be set. When reading from "zcore/mem", the part of

CONFIG_CRASH_DUMP has to be set. When reading from "zcore/mem", the part of

memory, which has been saved by hardware is read by the driver via the SCLP

hardware interface. The second part is just copied from the non overwritten real

memory.
@@ -32,7 +32,7 @@ SCSI disk. 


To build a zfcpdump kernel use the following settings in your kernel

configuration:

 * CONFIG_ZFCPDUMP=y

 * CONFIG_CRASH_DUMP=y

 * Enable ZFCP driver

 * Enable SCSI driver

 * Enable ext2 and ext3 filesystems

arch/s390/Kconfig

+2 −9
Original line number Diff line number Diff line
@@ -593,21 +593,14 @@ config CRASH_DUMP 
	bool "kernel crash dumps"

	depends on 64BIT && SMP

	select KEXEC

	select ZFCPDUMP

	help

	  Generate crash dump after being started by kexec.

	  Crash dump kernels are loaded in the main kernel with kexec-tools

	  into a specially reserved region and then later executed after

	  a crash by kdump/kexec.

	  For more details see Documentation/kdump/kdump.txt



config ZFCPDUMP

	def_bool n

	prompt "zfcpdump support"

	depends on 64BIT && SMP

	help

	  Select this option if you want to build an zfcpdump enabled kernel.

	  Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.

	  This option also enables s390 zfcpdump.

	  See also <file:Documentation/s390/zfcpdump.txt>



endmenu

arch/s390/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void __init conmode_default(void) 
	}

}



#ifdef CONFIG_ZFCPDUMP

#ifdef CONFIG_CRASH_DUMP

static void __init setup_zfcpdump(void)

{

	if (ipl_info.type != IPL_TYPE_FCP_DUMP)
@@ -223,7 +223,7 @@ static void __init setup_zfcpdump(void) 
}

#else

static inline void setup_zfcpdump(void) {}

#endif /* CONFIG_ZFCPDUMP */

#endif /* CONFIG_CRASH_DUMP */



 /*

 * Reboot, halt and power_off stubs. They just call _machine_restart,
@@ -521,7 +521,7 @@ static struct notifier_block kdump_mem_nb = { 
 */

static void reserve_memory_end(void)

{

#ifdef CONFIG_ZFCPDUMP

#ifdef CONFIG_CRASH_DUMP

	if (ipl_info.type == IPL_TYPE_FCP_DUMP &&

	    !OLDMEM_BASE && sclp_get_hsa_size()) {

		memory_end = sclp_get_hsa_size();

arch/s390/kernel/smp.c

+3 −5
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ void smp_ctl_clear_bit(int cr, int bit) 
}

EXPORT_SYMBOL(smp_ctl_clear_bit);



#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_CRASH_DUMP)

#ifdef CONFIG_CRASH_DUMP



static void __init smp_get_save_area(int cpu, u16 address)

{
@@ -536,14 +536,12 @@ static void __init smp_get_save_area(int cpu, u16 address) 
	save_area = dump_save_area_create(cpu);

	if (!save_area)

		panic("could not allocate memory for save area\n");

#ifdef CONFIG_CRASH_DUMP

	if (address == boot_cpu_address) {

		/* Copy the registers of the boot cpu. */

		copy_oldmem_page(1, (void *) save_area, sizeof(*save_area),

				 SAVE_AREA_BASE - PAGE_SIZE, 0);

		return;

	}

#endif

	/* Get the registers of a non-boot cpu. */

	__pcpu_sigp_relax(address, SIGP_STOP_AND_STORE_STATUS, 0, NULL);

	memcpy_real(save_area, lc + SAVE_AREA_BASE, sizeof(*save_area));
@@ -560,11 +558,11 @@ int smp_store_status(int cpu) 
	return 0;

}



#else /* CONFIG_ZFCPDUMP || CONFIG_CRASH_DUMP */

#else /* CONFIG_CRASH_DUMP */



static inline void smp_get_save_area(int cpu, u16 address) { }



#endif /* CONFIG_ZFCPDUMP || CONFIG_CRASH_DUMP */

#endif /* CONFIG_CRASH_DUMP */



void smp_cpu_set_polarization(int cpu, int val)

{

drivers/s390/char/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,4 +33,4 @@ obj-$(CONFIG_MONWRITER) += monwriter.o 
obj-$(CONFIG_S390_VMUR) += vmur.o



zcore_mod-objs := sclp_sdias.o zcore.o

obj-$(CONFIG_ZFCPDUMP) += zcore_mod.o
 
obj-$(CONFIG_CRASH_DUMP) += zcore_mod.o