Просмотр исходного кода

[ARM] 5014/1: Cleanup reset state before entering suspend or resetting.

The kernel should clean stale bits from reset status, so that
they won't confuse the bootloader.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Dmitry Baryshkov 17 лет назад
Родитель
Сommit
d3930614e6
2 измененных файлов с 4 добавлено и 2 удалено
  1. 2 2
      arch/arm/mach-pxa/pm.c
  2. 2 0
      include/asm-arm/arch-pxa/system.h

+ 2 - 2
arch/arm/mach-pxa/pm.c

@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state)
 			sleep_save_checksum += sleep_save[i];
 	}
 
-	/* Clear sleep reset status */
-	RCSR = RCSR_SMR;
+	/* Clear reset status */
+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
 
 	/* *** go zzz *** */
 	pxa_cpu_pm_fns->enter(state);

+ 2 - 0
include/asm-arm/arch-pxa/system.h

@@ -22,6 +22,8 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode)
 {
+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
+
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
 		cpu_reset(0);