Commit 69f8947b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'pm-cpuidle' 

* pm-cpufreq:
  cpufreq: postfix policy directory with the first CPU in related_cpus
  cpufreq: create cpu/cpufreq/policyX directories
  cpufreq: remove cpufreq_sysfs_{create|remove}_file()
  cpufreq: create cpu/cpufreq at boot time
  cpufreq: Use cpumask_copy instead of cpumask_or to copy a mask
  cpufreq: ondemand: Drop unnecessary locks from update_sampling_rate()
  cpufreq: intel_pstate: Fix intel_pstate powersave min_perf_pct value
  cpufreq: intel_pstate: Avoid calculation for max/min
  Documentation: kernel_parameters for Intel P state driver
  cpufreq: intel_pstate: Use ACPI perf configuration
  cpufreq: intel-pstate: Use separate max pstate for scaling
  cpufreq: intel_pstate: get P1 from TAR when available
  cpufreq: Drop redundant check for inactive policies
  cpufreq : powernv: Report Pmax throttling if capped below nominal frequency
  cpufreq: imx: update the clock switch flow to support imx6ul
  cpufreq: tegra20: remove superfluous CONFIG_PM ifdefs
  cpufreq: conservative: remove 'enable' field
  cpufreq: integrator: Fix module autoload for OF platform driver

* pm-cpuidle:
  cpuidle: mvebu: disable the bind/unbind attributes and use builtin_platform_driver
  cpuidle: mvebu: clean up multiple platform drivers
parents 9bb4064c 3510fac4 54c0a8a8

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1547,6 +1547,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		hwp_only

			Only load intel_pstate on systems which support

			hardware P state control (HWP) if available.

		no_acpi

			Don't use ACPI processor performance control objects

			_PSS and _PPC specified limits.



	intremap=	[X86-64, Intel-IOMMU]

			on	enable Interrupt Remapping (default)

arch/x86/include/asm/msr-index.h

+7 −0
Original line number Diff line number Diff line
@@ -206,6 +206,13 @@ 
#define MSR_GFX_PERF_LIMIT_REASONS	0x000006B0

#define MSR_RING_PERF_LIMIT_REASONS	0x000006B1



/* Config TDP MSRs */

#define MSR_CONFIG_TDP_NOMINAL		0x00000648

#define MSR_CONFIG_TDP_LEVEL1		0x00000649

#define MSR_CONFIG_TDP_LEVEL2		0x0000064A

#define MSR_CONFIG_TDP_CONTROL		0x0000064B

#define MSR_TURBO_ACTIVATION_RATIO	0x0000064C



/* Hardware P state interface */

#define MSR_PPERF			0x0000064e

#define MSR_PERF_LIMIT_REASONS		0x0000064f

drivers/cpufreq/Kconfig.x86

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
config X86_INTEL_PSTATE

       bool "Intel P state control"

       depends on X86

       select ACPI_PROCESSOR if ACPI

       help

          This driver provides a P state for Intel core processors.

	  The driver implements an internal governor and will become

drivers/cpufreq/cpufreq.c

+20 −92
Original line number Diff line number Diff line
@@ -843,18 +843,11 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, 


	down_write(&policy->rwsem);



	/* Updating inactive policies is invalid, so avoid doing that. */

	if (unlikely(policy_is_inactive(policy))) {

		ret = -EBUSY;

		goto unlock_policy_rwsem;

	}



	if (fattr->store)

		ret = fattr->store(policy, buf, count);

	else

		ret = -EIO;



unlock_policy_rwsem:

	up_write(&policy->rwsem);

unlock:

	put_online_cpus();
@@ -880,49 +873,6 @@ static struct kobj_type ktype_cpufreq = { 
	.release	= cpufreq_sysfs_release,

};



struct kobject *cpufreq_global_kobject;

EXPORT_SYMBOL(cpufreq_global_kobject);



static int cpufreq_global_kobject_usage;



int cpufreq_get_global_kobject(void)

{

	if (!cpufreq_global_kobject_usage++)

		return kobject_add(cpufreq_global_kobject,

				&cpu_subsys.dev_root->kobj, "%s", "cpufreq");



	return 0;

}

