* [PATCH 1/8] ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 2/8] ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization Simon Horman
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit 0ca2894b5a900709 ("ARM: shmobile: Use shared SCU SMP boot code on
r8a7779") obsoleted the r8a7779-specific SCU boot code, but forgot to
remove the setup of shmobile_boot_fn and shmobile_boot_arg, which is
overwritten by shmobile_smp_scu_prepare_cpus().
Note that shmobile_scu_base wasn't initialized at that point yet anyway.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/smp-r8a7779.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index b854fe2095ad..0b024a9dbd43 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -92,8 +92,6 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
{
/* Map the reset vector (in headsmp-scu.S, headsmp.S) */
__raw_writel(__pa(shmobile_boot_vector), AVECR);
- shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
- shmobile_boot_arg = (unsigned long)shmobile_scu_base;
/* setup r8a7779 specific SCU bits */
shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/8] ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
2016-02-12 19:06 ` [PATCH 1/8] ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 3/8] ARM: shmobile: r8a7740: Remove mapping of L2 cache controller registers Simon Horman
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Migrate the generic r8a7740 platform from calling l2x0_of_init() to the
generic l2c OF initialization.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 0c8f80c5b04d..bf221e05c8dc 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -23,7 +23,6 @@
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-#include <asm/hardware/cache-l2x0.h>
#include "common.h"
@@ -110,10 +109,6 @@ static void __init r8a7740_generic_init(void)
{
r8a7740_meram_workaround();
-#ifdef CONFIG_CACHE_L2X0
- /* Shared attribute override enable, 32K*8way */
- l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff);
-#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
@@ -123,6 +118,8 @@ static const char *const r8a7740_boards_compat_dt[] __initconst = {
};
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
.map_io = r8a7740_map_io,
.init_early = shmobile_init_delay,
.init_irq = r8a7740_init_irq_of,
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/8] ARM: shmobile: r8a7740: Remove mapping of L2 cache controller registers
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
2016-02-12 19:06 ` [PATCH 1/8] ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code Simon Horman
2016-02-12 19:06 ` [PATCH 2/8] ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 4/8] ARM: shmobile: Move shmobile_scu_base from .text to .data Simon Horman
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Now all r8a7740-based platforms have been migrated to the generic l2c OF
initialization, it's no longer needed to map the L2 cache controller
registers from .map_io().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index bf221e05c8dc..3e71cd4168dd 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -37,18 +37,6 @@ static struct map_desc r8a7740_io_desc[] __initdata = {
.length = 160 << 20,
.type = MT_DEVICE_NONSHARED
},
-#ifdef CONFIG_CACHE_L2X0
- /*
- * for l2x0_init()
- * 0xf0100000-0xf0101000 -> 0xf0002000-0xf0003000
- */
- {
- .virtual = 0xf0002000,
- .pfn = __phys_to_pfn(0xf0100000),
- .length = PAGE_SIZE,
- .type = MT_DEVICE_NONSHARED
- },
-#endif
};
static void __init r8a7740_map_io(void)
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/8] ARM: shmobile: Move shmobile_scu_base from .text to .data
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
` (2 preceding siblings ...)
2016-02-12 19:06 ` [PATCH 3/8] ARM: shmobile: r8a7740: Remove mapping of L2 cache controller registers Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 5/8] ARM: shmobile: Consolidate SCU mapping code Simon Horman
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
shmobile_scu_base is being written to, so it doesn't belong in the .text
section. Fix this by moving it from asm .text to C .data, as it's no
longer used from asm code since commit 4f6da36f7edd5790 ("ARM: shmobile:
Remove old SCU boot code").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/headsmp-scu.S | 6 ------
arch/arm/mach-shmobile/platsmp-scu.c | 3 +++
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index c0008a5aa4ca..936d7011c314 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -38,9 +38,3 @@ ENTRY(shmobile_boot_scu)
b secondary_startup
ENDPROC(shmobile_boot_scu)
-
- .text
- .align 2
- .globl shmobile_scu_base
-shmobile_scu_base:
- .space 4
diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
index 64663110ab6c..f2198c9c7435 100644
--- a/arch/arm/mach-shmobile/platsmp-scu.c
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -17,6 +17,9 @@
#include <asm/smp_scu.h>
#include "common.h"
+
+void __iomem *shmobile_scu_base;
+
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/8] ARM: shmobile: Consolidate SCU mapping code
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
` (3 preceding siblings ...)
2016-02-12 19:06 ` [PATCH 4/8] ARM: shmobile: Move shmobile_scu_base from .text to .data Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 6/8] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback Simon Horman
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Currently the SCU registers are mapped in SoC-specific code, using
different methods, all involving the static mapping set up from
machine_desc.map_io():
- On emev2, a static (non-identity) mapping is used, with ioremap().
As the static mapping uses the MT_DEVICE type, ioremap() reuses it,
and the returned virtual address is suitable for passing to
shmobile_smp_hook(),
- On sh73a0 and r8a7779, a static identity mapping is used, with the
legacy IOMEM() macro.
As the static mapping uses the MT_DEVICE_NONSHARED type, replacing
IOMEM() by ioremap() would create a new mapping, whose virtual
address cannot be passed to shmobile_smp_hook().
Move the mapping of the SCU registers from SoC-specific code to common
code, always using ioremap(). To work in the absence of a static
mapping, this requires passing the physical SCU base address to
shmobile_smp_hook().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/common.h | 5 ++---
arch/arm/mach-shmobile/platsmp-scu.c | 10 +++++++---
arch/arm/mach-shmobile/smp-emev2.c | 3 +--
arch/arm/mach-shmobile/smp-r8a7779.c | 3 +--
arch/arm/mach-shmobile/smp-sh73a0.c | 3 +--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h
index 9cb11215ceba..225c12bb3de9 100644
--- a/arch/arm/mach-shmobile/common.h
+++ b/arch/arm/mach-shmobile/common.h
@@ -12,7 +12,8 @@ extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
unsigned long arg);
extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
extern void shmobile_boot_scu(void);
-extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus);
+extern void shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
+ 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 struct platform_suspend_ops shmobile_suspend_ops;
@@ -31,8 +32,6 @@ int shmobile_cpufreq_init(void);
static inline int shmobile_cpufreq_init(void) { return 0; }
#endif
-extern void __iomem *shmobile_scu_base;
-
static inline void __init shmobile_init_late(void)
{
shmobile_suspend_init();
diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
index f2198c9c7435..4c7d2caf3730 100644
--- a/arch/arm/mach-shmobile/platsmp-scu.c
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -18,7 +18,8 @@
#include "common.h"
-void __iomem *shmobile_scu_base;
+static phys_addr_t shmobile_scu_base_phys;
+static void __iomem *shmobile_scu_base;
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
@@ -29,7 +30,7 @@ static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
case CPU_UP_PREPARE:
/* For this particular CPU register SCU SMP boot vector */
shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
- (unsigned long)shmobile_scu_base);
+ shmobile_scu_base_phys);
break;
};
@@ -40,13 +41,16 @@ static struct notifier_block shmobile_smp_scu_notifier = {
.notifier_call = shmobile_smp_scu_notifier_call,
};
-void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus)
+void __init shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
+ unsigned int max_cpus)
{
/* install boot code shared by all CPUs */
shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);
shmobile_boot_arg = MPIDR_HWID_BITMASK;
/* enable SCU and cache coherency on booting CPU */
+ shmobile_scu_base_phys = scu_base_phys;
+ shmobile_scu_base = ioremap(scu_base_phys, PAGE_SIZE);
scu_enable(shmobile_scu_base);
scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index adbac6963f2b..4dfafd845452 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -45,8 +45,7 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
}
/* setup EMEV2 specific SCU bits */
- shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
- shmobile_smp_scu_prepare_cpus(max_cpus);
+ shmobile_smp_scu_prepare_cpus(EMEV2_SCU_BASE, max_cpus);
}
const struct smp_operations emev2_smp_ops __initconst = {
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 0b024a9dbd43..f5c31fbc10b2 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -94,8 +94,7 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
__raw_writel(__pa(shmobile_boot_vector), AVECR);
/* setup r8a7779 specific SCU bits */
- shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
- shmobile_smp_scu_prepare_cpus(max_cpus);
+ shmobile_smp_scu_prepare_cpus(R8A7779_SCU_BASE, max_cpus);
r8a7779_pm_init();
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index ee1a4b70604b..41137404382e 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -52,8 +52,7 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
__raw_writel(__pa(shmobile_boot_vector), SBAR);
/* setup sh73a0 specific SCU bits */
- shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
- shmobile_smp_scu_prepare_cpus(max_cpus);
+ shmobile_smp_scu_prepare_cpus(SH73A0_SCU_BASE, max_cpus);
}
const struct smp_operations sh73a0_smp_ops __initconst = {
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/8] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
` (4 preceding siblings ...)
2016-02-12 19:06 ` [PATCH 5/8] ARM: shmobile: Consolidate SCU mapping code Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 7/8] ARM: shmobile: emev2: " Simon Horman
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit 37201ba5c99d0be8 ("ARM: shmobile: r8a7740: Migrate to generic l2c
OF initialization") removed the last user of the legacy "IOMEM()" macro
on r8a7740-based systems. Hence there's no longer a need to set up a
transparent mapping of system I/O registers. Remove the mapping and the
legacy machine_desc.map_io() callback.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 3e71cd4168dd..db6dbfbaf9f1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -26,25 +26,6 @@
#include "common.h"
-static struct map_desc r8a7740_io_desc[] __initdata = {
- /*
- * for CPGA/INTC/PFC
- * 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff
- */
- {
- .virtual = 0xe6000000,
- .pfn = __phys_to_pfn(0xe6000000),
- .length = 160 << 20,
- .type = MT_DEVICE_NONSHARED
- },
-};
-
-static void __init r8a7740_map_io(void)
-{
- debug_ll_io_init();
- iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc));
-}
-
/*
* r8a7740 chip has lasting errata on MERAM buffer.
* this is work-around for it.
@@ -108,7 +89,6 @@ static const char *const r8a7740_boards_compat_dt[] __initconst = {
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
.l2c_aux_val = 0,
.l2c_aux_mask = ~0,
- .map_io = r8a7740_map_io,
.init_early = shmobile_init_delay,
.init_irq = r8a7740_init_irq_of,
.init_machine = r8a7740_generic_init,
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/8] ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
` (5 preceding siblings ...)
2016-02-12 19:06 ` [PATCH 6/8] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 8/8] ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h Simon Horman
2016-02-17 6:54 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit FIXME ("ARM: shmobile: Consolidate SCU mapping code") removed the
last user of the static mapping on emev2-based systems. Remove the
mapping and the legacy machine_desc.map_io() callback.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-emev2.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 10b7cb5dcb3a..0829d0215c38 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -20,23 +20,6 @@
#include <asm/mach/map.h>
#include "common.h"
-static struct map_desc emev2_io_desc[] __initdata = {
-#ifdef CONFIG_SMP
- /* 2M mapping for SCU + L2 controller */
- {
- .virtual = 0xf0000000,
- .pfn = __phys_to_pfn(0x1e000000),
- .length = SZ_2M,
- .type = MT_DEVICE
- },
-#endif
-};
-
-static void __init emev2_map_io(void)
-{
- iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
-}
-
static const char *const emev2_boards_compat_dt[] __initconst = {
"renesas,emev2",
NULL,
@@ -46,7 +29,6 @@ extern const struct smp_operations emev2_smp_ops;
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops),
- .map_io = emev2_map_io,
.init_early = shmobile_init_delay,
.init_late = shmobile_init_late,
.dt_compat = emev2_boards_compat_dt,
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/8] ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
` (6 preceding siblings ...)
2016-02-12 19:06 ` [PATCH 7/8] ARM: shmobile: emev2: " Simon Horman
@ 2016-02-12 19:06 ` Simon Horman
2016-02-17 6:54 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-12 19:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
make C=1:
arch/arm/mach-shmobile/smp-emev2.c:51:29: warning: symbol 'emev2_smp_ops' was not declared. Should it be static?
To fix this, move the forward declaration of emev2_smp_ops to a header
file, and include it where appropriate.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/emev2.h | 6 ++++++
arch/arm/mach-shmobile/setup-emev2.c | 4 ++--
arch/arm/mach-shmobile/smp-emev2.c | 2 ++
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-shmobile/emev2.h
diff --git a/arch/arm/mach-shmobile/emev2.h b/arch/arm/mach-shmobile/emev2.h
new file mode 100644
index 000000000000..916d25f6780e
--- /dev/null
+++ b/arch/arm/mach-shmobile/emev2.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_EMEV2_H__
+#define __ASM_EMEV2_H__
+
+extern const struct smp_operations emev2_smp_ops;
+
+#endif /* __ASM_EMEV2_H__ */
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 0829d0215c38..3c99aaf65325 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -18,15 +18,15 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
+
#include "common.h"
+#include "emev2.h"
static const char *const emev2_boards_compat_dt[] __initconst = {
"renesas,emev2",
NULL,
};
-extern const struct smp_operations emev2_smp_ops;
-
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops),
.init_early = shmobile_init_delay,
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 4dfafd845452..3a732199cf5e 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -21,7 +21,9 @@
#include <linux/delay.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
+
#include "common.h"
+#include "emev2.h"
#define EMEV2_SCU_BASE 0x1e000000
#define EMEV2_SMU_BASE 0xe0110000
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 10+ messages in thread* [GIT PULL] Renesas ARM Based SoC Updates for v4.6
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
` (7 preceding siblings ...)
2016-02-12 19:06 ` [PATCH 8/8] ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h Simon Horman
@ 2016-02-17 6:54 ` Simon Horman
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2016-02-17 6:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Feb 12, 2016 at 08:06:22PM +0100, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC updates for v4.6.
>
> This pull request is based on "Renesas ARM Based SoC Cleanup for v4.6",
> tagged as cleanup-for-v4.6, which you have already pulled.
I would like to withdraw this pull request.
I noticed that there is an error in the base I chose for the pull
request which has resulted in the inclusion of a patch
"ARM: shmobile: Consolidate SCU mapping code", which is already present
in your tree due to another pull request of mine which you have accepted.
I will respin this pull request accordingly.
> The following changes since commit e24f317c859f2d904d1eb87cbb503c309e6dead7:
>
> ARM: shmobile: Typo s/MIPDR/MPIDR/ (2016-02-04 15:09:30 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v4.6
>
> for you to fetch changes up to 9c9c1320111449c770a51488ca74a5902835e227:
>
> ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h (2016-02-09 21:16:16 +0100)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Updates for v4.6
>
> * Move emev2_smp_ops to emev2
> * Remove legacy map_io callbacks on r8a7740 and emev2 SoCs
> * Clean up SCU mapping code
> * Migrate to generic l2c OF initialization on r8a7740
>
> ----------------------------------------------------------------
> Geert Uytterhoeven (8):
> ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code
> ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization
> ARM: shmobile: r8a7740: Remove mapping of L2 cache controller registers
> ARM: shmobile: Move shmobile_scu_base from .text to .data
> ARM: shmobile: Consolidate SCU mapping code
> ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback
> ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback
> ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h
>
> arch/arm/mach-shmobile/common.h | 5 ++---
> arch/arm/mach-shmobile/emev2.h | 6 ++++++
> arch/arm/mach-shmobile/headsmp-scu.S | 6 ------
> arch/arm/mach-shmobile/platsmp-scu.c | 11 ++++++++--
> arch/arm/mach-shmobile/setup-emev2.c | 22 ++-----------------
> arch/arm/mach-shmobile/setup-r8a7740.c | 39 ++--------------------------------
> arch/arm/mach-shmobile/smp-emev2.c | 5 +++--
> arch/arm/mach-shmobile/smp-r8a7779.c | 5 +----
> arch/arm/mach-shmobile/smp-sh73a0.c | 3 +--
> 9 files changed, 26 insertions(+), 76 deletions(-)
> create mode 100644 arch/arm/mach-shmobile/emev2.h
>
^ permalink raw reply [flat|nested] 10+ messages in thread