Commit c5f02bb4 authored by Shaohui Xie's avatar Shaohui Xie Committed by Kumar Gala
Browse files

powerpc/watchdog: move booke watchdog param related code to setup-common.c 



Currently, BOOKE watchdog code for checking "wdt" and "wdt_period" is
in setup_32.c, it cannot be used in 64-bit, so move it to a common place
setup-common.c, which will be shared by 32-bit and 64-bit.

Also, replace the simple_strtoul with kstrtol.

Signed-off-by: default avatarShaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b5dc2986

arch/powerpc/kernel/setup-common.c

+27 −0
Original line number Diff line number Diff line
@@ -720,6 +720,33 @@ static int powerpc_debugfs_init(void) 
arch_initcall(powerpc_debugfs_init);

#endif



#ifdef CONFIG_BOOKE_WDT

extern u32 booke_wdt_enabled;

extern u32 booke_wdt_period;



/* Checks wdt=x and wdt_period=xx command-line option */

notrace int __init early_parse_wdt(char *p)

{

	if (p && strncmp(p, "0", 1) != 0)

		booke_wdt_enabled = 1;



	return 0;

}

early_param("wdt", early_parse_wdt);



int __init early_parse_wdt_period(char *p)

{

	unsigned long ret;

	if (p) {

		if (!kstrtol(p, 0, &ret))

			booke_wdt_period = ret;

	}



	return 0;

}

early_param("wdt_period", early_parse_wdt_period);

#endif	/* CONFIG_BOOKE_WDT */



void ppc_printk_progress(char *s, unsigned short hex)

{

	pr_info("%s\n", s);

arch/powerpc/kernel/setup_32.c

+0 −24
Original line number Diff line number Diff line
@@ -149,30 +149,6 @@ notrace void __init machine_init(u64 dt_ptr) 
		ppc_md.progress("id mach(): done", 0x200);

}



#ifdef CONFIG_BOOKE_WDT

extern u32 booke_wdt_enabled;

extern u32 booke_wdt_period;



/* Checks wdt=x and wdt_period=xx command-line option */

notrace int __init early_parse_wdt(char *p)

{

	if (p && strncmp(p, "0", 1) != 0)

	       booke_wdt_enabled = 1;



	return 0;

}

early_param("wdt", early_parse_wdt);



int __init early_parse_wdt_period (char *p)

{

	if (p)

		booke_wdt_period = simple_strtoul(p, NULL, 0);



	return 0;

}

early_param("wdt_period", early_parse_wdt_period);

#endif	/* CONFIG_BOOKE_WDT */



/* Checks "l2cr=xxxx" command-line option */

int __init ppc_setup_l2cr(char *str)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE