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

Commit 009884f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management and ACPI updates from Rafael Wysocki:
 "Included are: a somewhat late devfreq update which however is mostly
  fixes and cleanups with one new thing only (the PPMUv2 support on
  Exynos5433), an ACPI cpufreq driver fixup and two ACPI core cleanups
  related to preprocessor directives.

  Specifics:

   - Fix a memory allocation size in the devfreq core (Xiaolong Ye).

   - Fix a mistake in the exynos-ppmu DT binding (Javier Martinez
     Canillas).

   - Add support for PPMUv2 ((Platform Performance Monitoring Unit
     version 2.0) on the Exynos5433 SoCs (Chanwoo Choi).

   - Fix a type casting bug in the Exynos PPMU code (MyungJoo Ham).

   - Assorted devfreq code cleanups and optimizations (Javi Merino,
     MyungJoo Ham, Viresh Kumar).

   - Fix up the ACPI cpufreq driver to use a more lightweight way to get
     to its private data in the ->get() callback (Rafael J Wysocki).

   - Fix a CONFIG_ prefix bug in one of the ACPI drivers and make the
     ACPI subsystem use IS_ENABLED() instead of #ifdefs in function
     bodies (Sudeep Holla)"

* tag 'pm+acpi-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: acpi-cpufreq: Use cpufreq_cpu_get_raw() in ->get()
  ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
  ACPI: int340x_thermal: add missing CONFIG_ prefix
  PM / devfreq: Fix incorrect type issue.
  PM / devfreq: tegra: Update governor to use devfreq_update_stats()
  PM / devfreq: comments for get_dev_status usage updated
  PM / devfreq: drop comment about thermal setting max_freq
  PM / devfreq: cache the last call to get_dev_status()
  PM / devfreq: Drop unlikely before IS_ERR(_OR_NULL)
  PM / devfreq: exynos-ppmu: bit-wise operation bugfix.
  PM / devfreq: exynos-ppmu: Update documentation to support PPMUv2
  PM / devfreq: exynos-ppmu: Add the support of PPMUv2 for Exynos5433
  PM / devfreq: event: Remove incorrect property in exynos-ppmu DT binding
parents d590b2d4 0f40314b

drivers/acpi/bus.c

+4 −8
Original line number Diff line number Diff line
@@ -315,14 +315,10 @@ static void acpi_bus_osc_support(void) 


	capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;

	capbuf[OSC_SUPPORT_DWORD] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */

#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\

			defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)

	if (IS_ENABLED(CONFIG_ACPI_PROCESSOR_AGGREGATOR))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT;

#endif



#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)

	if (IS_ENABLED(CONFIG_ACPI_PROCESSOR))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;

#endif



	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;

drivers/acpi/int340x_thermal.c

+4 −5
Original line number Diff line number Diff line
@@ -33,13 +33,12 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
static int int340x_thermal_handler_attach(struct acpi_device *adev,

					const struct acpi_device_id *id)

{

#if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE)

	if (IS_ENABLED(CONFIG_INT340X_THERMAL))

		acpi_create_platform_device(adev);

#elif defined(INTEL_SOC_DTS_THERMAL) || defined(INTEL_SOC_DTS_THERMAL_MODULE)

	/* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */

	if (id->driver_data == INT3401_DEVICE)

	else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) &&

		 id->driver_data == INT3401_DEVICE)

		acpi_create_platform_device(adev);

#endif

	return 1;

}

drivers/cpufreq/acpi-cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -375,12 +375,11 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu) 


	pr_debug("get_cur_freq_on_cpu (%d)\n", cpu);



	policy = cpufreq_cpu_get(cpu);

	policy = cpufreq_cpu_get_raw(cpu);

	if (unlikely(!policy))

		return 0;



	data = policy->driver_data;

	cpufreq_cpu_put(policy);

	if (unlikely(!data || !data->freq_table))

		return 0;

drivers/cpufreq/cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -238,13 +238,13 @@ int cpufreq_generic_init(struct cpufreq_policy *policy, 
}

EXPORT_SYMBOL_GPL(cpufreq_generic_init);



/* Only for cpufreq core internal use */

static struct cpufreq_policy *cpufreq_cpu_get_raw(unsigned int cpu)

struct cpufreq_policy *cpufreq_cpu_get_raw(unsigned int cpu)

{

	struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);



	return policy && cpumask_test_cpu(cpu, policy->cpus) ? policy : NULL;

}

EXPORT_SYMBOL_GPL(cpufreq_cpu_get_raw);



unsigned int cpufreq_generic_get(unsigned int cpu)

{

drivers/devfreq/devfreq.c

+6 −6
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static struct devfreq *find_device_devfreq(struct device *dev) 
{

	struct devfreq *tmp_devfreq;



	if (unlikely(IS_ERR_OR_NULL(dev))) {

	if (IS_ERR_OR_NULL(dev)) {

		pr_err("DEVFREQ: %s: Invalid parameters\n", __func__);

		return ERR_PTR(-EINVAL);

	}
@@ -133,7 +133,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name) 
{

	struct devfreq_governor *tmp_governor;



	if (unlikely(IS_ERR_OR_NULL(name))) {

	if (IS_ERR_OR_NULL(name)) {

		pr_err("DEVFREQ: %s: Invalid parameters\n", __func__);

		return ERR_PTR(-EINVAL);

	}
@@ -177,10 +177,10 @@ int update_devfreq(struct devfreq *devfreq) 
		return err;



	/*

	 * Adjust the freuqency with user freq and QoS.

	 * Adjust the frequency with user freq and QoS.

	 *

	 * List from the highest proiority

	 * max_freq (probably called by thermal when it's too hot)

	 * List from the highest priority

	 * max_freq

	 * min_freq

	 */
@@ -482,7 +482,7 @@ struct devfreq *devfreq_add_device(struct device *dev, 
						devfreq->profile->max_state *

						devfreq->profile->max_state,

						GFP_KERNEL);

	devfreq->time_in_state = devm_kzalloc(dev, sizeof(unsigned int) *

	devfreq->time_in_state = devm_kzalloc(dev, sizeof(unsigned long) *

						devfreq->profile->max_state,

						GFP_KERNEL);

	devfreq->last_stat_updated = jiffies;