Patchwork [1/2] powerpc: issue fsl_soc reboot warning only when applicable

login
register
mail settings
Submitter Paul Gortmaker
Date Aug. 14, 2009, 4:13 p.m.
Message ID <2d219a4998d568c5925727ce61ca440dfb25f5e7.1250266325.git.paul.gortmaker@windriver.com>
Download mbox | patch
Permalink /patch/31422/
State Accepted
Commit 46c4c229ecf470202a1f4fd2402283cb038864bf
Delegated to: Kumar Gala
Headers show

Comments

Paul Gortmaker - Aug. 14, 2009, 4:13 p.m.
Some CPU, like the MPC8560 don't have a RSTCR in the Global
Utilities Block.  These boards will implement their own reboot
call, and not use this code, so we should only warn about the
absence of the GUTS RSTCR when the default reboot code is used.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/powerpc/sysdev/fsl_soc.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Kumar Gala - Aug. 14, 2009, 8:21 p.m.
On Aug 14, 2009, at 11:13 AM, Paul Gortmaker wrote:

> Some CPU, like the MPC8560 don't have a RSTCR in the Global
> Utilities Block.  These boards will implement their own reboot
> call, and not use this code, so we should only warn about the
> absence of the GUTS RSTCR when the default reboot code is used.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> arch/powerpc/sysdev/fsl_soc.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)


applied to next

- k

Patch

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 95dbc64..adca4af 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -37,6 +37,7 @@ 
 #include <asm/irq.h>
 #include <asm/time.h>
 #include <asm/prom.h>
+#include <asm/machdep.h>
 #include <sysdev/fsl_soc.h>
 #include <mm/mmu_decl.h>
 #include <asm/cpm2.h>
@@ -383,8 +384,9 @@  static int __init setup_rstcr(void)
 		if (!rstcr)
 			printk (KERN_EMERG "Error: reset control register "
 					"not mapped!\n");
-	} else
-		printk (KERN_INFO "rstcr compatible register does not exist!\n");
+	} else if (ppc_md.restart == fsl_rstcr_restart)
+		printk(KERN_ERR "No RSTCR register, warm reboot won't work\n");
+
 	if (np)
 		of_node_put(np);
 	return 0;