From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gaku Inami Date: Tue, 03 Mar 2015 01:20:54 +0000 Subject: [PATCH 2/5] ARM: shmobile: Add r8a7794 reset code for SMP Message-Id: <54F50C76.2060803@bp.renesas.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org Since reset vector settings is controlled by SYSC register, this code is added to pm-r8a7794.c. Signed-off-by: Gaku Inami --- arch/arm/mach-shmobile/pm-r8a7794.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/mach-shmobile/pm-r8a7794.c b/arch/arm/mach-shmobile/pm-r8a7794.c index a8a94cf..b990839 100644 --- a/arch/arm/mach-shmobile/pm-r8a7794.c +++ b/arch/arm/mach-shmobile/pm-r8a7794.c @@ -9,9 +9,17 @@ */ #include +#include "common.h" #include "pm-rcar.h" #include "r8a7794.h" +/* RST */ +#define RST 0xe6160000 +#define CA7BAR 0x0030 +#define CA7RESCNT 0x0044 + +#define RAM 0xe63c0000 + /* SYSC */ #define SYSCIER 0x0c #define SYSCIMR 0x10 @@ -35,10 +43,28 @@ static inline void r8a7794_sysc_init(void) {} void __init r8a7794_pm_init(void) { + void __iomem *p; + u32 bar; static int once; if (once++) return; + /* RAM for jump stub, because BAR requires 256KB aligned address */ + p = ioremap_nocache(RAM, shmobile_boot_size); + memcpy_toio(p, shmobile_boot_vector, shmobile_boot_size); + iounmap(p); + + /* setup reset vectors */ + p = ioremap_nocache(RST, 0x63); + bar = (RAM >> 8) & 0xfffffc00; + writel_relaxed(bar, p + CA7BAR); + writel_relaxed(bar | 0x10, p + CA7BAR); + + /* de-assert reset for all CPUs */ + writel_relaxed((readl_relaxed(p + CA7RESCNT) & ~0x0f) | 0x5a5a0000, + p + CA7RESCNT); + iounmap(p); + r8a7794_sysc_init(); } -- 1.7.9.5