Commit 86c17c40 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

Merge cpufreq and cpuidle changes for 5.18-rc1:

 - Make the schedutil cpufreq governor use to_gov_attr_set() instead
   of open coding it (Kevin Hao).

 - Replace acpi_bus_get_device() with acpi_fetch_acpi_dev() in the
   cpufreq longhaul driver (Rafael Wysocki).

 - Unify show() and store() naming in cpufreq and make it use
   __ATTR_XX (Lianjie Zhang).

 - Make the intel_pstate driver use the EPP value set by the firmware
   by default (Srinivas Pandruvada).

 - Re-order the init checks in the powernow-k8 cpufreq driver (Mario
   Limonciello).

 - Make the ACPI processor idle driver check for architectural
   support for LPI to avoid using it on x86 by mistake (Mario
   Limonciello).

 - Add Sapphire Rapids Xeon support to the intel_idle driver (Artem
   Bityutskiy).

 - Add 'preferred_cstates' module argument to the intel_idle driver
   to work around C1 and C1E handling issue on Sapphire Rapids (Artem
   Bityutskiy).

 - Add core C6 optimization on Sapphire Rapids to the intel_idle
   driver (Artem Bityutskiy).

 - Optimize the haltpoll cpuidle driver a bit (Li RongQing).

 - Remove leftover text from intel_idle() kerneldoc comment and fix
   up white space in intel_idle (Rafael Wysocki).

* pm-cpufreq:
  cpufreq: powernow-k8: Re-order the init checks
  cpufreq: intel_pstate: Use firmware default EPP
  cpufreq: unify show() and store() naming and use __ATTR_XX
  cpufreq: longhaul: Replace acpi_bus_get_device()
  cpufreq: schedutil: Use to_gov_attr_set() to get the gov_attr_set
  cpufreq: Move to_gov_attr_set() to cpufreq.h

* pm-cpuidle:
  cpuidle: intel_idle: Drop redundant backslash at line end
  cpuidle: intel_idle: Update intel_idle() kerneldoc comment
  cpuidle: haltpoll: Call cpuidle_poll_state_init() later
  intel_idle: add core C6 optimization for SPR
  intel_idle: add 'preferred_cstates' module argument
  intel_idle: add SPR support
  ACPI: processor idle: Check for architectural support for LPI
  cpuidle: PSCI: Move the `has_lpi` check to the beginning of the function
parents 524bb1da 3870a44d 03eb6522

arch/arm64/kernel/cpuidle.c

+3 −3
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ static int psci_acpi_cpu_init_idle(unsigned int cpu) 
	struct acpi_lpi_state *lpi;

	struct acpi_processor *pr = per_cpu(processors, cpu);



	if (unlikely(!pr || !pr->flags.has_lpi))

		return -EINVAL;



	/*

	 * If the PSCI cpu_suspend function hook has not been initialized

	 * idle states must not be enabled, so bail out
@@ -61,9 +64,6 @@ static int psci_acpi_cpu_init_idle(unsigned int cpu) 
	if (!psci_ops.cpu_suspend)

		return -EOPNOTSUPP;



	if (unlikely(!pr || !pr->flags.has_lpi))

		return -EINVAL;



	count = pr->power.count - 1;

	if (count <= 0)

		return -ENODEV;

drivers/acpi/processor_idle.c

+10 −5
Original line number Diff line number Diff line
@@ -1080,6 +1080,11 @@ static int flatten_lpi_states(struct acpi_processor *pr, 
	return 0;

}



int __weak acpi_processor_ffh_lpi_probe(unsigned int cpu)

{

	return -EOPNOTSUPP;

}



static int acpi_processor_get_lpi_info(struct acpi_processor *pr)

{

	int ret, i;
@@ -1088,6 +1093,11 @@ static int acpi_processor_get_lpi_info(struct acpi_processor *pr) 
	struct acpi_device *d = NULL;

	struct acpi_lpi_states_array info[2], *tmp, *prev, *curr;



	/* make sure our architecture has support */

	ret = acpi_processor_ffh_lpi_probe(pr->id);

	if (ret == -EOPNOTSUPP)

		return ret;



	if (!osc_pc_lpi_support_confirmed)

		return -EOPNOTSUPP;
@@ -1139,11 +1149,6 @@ static int acpi_processor_get_lpi_info(struct acpi_processor *pr) 
	return 0;

}



int __weak acpi_processor_ffh_lpi_probe(unsigned int cpu)

{

	return -ENODEV;

}



int __weak acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi)

