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

Commit 36a90c05 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: apmu: Remove obsolete shmobile_smp_apmu_prepare_cpus() 



After the removal of the legacy SMP fallbacks, there are no more users
left of shmobile_smp_apmu_prepare_cpus().

Remove it, together with the legacy SMP config parser.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent fa6e9cb2

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

+0 −40
Original line number Diff line number Diff line
@@ -106,38 +106,6 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit) 
	writel(x, apmu_cpus[cpu].iomem + DBGRCR_OFFS);

}



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

			   struct rcar_apmu_config *apmu_config, int num)

{

	int id;

	int k;

	int bit, index;

	bool is_allowed;



	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++) {

			id = apmu_config[k].cpus[bit];

			if (id >= 0) {

				if (id == cpu_logical_map(0))

					is_allowed = true;

			}

		}

		if (!is_allowed)

			continue;



		for (bit = 0; bit < ARRAY_SIZE(apmu_config[k].cpus); bit++) {

			id = apmu_config[k].cpus[bit];

			if (id >= 0) {

				index = get_logical_index(id);

				if (index >= 0)

					fn(&apmu_config[k].iomem, index, bit);

			}

		}

	}

}



static const struct of_device_id apmu_ids[] = {

	{ .compatible = "renesas,apmu" },

	{ /*sentinel*/ }
@@ -194,14 +162,6 @@ static void __init shmobile_smp_apmu_setup_boot(void) 
	shmobile_boot_fn_gen2 = shmobile_boot_fn;

}



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);

}



int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	/* For this particular CPU register boot vector */

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

+0 −8
Original line number Diff line number Diff line
@@ -16,14 +16,6 @@ 
#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);