EXPORT_SYMBOL(cpufreq_get_global_kobject);



void cpufreq_put_global_kobject(void)

{

	if (!--cpufreq_global_kobject_usage)

		kobject_del(cpufreq_global_kobject);

}

EXPORT_SYMBOL(cpufreq_put_global_kobject);



int cpufreq_sysfs_create_file(const struct attribute *attr)

{

	int ret = cpufreq_get_global_kobject();



	if (!ret) {

		ret = sysfs_create_file(cpufreq_global_kobject, attr);

		if (ret)

			cpufreq_put_global_kobject();

	}



	return ret;

}

EXPORT_SYMBOL(cpufreq_sysfs_create_file);



void cpufreq_sysfs_remove_file(const struct attribute *attr)

{

	sysfs_remove_file(cpufreq_global_kobject, attr);

	cpufreq_put_global_kobject();

}

EXPORT_SYMBOL(cpufreq_sysfs_remove_file);



static int add_cpu_dev_symlink(struct cpufreq_policy *policy, int cpu)

{

	struct device *cpu_dev;
@@ -960,9 +910,6 @@ static int cpufreq_add_dev_symlink(struct cpufreq_policy *policy) 


	/* Some related CPUs might not be present (physically hotplugged) */

	for_each_cpu(j, policy->real_cpus) {

		if (j == policy->kobj_cpu)

			continue;



		ret = add_cpu_dev_symlink(policy, j);

		if (ret)

			break;
@@ -976,13 +923,9 @@ static void cpufreq_remove_dev_symlink(struct cpufreq_policy *policy) 
	unsigned int j;



	/* Some related CPUs might not be present (physically hotplugged) */

	for_each_cpu(j, policy->real_cpus) {

		if (j == policy->kobj_cpu)

			continue;



	for_each_cpu(j, policy->real_cpus)

		remove_cpu_dev_symlink(policy, j);

}

}



static int cpufreq_add_dev_interface(struct cpufreq_policy *policy)

{
@@ -1079,7 +1022,6 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) 
{

	struct device *dev = get_cpu_device(cpu);

	struct cpufreq_policy *policy;

	int ret;



	if (WARN_ON(!dev))

		return NULL;
@@ -1097,13 +1039,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) 
	if (!zalloc_cpumask_var(&policy->real_cpus, GFP_KERNEL))

		goto err_free_rcpumask;



	ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq, &dev->kobj,

				   "cpufreq");

	if (ret) {

		pr_err("%s: failed to init policy->kobj: %d\n", __func__, ret);

		goto err_free_real_cpus;

	}



	kobject_init(&policy->kobj, &ktype_cpufreq);

	INIT_LIST_HEAD(&policy->policy_list);

	init_rwsem(&policy->rwsem);

	spin_lock_init(&policy->transition_lock);
@@ -1112,14 +1048,8 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) 
	INIT_WORK(&policy->update, handle_update);



	policy->cpu = cpu;



	/* Set this once on allocation */

	policy->kobj_cpu = cpu;



	return policy;



err_free_real_cpus:

	free_cpumask_var(policy->real_cpus);

err_free_rcpumask:

	free_cpumask_var(policy->related_cpus);

err_free_cpumask:
@@ -1221,9 +1151,19 @@ static int cpufreq_online(unsigned int cpu) 


	if (new_policy) {

		/* related_cpus should at least include policy->cpus. */

		cpumask_or(policy->related_cpus, policy->related_cpus, policy->cpus);

		cpumask_copy(policy->related_cpus, policy->cpus);

		/* Remember CPUs present at the policy creation time. */

		cpumask_and(policy->real_cpus, policy->cpus, cpu_present_mask);



		/* Name and add the kobject */

		ret = kobject_add(&policy->kobj, cpufreq_global_kobject,

				  "policy%u",

				  cpumask_first(policy->related_cpus));

		if (ret) {

			pr_err("%s: failed to add policy->kobj: %d\n", __func__,

			       ret);

			goto out_exit_policy;

		}

	}



	/*
@@ -1467,22 +1407,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) 
		return;

	}



	if (cpu != policy->kobj_cpu) {

	remove_cpu_dev_symlink(policy, cpu);

	} else {

		/*

		 * The CPU owning the policy object is going away.  Move it to

		 * another suitable CPU.

		 */

		unsigned int new_cpu = cpumask_first(policy->real_cpus);

		struct device *new_dev = get_cpu_device(new_cpu);



		dev_dbg(dev, "%s: Moving policy object to CPU%u\n", __func__, new_cpu);



		sysfs_remove_link(&new_dev->kobj, "cpufreq");

		policy->kobj_cpu = new_cpu;

		WARN_ON(kobject_move(&policy->kobj, &new_dev->kobj));

	}

}