{

	return -ENODEV;

drivers/cpufreq/cpufreq_conservative.c

+5 −5
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static unsigned int cs_dbs_update(struct cpufreq_policy *policy) 


/************************** sysfs interface ************************/



static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set,

static ssize_t sampling_down_factor_store(struct gov_attr_set *attr_set,

					  const char *buf, size_t count)

{

	struct dbs_data *dbs_data = to_dbs_data(attr_set);
@@ -161,7 +161,7 @@ static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, 
	return count;

}



static ssize_t store_up_threshold(struct gov_attr_set *attr_set,

static ssize_t up_threshold_store(struct gov_attr_set *attr_set,

				  const char *buf, size_t count)

{

	struct dbs_data *dbs_data = to_dbs_data(attr_set);
@@ -177,7 +177,7 @@ static ssize_t store_up_threshold(struct gov_attr_set *attr_set, 
	return count;

}



static ssize_t store_down_threshold(struct gov_attr_set *attr_set,

static ssize_t down_threshold_store(struct gov_attr_set *attr_set,

				    const char *buf, size_t count)

{

	struct dbs_data *dbs_data = to_dbs_data(attr_set);
@@ -195,7 +195,7 @@ static ssize_t store_down_threshold(struct gov_attr_set *attr_set, 
	return count;

}



static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set,

static ssize_t ignore_nice_load_store(struct gov_attr_set *attr_set,

				      const char *buf, size_t count)

{

	struct dbs_data *dbs_data = to_dbs_data(attr_set);
@@ -220,7 +220,7 @@ static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, 
	return count;

}



static ssize_t store_freq_step(struct gov_attr_set *attr_set, const char *buf,

static ssize_t freq_step_store(struct gov_attr_set *attr_set, const char *buf,

			       size_t count)

{

	struct dbs_data *dbs_data = to_dbs_data(attr_set);

drivers/cpufreq/cpufreq_governor.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static DEFINE_MUTEX(gov_dbs_data_mutex); 


/* Common sysfs tunables */

/*

 * store_sampling_rate - update sampling rate effective immediately if needed.

 * sampling_rate_store - update sampling rate effective immediately if needed.

 *

 * If new rate is smaller than the old, simply updating

 * dbs.sampling_rate might not be appropriate. For example, if the
@@ -41,7 +41,7 @@ static DEFINE_MUTEX(gov_dbs_data_mutex); 
 * This must be called with dbs_data->mutex held, otherwise traversing

 * policy_dbs_list isn't safe.

 */

ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf,

ssize_t sampling_rate_store(struct gov_attr_set *attr_set, const char *buf,

			    size_t count)

{

	struct dbs_data *dbs_data = to_dbs_data(attr_set);
@@ -80,7 +80,7 @@ ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, 


	return count;

}

EXPORT_SYMBOL_GPL(store_sampling_rate);

EXPORT_SYMBOL_GPL(sampling_rate_store);



/**

 * gov_update_cpu_data - Update CPU load data.

drivers/cpufreq/cpufreq_governor.h

+5 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline struct dbs_data *to_dbs_data(struct gov_attr_set *attr_set) 
}



#define gov_show_one(_gov, file_name)					\

static ssize_t show_##file_name						\

static ssize_t file_name##_show						\

(struct gov_attr_set *attr_set, char *buf)				\

{									\

	struct dbs_data *dbs_data = to_dbs_data(attr_set);		\
@@ -60,7 +60,7 @@ static ssize_t show_##file_name \ 
}



#define gov_show_one_common(file_name)					\

static ssize_t show_##file_name						\

static ssize_t file_name##_show						\

(struct gov_attr_set *attr_set, char *buf)				\

{									\

	struct dbs_data *dbs_data = to_dbs_data(attr_set);		\
@@ -68,12 +68,10 @@ static ssize_t show_##file_name \ 
}



#define gov_attr_ro(_name)						\

static struct governor_attr _name =					\

__ATTR(_name, 0444, show_##_name, NULL)

static struct governor_attr _name = __ATTR_RO(_name)



#define gov_attr_rw(_name)						\

static struct governor_attr _name =					\

__ATTR(_name, 0644, show_##_name, store_##_name)

static struct governor_attr _name = __ATTR_RW(_name)



/* Common to all CPUs of a policy */

struct policy_dbs_info {
@@ -176,7 +174,7 @@ void od_register_powersave_bias_handler(unsigned int (*f) 
		(struct cpufreq_policy *, unsigned int, unsigned int),

		unsigned int powersave_bias);

void od_unregister_powersave_bias_handler(void);

ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf,

ssize_t sampling_rate_store(struct gov_attr_set *attr_set, const char *buf,

			    size_t count);

void gov_update_cpu_data(struct dbs_data *dbs_data);

#endif /* _CPUFREQ_GOVERNOR_H */