Commit 9aa4e2f6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq' 

* pm-sleep:
  PM / sleep: Fix test_suspend= command line option

* powercap:
  powercap / RAPL: change domain detection message
  powercap / RAPL: add support for CPU model 0x3f

* pm-domains:
  PM / domains: Make generic_pm_domain.name const

* pm-cpufreq:
  cpufreq: intel_pstate: Remove unneeded variable
parents 73f517b8 62109b43 fcdf1797 d07e9c17 73f1ae8a

drivers/cpufreq/intel_pstate.c

+0 −4
Original line number Diff line number Diff line
@@ -708,10 +708,6 @@ static unsigned int intel_pstate_get(unsigned int cpu_num) 


static int intel_pstate_set_policy(struct cpufreq_policy *policy)

{

	struct cpudata *cpu;



	cpu = all_cpu_data[policy->cpu];



	if (!policy->cpuinfo.max_freq)

		return -ENODEV;

drivers/powercap/intel_rapl.c

+4 −4
Original line number Diff line number Diff line
@@ -953,6 +953,7 @@ static const struct x86_cpu_id rapl_ids[] = { 
	{ X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */

	{ X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */

	{ X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */

	{ X86_VENDOR_INTEL, 6, 0x3f},/* Haswell */

	{ X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */

	/* TODO: Add more CPU IDs after testing */

	{}
@@ -1166,11 +1167,10 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu) 


	for (i = 0; i < RAPL_DOMAIN_MAX; i++) {

		/* use physical package id to read counters */

		if (!rapl_check_domain(cpu, i))

		if (!rapl_check_domain(cpu, i)) {

			rp->domain_map |= 1 << i;

		else

			pr_warn("RAPL domain %s detection failed\n",

				rapl_domain_names[i]);

			pr_info("Found RAPL domain %s\n", rapl_domain_names[i]);

		}

	}

	rp->nr_domains = bitmap_weight(&rp->domain_map,	RAPL_DOMAIN_MAX);

	if (!rp->nr_domains) {

include/linux/pm_domain.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct generic_pm_domain { 
	struct mutex lock;

	struct dev_power_governor *gov;

	struct work_struct power_off_work;

	char *name;

	const char *name;

	unsigned int in_progress;	/* Number of devices being suspended now */

	atomic_t sd_count;	/* Number of subdomains with power "on" */

	enum gpd_status status;	/* Current state of the domain */

kernel/power/power.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ extern void swsusp_show_speed(struct timeval *, struct timeval *, 


#ifdef CONFIG_SUSPEND

/* kernel/power/suspend.c */

extern const char *pm_labels[];

extern const char *pm_states[];



extern int suspend_devices_and_enter(suspend_state_t state);

kernel/power/suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include "power.h"



static const char *pm_labels[] = { "mem", "standby", "freeze", };

const char *pm_labels[] = { "mem", "standby", "freeze", NULL };

const char *pm_states[PM_SUSPEND_MAX];



static const struct platform_suspend_ops *suspend_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE