Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e26118d authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c 



Move r8a7791 specific reset vector setup code from the
SMP glue code to PM code. This makes the code one step
closer to allow PM operations such as Suspend-to-RAM
in the case when SMP is disabled in the kernel config.

Signed-off-by: default avatarMagnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: updated for recent header file changes]
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 06f2c5dc

arch/arm/mach-shmobile/pm-r8a7791.c

+25 −2
Original line number Diff line number Diff line
@@ -11,12 +11,17 @@ 
 */



#include <linux/kernel.h>



#include <linux/smp.h>

#include <asm/io.h>



#include "common.h"

#include "pm-rcar.h"

#include "r8a7791.h"



#define RST		0xe6160000

#define CA15BAR		0x0020

#define CA15RESCNT	0x0040

#define RAM		0xe6300000



/* SYSC */

#define SYSCIER 0x0c

#define SYSCIMR 0x10
@@ -40,10 +45,28 @@ static inline void r8a7791_sysc_init(void) {} 


void __init r8a7791_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 + CA15BAR);

	writel_relaxed(bar | 0x10, p + CA15BAR);



	/* enable clocks to all CPUs */

	writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000,

		       p + CA15RESCNT);

	iounmap(p);



	r8a7791_sysc_init();

}

arch/arm/mach-shmobile/smp-r8a7791.c

+0 −24
Original line number Diff line number Diff line
@@ -24,35 +24,11 @@ 
#include "r8a7791.h"

#include "rcar-gen2.h"



#define RST		0xe6160000

#define CA15BAR		0x0020

#define CA15RESCNT	0x0040

#define RAM		0xe6300000



static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus)

{

	void __iomem *p;

	u32 bar;



	/* let APMU code install data related to shmobile_boot_vector */

	shmobile_smp_apmu_prepare_cpus(max_cpus);



	/* 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 + CA15BAR);

	writel_relaxed(bar | 0x10, p + CA15BAR);



	/* enable clocks to all CPUs */

	writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000,

		       p + CA15RESCNT);

	iounmap(p);



	r8a7791_pm_init();

	shmobile_smp_apmu_suspend_init();

}