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

Commit f8c905d3 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3132/1: S3C2410 - reset on decompression error 



Patch from Ben Dooks

Force a watchdog reset if the system fails to
decompress properly.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4c18ad20

arch/arm/boot/compressed/misc.c

+6 −0
Original line number Diff line number Diff line
@@ -283,8 +283,14 @@ void flush_window(void) 
	putstr(".");

}



#ifndef arch_error

#define arch_error(x)

#endif



static void error(char *x)

{

	arch_error(x);



	putstr("\n\n");

	putstr(x);

	putstr("\n\n -- System halted");

arch/arm/mach-s3c2410/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -121,6 +121,14 @@ config S3C2410_BOOT_WATCHDOG 
	  system resets depends on the value of PCLK. The timeout on an

	  200MHz s3c2410 should be about 30 seconds.



config S3C2410_BOOT_ERROR_RESET

	bool "S3C2410 Reboot on decompression error"

	depends on ARCH_S3C2410

	help

	  Say y here to use the watchdog to reset the system if the

	  kernel decompressor detects an error during decompression.





comment "S3C2410 Setup"



config S3C2410_DMA

include/asm-arm/arch-s3c2410/uncompress.h

+20 −2
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ putstr(const char *ptr) 
	}

}



#define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0)



/* CONFIG_S3C2410_BOOT_WATCHDOG

 *

 * Simple boot-time watchdog setup, to reboot the system if there is
@@ -126,8 +128,6 @@ putstr(const char *ptr) 


#define WDOG_COUNT (0xff00)



#define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0)



static inline void arch_decomp_wdog(void)

{

	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);
@@ -145,6 +145,24 @@ static void arch_decomp_wdog_start(void) 
#define arch_decomp_wdog()

#endif



#ifdef CONFIG_S3C2410_BOOT_ERROR_RESET



static void arch_decomp_error(const char *x)

{

	putstr("\n\n");

	putstr(x);

	putstr("\n\n -- System resetting\n");



	__raw_writel(0x4000, S3C2410_WTDAT);

	__raw_writel(0x4000, S3C2410_WTCNT);

	__raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x40), S3C2410_WTCON);



	while(1);

}



#define arch_error arch_decomp_error

#endif



static void error(char *err);



static void