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

Commit 2eb2a436 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: SH7786 SMP support. 



SH7786 is roughly identical to SH-X3 proto SMP, though there are only 2
CPUs. This just wraps in to the existing SH-X3 SMP code with some minor
changes for SH7786, including wiring up the IPIs properly, enabling
IRQ_PER_CPU, and so forth.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b29fa1fb

arch/sh/Kconfig

+6 −1
Original line number Original line Diff line number Diff line
@@ -71,6 +71,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ 
config GENERIC_IRQ_PROBE

config GENERIC_IRQ_PROBE

	def_bool y

	def_bool y





config IRQ_PER_CPU

	def_bool y



config GENERIC_GPIO

config GENERIC_GPIO

	def_bool n

	def_bool n
@@ -414,6 +417,8 @@ config CPU_SUBTYPE_SH7786 
	select CPU_HAS_PTEAEX

	select CPU_HAS_PTEAEX

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP





config CPU_SUBTYPE_SHX3

config CPU_SUBTYPE_SHX3

	bool "Support SH-X3 processor"

	bool "Support SH-X3 processor"
@@ -651,7 +656,7 @@ config NR_CPUS 
	int "Maximum number of CPUs (2-32)"

	int "Maximum number of CPUs (2-32)"

	range 2 32

	range 2 32

	depends on SMP

	depends on SMP

	default "4" if CPU_SHX3

	default "4" if CPU_SUBTYPE_SHX3

	default "2"

	default "2"

	help

	help

	  This allows you to specify the maximum number of CPUs which this

	  This allows you to specify the maximum number of CPUs which this

arch/sh/kernel/cpu/sh4a/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7366) += setup-sh7366.o 
obj-$(CONFIG_CPU_SUBTYPE_SHX3)		+= setup-shx3.o

obj-$(CONFIG_CPU_SUBTYPE_SHX3)		+= setup-shx3.o





# SMP setup

# SMP setup

smp-$(CONFIG_CPU_SUBTYPE_SHX3)		:= smp-shx3.o

smp-$(CONFIG_CPU_SHX3)			:= smp-shx3.o





# Primary on-chip clocks (common)

# Primary on-chip clocks (common)

clock-$(CONFIG_CPU_SUBTYPE_SH7763)	:= clock-sh7763.o

clock-$(CONFIG_CPU_SUBTYPE_SH7763)	:= clock-sh7763.o

arch/sh/kernel/cpu/sh4a/setup-sh7786.c

+9 −20
Original line number Original line Diff line number Diff line
@@ -595,9 +595,8 @@ enum { 
	HSPI,

	HSPI,

	GPIO0, GPIO1,

	GPIO0, GPIO1,

	Thermal,

	Thermal,

	INTC0, INTC1, INTC2, INTC3, INTC4, INTC5, INTC6, INTC7,

	INTICI0, INTICI1, INTICI2, INTICI3,



	INTICI4, INTICI5, INTICI6, INTICI7,

	/* interrupt groups */

};

};





static struct intc_vect vectors[] __initdata = {

static struct intc_vect vectors[] __initdata = {
@@ -638,10 +637,12 @@ static struct intc_vect vectors[] __initdata = { 
	INTC_VECT(HSPI, 0xe80),

	INTC_VECT(HSPI, 0xe80),

	INTC_VECT(GPIO0, 0xea0), INTC_VECT(GPIO1, 0xec0),

	INTC_VECT(GPIO0, 0xea0), INTC_VECT(GPIO1, 0xec0),

	INTC_VECT(Thermal, 0xee0),

	INTC_VECT(Thermal, 0xee0),

	INTC_VECT(INTICI0, 0xf00), INTC_VECT(INTICI1, 0xf20),

	INTC_VECT(INTICI2, 0xf40), INTC_VECT(INTICI3, 0xf60),

	INTC_VECT(INTICI4, 0xf80), INTC_VECT(INTICI5, 0xfa0),

	INTC_VECT(INTICI6, 0xfc0), INTC_VECT(INTICI7, 0xfe0),

};

};





/* FIXME: Main CPU support only now */

#if 1 /* Main CPU */

#define CnINTMSK0	0xfe410030

#define CnINTMSK0	0xfe410030

#define CnINTMSK1	0xfe410040

#define CnINTMSK1	0xfe410040

#define CnINTMSKCLR0	0xfe410050

#define CnINTMSKCLR0	0xfe410050
@@ -654,21 +655,6 @@ static struct intc_vect vectors[] __initdata = { 
#define CnINT2MSKCR1	0xfe410a34

#define CnINT2MSKCR1	0xfe410a34

#define CnINT2MSKCR2	0xfe410a38

#define CnINT2MSKCR2	0xfe410a38

#define CnINT2MSKCR3	0xfe410a3c

#define CnINT2MSKCR3	0xfe410a3c

#else /* Sub CPU */

#define CnINTMSK0	0xfe410034

#define CnINTMSK1	0xfe410044

#define CnINTMSKCLR0	0xfe410054

#define CnINTMSKCLR1	0xfe410064

#define CnINT2MSKR0	0xfe410b20

#define CnINT2MSKR1	0xfe410b24

#define CnINT2MSKR2	0xfe410b28

#define CnINT2MSKR3	0xfe410b2c

#define CnINT2MSKCR0	0xfe410b30

#define CnINT2MSKCR1	0xfe410b34

#define CnINT2MSKCR2	0xfe410b38

#define CnINT2MSKCR3	0xfe410b3c

#endif



#define INTMSK2		0xfe410068

#define INTMSK2		0xfe410068

#define INTMSKCLR2	0xfe41006c

#define INTMSKCLR2	0xfe41006c
@@ -753,6 +739,9 @@ static struct intc_prio_reg prio_registers[] __initdata = { 
						  GPIO1, Thermal } },

						  GPIO1, Thermal } },

	{ 0xfe41085c, 0, 32, 8, /* INT2PRI23 */ { 0, 0, 0, 0 } },

	{ 0xfe41085c, 0, 32, 8, /* INT2PRI23 */ { 0, 0, 0, 0 } },

	{ 0xfe410860, 0, 32, 8, /* INT2PRI24 */ { 0, 0, 0, 0 } },

	{ 0xfe410860, 0, 32, 8, /* INT2PRI24 */ { 0, 0, 0, 0 } },

	{ 0xfe410090, 0xfe4100a0, 32, 4, /* CnICIPRI / CnICIPRICLR */

	  { INTICI7, INTICI6, INTICI5, INTICI4,

	    INTICI3, INTICI2, INTICI1, INTICI0 }, INTC_SMP(4, 2) },

};

};





static DECLARE_INTC_DESC(intc_desc, "sh7786", vectors, NULL,

static DECLARE_INTC_DESC(intc_desc, "sh7786", vectors, NULL,