From patchwork Mon Mar 25 13:53:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 2331501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 55902DF24C for ; Mon, 25 Mar 2013 14:00:58 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UK7uC-0004yD-2E; Mon, 25 Mar 2013 13:57:44 +0000 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UK7qL-0003B0-PU for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2013 13:53:47 +0000 Received: by mail-wi0-f169.google.com with SMTP id c10so2117796wiw.0 for ; Mon, 25 Mar 2013 06:53:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=Xr9V1hj5rIwmuh+QKAX+ztLZhBLYvMU76l4dTz2Umac=; b=M2iQRR4mtc2O9RCgbt8nv/DXTOyDyfKuzFLqf1up6hOQ58SUAKQsTzFZ4dqyLoj3Z/ mQrH4L7pacslvBFFv/qOyHnsyVyOqC7o7Z7nHy9/SORjGCFVLf9gFCr7bd/clMOXXtVx cgm++9pDDDzp3/wRXoLH/HTJ0Bf11EMTJIDaytf6VNM4aBCnH4B5GQrGsFgBjcyVa6kU jiBFPMN9BXpUDxThNw+Fc/6yuvC6FP2qaxNf15lcAZEkXMU4M99K6wOUPY+AEC2Ctjzz gU8DBNswJjsyB3EXSU0A6QTCW3RiHrlmDOfh5mCwnslVPFTO+XMv8MJn5TDbR5w/1M7o amaw== X-Received: by 10.194.60.195 with SMTP id j3mr18125859wjr.33.1364219621713; Mon, 25 Mar 2013 06:53:41 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPS id er1sm19883661wib.5.2013.03.25.06.53.40 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 06:53:40 -0700 (PDT) From: Michal Simek To: linux-arm-kernel@lists.infradead.org, monstr@monstr.eu, Josh Cartwright , Steffen Trumtrar Subject: [PATCH 06/10] arm: zynq: Add support for system reset Date: Mon, 25 Mar 2013 14:53:12 +0100 Message-Id: <1364219596-4954-6-git-send-email-michal.simek@xilinx.com> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1364219596-4954-1-git-send-email-michal.simek@xilinx.com> References: <1364219596-4954-1-git-send-email-michal.simek@xilinx.com> X-Gm-Message-State: ALoCoQkisfnFlEDNj7/r7j+gCcS/DYYCaAaCM+LxroanfkM/VABzFd4lYQ6r//RJOFreeKoOx20b X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130325_095345_967538_02F3A5D8 X-CRM114-Status: GOOD ( 12.56 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Do system reset via slcr registers. Signed-off-by: Michal Simek --- arch/arm/mach-zynq/common.c | 6 ++++++ arch/arm/mach-zynq/common.h | 1 + arch/arm/mach-zynq/slcr.c | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 2734bd6..292f775 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -91,6 +91,11 @@ static void __init xilinx_map_io(void) scu_init(); } +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", @@ -103,4 +108,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..36b79d8 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -32,9 +32,35 @@ #define SLCR_UNLOCK_MAGIC 0xDF0D #define SLCR_UNLOCK 0x8 /* SCLR unlock register */ +#define SLCR_PSS_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? + */ + __raw_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_PSS_RST_CTRL_OFFSET); +} + +/** * xslcr_init() * Returns 0 on success, negative errno otherwise. *