Commit 60af981c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (22 commits)
  cpufreq: stats: Handle the case when trans_table goes beyond PAGE_SIZE
  cpufreq: arm_big_little: make cpufreq_arm_bL_ops structures const
  cpufreq: arm_big_little: make function arguments and structure pointer const
  cpufreq: pxa: convert to clock API
  cpufreq: speedstep-lib: mark expected switch fall-through
  cpufreq: ti-cpufreq: add missing of_node_put()
  cpufreq: dt: Remove support for Exynos4212 SoCs
  cpufreq: imx6q: Move speed grading check to cpufreq driver
  cpufreq: ti-cpufreq: kfree opp_data when failure
  cpufreq: SPEAr: pr_err() strings should end with newlines
  cpufreq: powernow-k8: pr_err() strings should end with newlines
  cpufreq: dt-platdev: drop socionext,uniphier-ld6b from whitelist
  arm64: wire cpu-invariant accounting support up to the task scheduler
  arm64: wire frequency-invariant accounting support up to the task scheduler
  arm: wire cpu-invariant accounting support up to the task scheduler
  arm: wire frequency-invariant accounting support up to the task scheduler
  drivers base/arch_topology: allow inlining cpu-invariant accounting support
  drivers base/arch_topology: provide frequency-invariant accounting support
  cpufreq: dt: invoke frequency-invariance setter function
  cpufreq: arm_big_little: invoke frequency-invariance setter function
  ...
parents 622ade3a f7bc9b20

Documentation/cpu-freq/cpufreq-stats.txt

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ Freq_i to Freq_j. Freq_i is in descending order with increasing rows and 
Freq_j is in descending order with increasing columns. The output here also 

contains the actual freq values for each row and column for better readability.



If the transition table is bigger than PAGE_SIZE, reading this will

return an -EFBIG error.



--------------------------------------------------------------------------------

<mysystem>:/sys/devices/system/cpu/cpu0/cpufreq/stats # cat trans_table

   From  :    To

arch/arm/include/asm/topology.h

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ void init_cpu_topology(void); 
void store_cpu_topology(unsigned int cpuid);

const struct cpumask *cpu_coregroup_mask(int cpu);



#include <linux/arch_topology.h>



/* Replace task scheduler's default frequency-invariant accounting */

#define arch_scale_freq_capacity topology_get_freq_scale



/* Replace task scheduler's default cpu-invariant accounting */

#define arch_scale_cpu_capacity topology_get_cpu_scale



#else



static inline void init_cpu_topology(void) { }

arch/arm/mach-imx/mach-imx6q.c

+2 −86
Original line number Diff line number Diff line
@@ -286,88 +286,6 @@ static void __init imx6q_init_machine(void) 
	imx6q_axi_init();

}



#define OCOTP_CFG3			0x440

#define OCOTP_CFG3_SPEED_SHIFT		16

#define OCOTP_CFG3_SPEED_1P2GHZ		0x3

#define OCOTP_CFG3_SPEED_996MHZ		0x2

#define OCOTP_CFG3_SPEED_852MHZ		0x1



static void __init imx6q_opp_check_speed_grading(struct device *cpu_dev)

{

	struct device_node *np;

	void __iomem *base;

	u32 val;



	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ocotp");

	if (!np) {

		pr_warn("failed to find ocotp node\n");

		return;

	}



	base = of_iomap(np, 0);

	if (!base) {

		pr_warn("failed to map ocotp\n");

		goto put_node;

	}



	/*

	 * SPEED_GRADING[1:0] defines the max speed of ARM:

	 * 2b'11: 1200000000Hz;

	 * 2b'10: 996000000Hz;

	 * 2b'01: 852000000Hz; -- i.MX6Q Only, exclusive with 996MHz.

	 * 2b'00: 792000000Hz;

	 * We need to set the max speed of ARM according to fuse map.

	 */

	val = readl_relaxed(base + OCOTP_CFG3);

	val >>= OCOTP_CFG3_SPEED_SHIFT;

	val &= 0x3;



	if ((val != OCOTP_CFG3_SPEED_1P2GHZ) && cpu_is_imx6q())

		if (dev_pm_opp_disable(cpu_dev, 1200000000))

			pr_warn("failed to disable 1.2 GHz OPP\n");

	if (val < OCOTP_CFG3_SPEED_996MHZ)

		if (dev_pm_opp_disable(cpu_dev, 996000000))

			pr_warn("failed to disable 996 MHz OPP\n");

	if (cpu_is_imx6q()) {

		if (val != OCOTP_CFG3_SPEED_852MHZ)

			if (dev_pm_opp_disable(cpu_dev, 852000000))

				pr_warn("failed to disable 852 MHz OPP\n");

	}

	iounmap(base);

put_node:

	of_node_put(np);

}



