From: michal.simek@xilinx.com (Michal Simek)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/10] arm: zynq: Add support for system reset
Date: Tue, 26 Mar 2013 18:43:38 +0100 [thread overview]
Message-ID: <62a24b6d95de2f126cf7e6985acf1757cac69927.1364319776.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <1364319822-5504-1-git-send-email-michal.simek@xilinx.com>
Do system reset via slcr registers.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
v2: Fix comment
use writel instead of __raw_writel
Do not use PSS - use PS instead
---
arch/arm/mach-zynq/common.c | 6 ++++++
arch/arm/mach-zynq/common.h | 1 +
arch/arm/mach-zynq/slcr.c | 28 ++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 2cb94ab..4ad3560 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -92,6 +92,11 @@ static void __init xilinx_map_io(void)
zynq_scu_map_io();
}
+static void xilinx_system_reset(char mode, const char *cmd)
+{
+ slcr_system_reset();
+}
+
static const char *xilinx_dt_match[] = {
"xlnx,zynq-zc702",
"xlnx,zynq-7000",
@@ -104,4 +109,5 @@ MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
.init_machine = xilinx_init_machine,
.init_time = xilinx_zynq_timer_init,
.dt_compat = xilinx_dt_match,
+ .restart = xilinx_system_reset,
MACHINE_END
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h
index e30898a..e5628f7 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@ -18,6 +18,7 @@
#define __MACH_ZYNQ_COMMON_H__
extern int slcr_init(void);
+extern void slcr_system_reset(void);
extern void __iomem *zynq_slcr_base;
extern void __iomem *scu_base;
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 1883b70..3b4695b 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -32,9 +32,37 @@
#define SLCR_UNLOCK_MAGIC 0xDF0D
#define SLCR_UNLOCK 0x8 /* SCLR unlock register */
+#define SLCR_PS_RST_CTRL_OFFSET 0x200 /* PS Software Reset Control */
+#define SLCR_REBOOT_STATUS 0x258 /* PS Reboot Status */
+
void __iomem *zynq_slcr_base;
/**
+ * xslcr_system_reset - Reset the entire system.
+ *
+ */
+void slcr_system_reset(void)
+{
+ u32 reboot;
+
+ /*
+ * Unlock the SLCR then reset the system.
+ * Note that this seems to require raw i/o
+ * functions or there's a lockup?
+ */
+ writel(SLCR_UNLOCK_MAGIC, zynq_slcr_base + SLCR_UNLOCK);
+
+ /*
+ * Clear 0x0F000000 bits of reboot status register to workaround
+ * the FSBL not loading the bitstream after soft-reboot
+ * This is a temporary solution until we know more.
+ */
+ reboot = readl(zynq_slcr_base + SLCR_REBOOT_STATUS);
+ writel(reboot & 0xF0FFFFFF, zynq_slcr_base + SLCR_REBOOT_STATUS);
+ writel(1, zynq_slcr_base + SLCR_PS_RST_CTRL_OFFSET);
+}
+
+/**
* xslcr_init()
* Returns 0 on success, negative errno otherwise.
*
--
1.7.9.7
next prev parent reply other threads:[~2013-03-26 17:43 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-26 17:43 Zynq core changes v2 Michal Simek
2013-03-26 17:43 ` [PATCH v2 01/10] arm: zynq: Use standard timer binding Michal Simek
2013-03-26 20:14 ` Steffen Trumtrar
2013-03-27 7:40 ` Michal Simek
2013-03-27 9:04 ` Steffen Trumtrar
2013-03-27 9:25 ` Michal Simek
2013-03-27 9:37 ` Steffen Trumtrar
2013-03-27 9:54 ` Michal Simek
2013-03-26 17:43 ` [PATCH v2 02/10] arm: zynq: Move timer to clocksource interface Michal Simek
2013-03-26 17:43 ` [PATCH v2 03/10] arm: zynq: Move timer to generic location Michal Simek
2013-03-26 17:43 ` [PATCH v2 04/10] arm: zynq: Load scu baseaddress at run time Michal Simek
2013-03-26 21:44 ` Arnd Bergmann
2013-03-27 7:49 ` Michal Simek
2013-03-27 9:29 ` Arnd Bergmann
2013-03-27 9:37 ` Michal Simek
2013-03-27 10:00 ` Arnd Bergmann
2013-03-27 10:09 ` Michal Simek
2013-03-27 10:43 ` Steffen Trumtrar
2013-03-27 10:49 ` Michal Simek
2013-03-27 10:45 ` Arnd Bergmann
2013-03-27 10:47 ` Michal Simek
2013-03-26 17:43 ` [PATCH v2 05/10] arm: zynq: Move slcr initialization to separate file Michal Simek
2013-03-26 21:43 ` Arnd Bergmann
2013-03-27 6:55 ` Steffen Trumtrar
2013-03-27 9:31 ` Arnd Bergmann
2013-03-27 9:41 ` Steffen Trumtrar
2013-03-27 14:15 ` Michal Simek
2013-03-27 13:01 ` Philip Balister
2013-03-27 13:31 ` Michal Simek
2013-03-26 17:43 ` Michal Simek [this message]
2013-03-26 17:43 ` [PATCH v2 07/10] arm: zynq: Add support for pmu Michal Simek
2013-03-26 17:43 ` [PATCH v2 08/10] arm: zynq: Add smp support Michal Simek
2013-03-27 8:59 ` Michal Simek
2013-03-26 17:43 ` [PATCH v2 09/10] arm: zynq: Add hotplug support Michal Simek
2013-03-26 17:43 ` [PATCH v2 10/10] arm: zynq: Add cpuidle support Michal Simek
2013-03-26 21:46 ` Arnd Bergmann
2013-03-27 7:56 ` Michal Simek
2013-03-27 9:27 ` Arnd Bergmann
2013-03-27 10:15 ` Daniel Lezcano
2013-03-27 10:07 ` Daniel Lezcano
2013-03-27 10:31 ` Michal Simek
2013-03-27 10:37 ` Daniel Lezcano
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=62a24b6d95de2f126cf7e6985acf1757cac69927.1364319776.git.michal.simek@xilinx.com \
--to=michal.simek@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.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).