static void handle_update(struct work_struct *work)
@@ -2425,7 +2350,7 @@ static int create_boost_sysfs_file(void) 
	if (!cpufreq_driver->set_boost)

		cpufreq_driver->set_boost = cpufreq_boost_set_sw;



	ret = cpufreq_sysfs_create_file(&boost.attr);

	ret = sysfs_create_file(cpufreq_global_kobject, &boost.attr);

	if (ret)

		pr_err("%s: cannot register global BOOST sysfs file\n",

		       __func__);
@@ -2436,7 +2361,7 @@ static int create_boost_sysfs_file(void) 
static void remove_boost_sysfs_file(void)

{

	if (cpufreq_boost_supported())

		cpufreq_sysfs_remove_file(&boost.attr);

		sysfs_remove_file(cpufreq_global_kobject, &boost.attr);

}



int cpufreq_enable_boost_support(void)
@@ -2584,12 +2509,15 @@ static struct syscore_ops cpufreq_syscore_ops = { 
	.shutdown = cpufreq_suspend,

};



struct kobject *cpufreq_global_kobject;

EXPORT_SYMBOL(cpufreq_global_kobject);



static int __init cpufreq_core_init(void)

{

	if (cpufreq_disabled())

		return -ENODEV;



	cpufreq_global_kobject = kobject_create();

	cpufreq_global_kobject = kobject_create_and_add("cpufreq", &cpu_subsys.dev_root->kobj);

	BUG_ON(!cpufreq_global_kobject);



	register_syscore_ops(&cpufreq_syscore_ops);

drivers/cpufreq/cpufreq_conservative.c

+18 −13
Original line number Diff line number Diff line
@@ -23,6 +23,19 @@ 


static DEFINE_PER_CPU(struct cs_cpu_dbs_info_s, cs_cpu_dbs_info);



static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,

				   unsigned int event);



#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE

static

#endif

struct cpufreq_governor cpufreq_gov_conservative = {

	.name			= "conservative",

	.governor		= cs_cpufreq_governor_dbs,

	.max_transition_latency	= TRANSITION_LATENCY_LIMIT,

	.owner			= THIS_MODULE,

};



static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners,

					   struct cpufreq_policy *policy)

{
@@ -119,12 +132,14 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val, 
	struct cpufreq_freqs *freq = data;

	struct cs_cpu_dbs_info_s *dbs_info =

					&per_cpu(cs_cpu_dbs_info, freq->cpu);

	struct cpufreq_policy *policy;

	struct cpufreq_policy *policy = cpufreq_cpu_get_raw(freq->cpu);



	if (!dbs_info->enable)

	if (!policy)

		return 0;



	policy = dbs_info->cdbs.shared->policy;

	/* policy isn't governed by conservative governor */

	if (policy->governor != &cpufreq_gov_conservative)

		return 0;



	/*

	 * we only care if our internally tracked freq moves outside the 'valid'
@@ -367,16 +382,6 @@ static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy, 
	return cpufreq_governor_dbs(policy, &cs_dbs_cdata, event);

}



#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE

static

#endif

struct cpufreq_governor cpufreq_gov_conservative = {

	.name			= "conservative",

	.governor		= cs_cpufreq_governor_dbs,

	.max_transition_latency	= TRANSITION_LATENCY_LIMIT,

	.owner			= THIS_MODULE,

};



static int __init cpufreq_gov_dbs_init(void)

{

	return cpufreq_register_governor(&cpufreq_gov_conservative);

CRA Git | Maintained and supported by SUSTech CRA and CCSE