linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Zang Roy-r61911 <tie-fei.zang@freescale.com>
To: Kumar Gala <galak@kernel.crashing.org>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
	Paul Mackerras <paulus@samba.org>
Subject: [PATCH v3]: Fix e500 v2 core reboot bug
Date: 12 Jun 2007 17:08:14 +0800	[thread overview]
Message-ID: <1181639293.8953.7.camel@localhost.localdomain> (raw)
In-Reply-To: <1180406209.8139.13.camel@localhost.localdomain>

From: roy zang <tie-fei.zang@freescale.com>

Fix the reset bug on 8548CDS board.
>From MPC8548CDS with e500 v2 core, a new reset control register is added.
This register is used for the cpu reset.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
---
I will update the booting-without-of.txt and apply
this method to 8544/8641 in next serial patches.

 arch/powerpc/boot/dts/mpc8548cds.dts |    6 ++++++
 arch/powerpc/platforms/85xx/misc.c   |   30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index ad96381..0550a3c 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -177,6 +177,12 @@
 			interrupt-parent = <&mpic>;
 		};
 
+		global-utilities@e0000 {	//global utilities reg
+			compatible = "fsl,mpc8548-guts";
+			reg = <e0000 1000>;
+			fsl,has-rstcr;
+		};
+
 		pci1: pci@8000 {
 			interrupt-map-mask = <1f800 0 0 7>;
 			interrupt-map = <
diff --git a/arch/powerpc/platforms/85xx/misc.c b/arch/powerpc/platforms/85xx/misc.c
index 3e62fcb..6d9451c 100644
--- a/arch/powerpc/platforms/85xx/misc.c
+++ b/arch/powerpc/platforms/85xx/misc.c
@@ -13,11 +13,41 @@
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <asm/irq.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+
+static __be32 __iomem *rstcr;
 
 extern void abort(void);
 
+static int __init mpc85xx_rstcr(void)
+{
+	struct device_node *np;
+	np = of_find_node_by_name(NULL, "global-utilities");
+	if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
+		const u32 *prop = of_get_property(np, "reg", NULL);
+		if (prop) {
+		/* map reset control register
+		 * 0xE00B0 is offset of reset control register
+		 */
+			rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);
+			if (!rstcr)
+				printk (KERN_EMERG "Error: reset control register not mapped, spinning!\n");
+		}
+	else
+		printk (KERN_INFO "rstcr compatible register does not exist!\n");
+	}
+	return 0;
+}
+
+arch_initcall(mpc85xx_rstcr);
+
 void mpc85xx_restart(char *cmd)
 {
 	local_irq_disable();
+	if (rstcr)
+		/* set reset control register */
+		out_be32(rstcr, 0x2);	/* HRESET_REQ */
 	abort();
 }
-- 
1.5.1

  parent reply	other threads:[~2007-06-12  9:09 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-29  2:36 [PATCH v2]: Fix e500 v2 core reboot bug Zang Roy-r61911
2007-05-29 17:38 ` Andy Fleming
2007-05-29 19:29 ` Kumar Gala
2007-05-30  2:34   ` Zang Roy-r61911
2007-05-30  2:40     ` Kumar Gala
2007-05-30  5:46       ` Zang Roy-r61911
2007-05-30 12:25         ` Kumar Gala
2007-05-30 13:49           ` Kumar Gala
2007-05-30 15:21             ` Segher Boessenkool
2007-05-31  5:32               ` Zang Roy-r61911
2007-05-31  5:52               ` Benjamin Herrenschmidt
2007-05-31  3:40             ` Zang Roy-r61911
2007-06-04  8:28             ` Zang Roy-r61911
2007-06-04  8:41               ` Segher Boessenkool
2007-06-04  9:01                 ` Zang Roy-r61911
2007-06-04 10:37                   ` Segher Boessenkool
2007-06-05  2:15                     ` Zang Roy-r61911
2007-05-31  2:38           ` Zang Roy-r61911
2007-06-12  9:08 ` Zang Roy-r61911 [this message]
2007-06-12 16:18   ` [PATCH v3]: " Timur Tabi
2007-06-13  4:44   ` Segher Boessenkool
2007-06-13  5:45     ` Zang Roy-r61911
2007-06-13  6:24       ` Zang Roy-r61911
2007-06-13  6:43         ` Zang Roy-r61911
2007-06-13  6:57           ` Segher Boessenkool
2007-06-13  7:04             ` Segher Boessenkool
2007-06-13  6:16     ` Zang Roy-r61911
2007-06-13  6:28       ` Segher Boessenkool
2007-06-13  6:31         ` Zang Roy-r61911

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1181639293.8953.7.camel@localhost.localdomain \
    --to=tie-fei.zang@freescale.com \
    --cc=galak@kernel.crashing.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).