| Message ID | 20150521012200.25972.64826.sendpatchset@little-apple (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Simon Horman |
| Headers | show |
On Thu, May 21, 2015 at 3:22 AM, Magnus Damm <magnus.damm@gmail.com> wrote: > --- 0001/arch/arm/mach-shmobile/platsmp-apmu.c > +++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2015-05-20 22:26:43.152366518 +0900 > +static void apmu_parse_dt(void (*fn)(struct resource *res, int cpu, int bit)) > +{ > + struct device_node *np_apmu, *np_cpu; > + struct resource res; > + u32 id; > + int bit, index; > + bool is_allowed; > + > + for_each_matching_node(np_apmu, apmu_ids) { > + /* only enable the cluster that includes the boot CPU */ > + is_allowed = false; You can declare the variable here instead of at the top of the function. > + for (bit = 0; bit < CONFIG_NR_CPUS; bit++) { > + np_cpu = of_parse_phandle(np_apmu, "cpus", bit); > + if (np_cpu) { > + if (!of_property_read_u32(np_cpu, "reg", &id)) { > + if (id == cpu_logical_map(0)) > + is_allowed = true; You can do "of_node_put(np_cpu); break;" here, to stop scanning. > + } > + of_node_put(np_cpu); > + } > + } > + if (!is_allowed) > + continue; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Geert, On Thu, May 21, 2015 at 5:13 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, May 21, 2015 at 3:22 AM, Magnus Damm <magnus.damm@gmail.com> wrote: >> --- 0001/arch/arm/mach-shmobile/platsmp-apmu.c >> +++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2015-05-20 22:26:43.152366518 +0900 > >> +static void apmu_parse_dt(void (*fn)(struct resource *res, int cpu, int bit)) >> +{ >> + struct device_node *np_apmu, *np_cpu; >> + struct resource res; >> + u32 id; >> + int bit, index; >> + bool is_allowed; >> + >> + for_each_matching_node(np_apmu, apmu_ids) { >> + /* only enable the cluster that includes the boot CPU */ >> + is_allowed = false; > > You can declare the variable here instead of at the top of the function. Sure, good idea. >> + for (bit = 0; bit < CONFIG_NR_CPUS; bit++) { >> + np_cpu = of_parse_phandle(np_apmu, "cpus", bit); >> + if (np_cpu) { >> + if (!of_property_read_u32(np_cpu, "reg", &id)) { >> + if (id == cpu_logical_map(0)) >> + is_allowed = true; > > You can do "of_node_put(np_cpu); break;" here, to stop scanning. Yes, that's correct. I did not manage to get this update into the V2 series but will do later on in V3. Thanks! / magnus -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0001/arch/arm/mach-shmobile/platsmp-apmu.c +++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2015-05-20 22:26:43.152366518 +0900 @@ -24,6 +24,7 @@ #include <asm/suspend.h> #include "common.h" #include "platsmp-apmu.h" +#include "rcar-gen2.h" static struct { void __iomem *iomem; @@ -117,15 +118,64 @@ static void apmu_parse_cfg(void (*fn)(st } } -void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus, - struct rcar_apmu_config *apmu_config, - int num) +static const struct of_device_id apmu_ids[] = { + { .compatible = "renesas,apmu" }, + { /*sentinel*/ } +}; + +static void apmu_parse_dt(void (*fn)(struct resource *res, int cpu, int bit)) +{ + struct device_node *np_apmu, *np_cpu; + struct resource res; + u32 id; + int bit, index; + bool is_allowed; + + for_each_matching_node(np_apmu, apmu_ids) { + /* only enable the cluster that includes the boot CPU */ + is_allowed = false; + for (bit = 0; bit < CONFIG_NR_CPUS; bit++) { + np_cpu = of_parse_phandle(np_apmu, "cpus", bit); + if (np_cpu) { + if (!of_property_read_u32(np_cpu, "reg", &id)) { + if (id == cpu_logical_map(0)) + is_allowed = true; + } + of_node_put(np_cpu); + } + } + if (!is_allowed) + continue; + + for (bit = 0; bit < CONFIG_NR_CPUS; bit++) { + np_cpu = of_parse_phandle(np_apmu, "cpus", bit); + if (np_cpu) { + if (!of_property_read_u32(np_cpu, "reg", &id)) { + index = get_logical_index(id); + if ((index >= 0) && + !of_address_to_resource(np_apmu, + 0, &res)) + fn(&res, index, bit); + } + of_node_put(np_cpu); + } + } + of_node_put(np_apmu); + } +} + +static void __init shmobile_smp_apmu_setup_boot(void) { /* 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 */ +void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus, + struct rcar_apmu_config *apmu_config, + int num) +{ + shmobile_smp_apmu_setup_boot(); apmu_parse_cfg(apmu_init_cpu, apmu_config, num); } @@ -236,3 +286,34 @@ void __init shmobile_smp_apmu_suspend_in shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend; } #endif + +static void __init shmobile_smp_apmu_prepare_cpus_dt(unsigned int max_cpus) +{ + shmobile_smp_apmu_setup_boot(); + apmu_parse_dt(apmu_init_cpu); + rcar_gen2_pm_init(); +} + +static int shmobile_smp_apmu_boot_secondary_md21(unsigned int cpu, + struct task_struct *idle) +{ + /* Error out when hardware debug mode is enabled */ + if (rcar_gen2_read_mode_pins() & BIT(21)) { + pr_warn("Unable to boot CPU%u when MD21 is set\n", cpu); + return -ENOTSUPP; + } + + return shmobile_smp_apmu_boot_secondary(cpu, idle); +} + +static struct smp_operations apmu_smp_ops __initdata = { + .smp_prepare_cpus = shmobile_smp_apmu_prepare_cpus_dt, + .smp_boot_secondary = shmobile_smp_apmu_boot_secondary_md21, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_disable = shmobile_smp_cpu_disable, + .cpu_die = shmobile_smp_apmu_cpu_die, + .cpu_kill = shmobile_smp_apmu_cpu_kill, +#endif +}; + +CPU_METHOD_OF_DECLARE(shmobile_smp_apmu, "renesas,apmu", &apmu_smp_ops);