static void __init imx6q_opp_init(void)

{

	struct device_node *np;

	struct device *cpu_dev = get_cpu_device(0);



	if (!cpu_dev) {

		pr_warn("failed to get cpu0 device\n");

		return;

	}

	np = of_node_get(cpu_dev->of_node);

	if (!np) {

		pr_warn("failed to find cpu0 node\n");

		return;

	}



	if (dev_pm_opp_of_add_table(cpu_dev)) {

		pr_warn("failed to init OPP table\n");

		goto put_node;

	}



	imx6q_opp_check_speed_grading(cpu_dev);



put_node:

	of_node_put(np);

}



static struct platform_device imx6q_cpufreq_pdev = {

	.name = "imx6q-cpufreq",

};



static void __init imx6q_init_late(void)

{

	/*
@@ -377,10 +295,8 @@ static void __init imx6q_init_late(void) 
	if (imx_get_soc_revision() > IMX_CHIP_REVISION_1_1)

		imx6q_cpuidle_init();



	if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) {

		imx6q_opp_init();

		platform_device_register(&imx6q_cpufreq_pdev);

	}

	if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ))

		platform_device_register_simple("imx6q-cpufreq", -1, NULL, 0);

}



static void __init imx6q_map_io(void)

arch/arm64/include/asm/topology.h

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ int pcibus_to_node(struct pci_bus *bus); 


#endif /* CONFIG_NUMA */



#include <linux/arch_topology.h>



/* Replace task scheduler's default frequency-invariant accounting */

#define arch_scale_freq_capacity topology_get_freq_scale



/* Replace task scheduler's default cpu-invariant accounting */

#define arch_scale_cpu_capacity topology_get_cpu_scale



#include <asm-generic/topology.h>



#endif /* _ASM_ARM_TOPOLOGY_H */

drivers/base/arch_topology.c

+23 −6
Original line number Diff line number Diff line
@@ -22,14 +22,23 @@ 
#include <linux/string.h>

#include <linux/sched/topology.h>



static DEFINE_MUTEX(cpu_scale_mutex);

static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;

DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;



unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu)

void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

			 unsigned long max_freq)

{

	return per_cpu(cpu_scale, cpu);

	unsigned long scale;

	int i;



	scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq;



	for_each_cpu(i, cpus)

		per_cpu(freq_scale, i) = scale;

}



static DEFINE_MUTEX(cpu_scale_mutex);

DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;



void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity)

{

	per_cpu(cpu_scale, cpu) = capacity;
@@ -212,6 +221,8 @@ static struct notifier_block init_cpu_capacity_notifier __initdata = { 


static int __init register_cpufreq_notifier(void)

{

	int ret;



	/*

	 * on ACPI-based systems we need to use the default cpu capacity

	 * until we have the necessary code to parse the cpu capacity, so
@@ -227,8 +238,13 @@ static int __init register_cpufreq_notifier(void) 


	cpumask_copy(cpus_to_visit, cpu_possible_mask);



	return cpufreq_register_notifier(&init_cpu_capacity_notifier,

	ret = cpufreq_register_notifier(&init_cpu_capacity_notifier,

					CPUFREQ_POLICY_NOTIFIER);



	if (ret)

		free_cpumask_var(cpus_to_visit);



	return ret;

}

core_initcall(register_cpufreq_notifier);
@@ -236,6 +252,7 @@ static void __init parsing_done_workfn(struct work_struct *work) 
{

	cpufreq_unregister_notifier(&init_cpu_capacity_notifier,

					 CPUFREQ_POLICY_NOTIFIER);

	free_cpumask_var(cpus_to_visit);

}



#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE