Merge tag 'vexpress-fixes-5.5' of... (df4a6ff1) · Commits · 戴 / test

arch/arm/mach-vexpress/spc.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -551,8 +551,9 @@ static struct clk ve_spc_clk_register(struct device cpu_dev)

		static int __init ve_spc_clk_init(void)
		{
		int cpu;
		int cpu, cluster;
		struct clk *clk;
		bool init_opp_table[MAX_CLUSTERS] = { false };

		if (!info)
		return 0; /* Continue only if SPC is initialised */
		@@ -578,8 +579,17 @@ static int __init ve_spc_clk_init(void)
		continue;
		}

		cluster = topology_physical_package_id(cpu_dev->id);
		if (init_opp_table[cluster])
		continue;

		if (ve_init_opp_table(cpu_dev))
		pr_warn("failed to initialise cpu%d opp table\n", cpu);
		else if (dev_pm_opp_set_sharing_cpus(cpu_dev,
		topology_core_cpumask(cpu_dev->id)))
		pr_warn("failed to mark OPPs shared for cpu%d\n", cpu);
		else
		init_opp_table[cluster] = true;
		}

		platform_device_register_simple("vexpress-spc-cpufreq", -1, NULL, 0);

+1 −1

Original line number	Diff line number	Diff line
		@@ -434,7 +434,7 @@ static int ve_spc_cpufreq_init(struct cpufreq_policy *policy)
		if (cur_cluster < MAX_CLUSTERS) {
		int cpu;

		cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu));
		dev_pm_opp_get_sharing_cpus(cpu_dev, policy->cpus);

		for_each_cpu(cpu, policy->cpus)
		per_cpu(physical_cluster, cpu) = cur_cluster;