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

Commit 0a1d6434 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc2-for-v3.19' of... 

Merge tag 'renesas-soc2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Second Round of Renesas ARM Based SoC Soc Updates for v3.19" from Simon Horman:

* Enable PCI domains for R-Car Gen2 devices
* Make APMU resource code SoC-specific

* tag 'renesas-soc2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Enable PCI domains for R-Car Gen2 devices
  ARM: shmobile: r8a7791: Correct number of CPU cores
  ARM: shmobile: Separate APMU resource data into CPU dependant part

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c39bacad 950a3f0e

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config ARCH_RCAR_GEN2 
	select PM_RCAR if PM || SMP

	select RENESAS_IRQC

	select SYS_SUPPORTS_SH_CMT

	select PCI_DOMAINS if PCI



config ARCH_RMOBILE

	bool

arch/arm/mach-shmobile/common.h

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ extern void shmobile_boot_scu(void); 
extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus);

extern void shmobile_smp_scu_cpu_die(unsigned int cpu);

extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);

extern void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus);

extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,

					    struct task_struct *idle);

extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);

extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);

struct clk;

extern int shmobile_clk_init(void);

extern void shmobile_handle_irq_intc(struct pt_regs *);

arch/arm/mach-shmobile/platsmp-apmu.c

+9 −18
Original line number Diff line number Diff line 
/*

 * SMP support for SoCs with APMU

 *

 * Copyright (C) 2014  Renesas Electronics Corporation

 * Copyright (C) 2013  Magnus Damm

 *

 * This program is free software; you can redistribute it and/or modify
@@ -22,6 +23,7 @@ 
#include <asm/smp_plat.h>

#include <asm/suspend.h>

#include "common.h"

#include "platsmp-apmu.h"



static struct {

	void __iomem *iomem;
@@ -83,28 +85,15 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit) 
	pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);

}



static struct {

	struct resource iomem;

	int cpus[4];

} apmu_config[] = {

	{

		.iomem = DEFINE_RES_MEM(0xe6152000, 0x88),

		.cpus = { 0, 1, 2, 3 },

	},

	{

		.iomem = DEFINE_RES_MEM(0xe6151000, 0x88),

		.cpus = { 0x100, 0x101, 0x102, 0x103 },

	}

};



static void apmu_parse_cfg(void (*fn)(struct resource *res, int cpu, int bit))

static void apmu_parse_cfg(void (*fn)(struct resource *res, int cpu, int bit),

			   struct rcar_apmu_config *apmu_config, int num)

{

	u32 id;

	int k;

	int bit, index;

	bool is_allowed;



	for (k = 0; k < ARRAY_SIZE(apmu_config); k++) {

	for (k = 0; k < num; k++) {

		/* only enable the cluster that includes the boot CPU */

		is_allowed = false;

		for (bit = 0; bit < ARRAY_SIZE(apmu_config[k].cpus); bit++) {
@@ -128,14 +117,16 @@ static void apmu_parse_cfg(void (*fn)(struct resource *res, int cpu, int bit)) 
	}

}



void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus)

void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus,

					   struct rcar_apmu_config *apmu_config,

					   int num)

{

	/* install boot code shared by all CPUs */

	shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);

	shmobile_boot_arg = MPIDR_HWID_BITMASK;



	/* perform per-cpu setup */

	apmu_parse_cfg(apmu_init_cpu);

	apmu_parse_cfg(apmu_init_cpu, apmu_config, num);

}



#ifdef CONFIG_SMP

arch/arm/mach-shmobile/platsmp-apmu.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * rmobile apmu definition

 *

 * Copyright (C) 2014  Renesas Electronics Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef PLATSMP_APMU_H

#define PLATSMP_APMU_H



struct rcar_apmu_config {

	struct resource iomem;

	int cpus[4];

};



extern void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus,

					   struct rcar_apmu_config *apmu_config,

					   int num);

extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,

					    struct task_struct *idle);

extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);

extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);



#endif /* PLATSMP_APMU_H */

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

+15 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/smp_plat.h>



#include "common.h"

#include "platsmp-apmu.h"

#include "pm-rcar.h"

#include "r8a7790.h"
@@ -34,10 +35,23 @@ static struct rcar_sysc_ch r8a7790_ca7_scu = { 
	.isr_bit = 21, /* CA7-SCU */

};



static struct rcar_apmu_config r8a7790_apmu_config[] = {

	{

		.iomem = DEFINE_RES_MEM(0xe6152000, 0x88),

		.cpus = { 0, 1, 2, 3 },

	},

	{

		.iomem = DEFINE_RES_MEM(0xe6151000, 0x88),

		.cpus = { 0x100, 0x0101, 0x102, 0x103 },

	}

};



static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)

{

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

	shmobile_smp_apmu_prepare_cpus(max_cpus);

	shmobile_smp_apmu_prepare_cpus(max_cpus,

				       r8a7790_apmu_config,

				       ARRAY_SIZE(r8a7790_apmu_config));



	/* turn on power to SCU */

	r8a7790_pm_init();