Commit f848b3cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more power management updates from Rafael Wysocki:
 "These update the turbostat utility, extend the macros used for
  defining device power management callbacks and add a diagnostic
  message to the generic power domains code.

  Specifics:

   - Add an error message to be printed when a power domain marked as
     "always on" is not actually on during initialization (Johan
     Hovold).

   - Extend macros used for defining power management callbacks to allow
     conditional exporting of noirq and late/early suspend/resume PM
     callbacks (Paul Cercueil).

   - Update the turbostat utility:
      - Add support for two new platforms (Zhang Rui).
      - Adjust energy unit for Sapphire Rapids (Zhang Rui).
      - Do not dump TRL if turbo is not supported (Artem Bityutskiy)"

* tag 'pm-6.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  tools/power turbostat: version 2022.10.04
  tools/power turbostat: Use standard Energy Unit for SPR Dram RAPL domain
  tools/power turbostat: Do not dump TRL if turbo is not supported
  tools/power turbostat: Add support for MeteorLake platforms
  tools/power turbostat: Add support for RPL-S
  PM: Improve EXPORT_*_DEV_PM_OPS macros
  PM: domains: log failures to register always-on domains
parents 3a1e24fa f7e6b99f

drivers/base/power/domain.c

+3 −1
Original line number Diff line number Diff line
@@ -2085,8 +2085,10 @@ int pm_genpd_init(struct generic_pm_domain *genpd, 


	/* Always-on domains must be powered on at initialization. */

	if ((genpd_is_always_on(genpd) || genpd_is_rpm_always_on(genpd)) &&

			!genpd_status_on(genpd))

			!genpd_status_on(genpd)) {

		pr_err("always-on PM domain %s is not on\n", genpd->name);

		return -EINVAL;

	}



	/* Multiple states but no governor doesn't make sense. */

	if (!gov && genpd->state_count > 1)

include/linux/pm.h

+23 −14
Original line number Diff line number Diff line
@@ -375,19 +375,20 @@ const struct dev_pm_ops name = { \ 
}



#ifdef CONFIG_PM

#define _EXPORT_DEV_PM_OPS(name, suspend_fn, resume_fn, runtime_suspend_fn, \

			   runtime_resume_fn, idle_fn, sec, ns)		\

	_DEFINE_DEV_PM_OPS(name, suspend_fn, resume_fn, runtime_suspend_fn, \

			   runtime_resume_fn, idle_fn); \

	__EXPORT_SYMBOL(name, sec, ns)

#define _EXPORT_DEV_PM_OPS(name, sec, ns)				\

	const struct dev_pm_ops name;					\

	__EXPORT_SYMBOL(name, sec, ns);					\

	const struct dev_pm_ops name

#else

#define _EXPORT_DEV_PM_OPS(name, suspend_fn, resume_fn, runtime_suspend_fn, \

			   runtime_resume_fn, idle_fn, sec, ns) \

static __maybe_unused _DEFINE_DEV_PM_OPS(__static_##name, suspend_fn, \

					 resume_fn, runtime_suspend_fn, \

					 runtime_resume_fn, idle_fn)

#define _EXPORT_DEV_PM_OPS(name, sec, ns)				\

	static __maybe_unused const struct dev_pm_ops __static_##name

#endif



#define EXPORT_DEV_PM_OPS(name) _EXPORT_DEV_PM_OPS(name, "", "")

#define EXPORT_GPL_DEV_PM_OPS(name) _EXPORT_DEV_PM_OPS(name, "_gpl", "")

#define EXPORT_NS_DEV_PM_OPS(name, ns) _EXPORT_DEV_PM_OPS(name, "", #ns)

#define EXPORT_NS_GPL_DEV_PM_OPS(name, ns) _EXPORT_DEV_PM_OPS(name, "_gpl", #ns)



/*

 * Use this if you want to use the same suspend and resume callbacks for suspend

 * to RAM and hibernation.
@@ -399,13 +400,21 @@ static __maybe_unused _DEFINE_DEV_PM_OPS(__static_##name, suspend_fn, \ 
	_DEFINE_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL)



#define EXPORT_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \

	_EXPORT_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL, "", "")

	EXPORT_DEV_PM_OPS(name) = { \

		SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \

	}

#define EXPORT_GPL_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \

	_EXPORT_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL, "_gpl", "")

	EXPORT_GPL_DEV_PM_OPS(name) = { \

		SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \

	}

#define EXPORT_NS_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn, ns)	\

	_EXPORT_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL, "", #ns)

	EXPORT_NS_DEV_PM_OPS(name, ns) = { \

		SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \

	}

#define EXPORT_NS_GPL_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn, ns)	\

	_EXPORT_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL, "_gpl", #ns)

	EXPORT_NS_GPL_DEV_PM_OPS(name, ns) = { \

		SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \

	}



/* Deprecated. Use DEFINE_SIMPLE_DEV_PM_OPS() instead. */

#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \

include/linux/pm_runtime.h

+12 −8
Original line number Diff line number Diff line
@@ -40,17 +40,21 @@ 
			   resume_fn, idle_fn)



#define EXPORT_RUNTIME_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \

	_EXPORT_DEV_PM_OPS(name, pm_runtime_force_suspend, pm_runtime_force_resume, \

			   suspend_fn, resume_fn, idle_fn, "", "")

	EXPORT_DEV_PM_OPS(name) = { \

		RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \

	}

#define EXPORT_GPL_RUNTIME_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \

	_EXPORT_DEV_PM_OPS(name, pm_runtime_force_suspend, pm_runtime_force_resume, \

			   suspend_fn, resume_fn, idle_fn, "_gpl", "")

	EXPORT_GPL_DEV_PM_OPS(name) = { \

		RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \

	}

#define EXPORT_NS_RUNTIME_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn, ns) \

	_EXPORT_DEV_PM_OPS(name, pm_runtime_force_suspend, pm_runtime_force_resume, \

			   suspend_fn, resume_fn, idle_fn, "", #ns)

	EXPORT_NS_DEV_PM_OPS(name, ns) = { \

		RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \

	}

#define EXPORT_NS_GPL_RUNTIME_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn, ns) \

	_EXPORT_DEV_PM_OPS(name, pm_runtime_force_suspend, pm_runtime_force_resume, \

			   suspend_fn, resume_fn, idle_fn, "_gpl", #ns)

	EXPORT_NS_GPL_DEV_PM_OPS(name, ns) = { \

		RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \

	}



#ifdef CONFIG_PM

extern struct workqueue_struct *pm_wq;

tools/power/x86/turbostat/turbostat.c

+15 −7
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ unsigned int do_slm_cstates; 
unsigned int use_c1_residency_msr;

unsigned int has_aperf;

unsigned int has_epb;

unsigned int has_turbo;

unsigned int is_hybrid;

unsigned int do_irtl_snb;

unsigned int do_irtl_hsw;
@@ -4080,13 +4081,11 @@ static void remove_underbar(char *s) 
	*to = 0;

}



static void dump_cstate_pstate_config_info(unsigned int family, unsigned int model)

static void dump_turbo_ratio_info(unsigned int family, unsigned int model)

{

	if (!do_nhm_platform_info)

	if (!has_turbo)

		return;



	dump_nhm_platform_info();



	if (has_hsw_turbo_ratio_limit(family, model))

		dump_hsw_turbo_ratio_limits();
@@ -4108,7 +4107,15 @@ static void dump_cstate_pstate_config_info(unsigned int family, unsigned int mod 


	if (has_config_tdp(family, model))

		dump_config_tdp();

}



static void dump_cstate_pstate_config_info(unsigned int family, unsigned int model)

{

	if (!do_nhm_platform_info)

		return;



	dump_nhm_platform_info();

	dump_turbo_ratio_info(family, model);

	dump_nhm_cst_cfg();

}
@@ -4560,7 +4567,6 @@ static double rapl_dram_energy_units_probe(int model, double rapl_energy_units) 
	case INTEL_FAM6_SKYLAKE_X:	/* SKX */

	case INTEL_FAM6_XEON_PHI_KNL:	/* KNL */

	case INTEL_FAM6_ICELAKE_X:	/* ICX */

	case INTEL_FAM6_SAPPHIRERAPIDS_X:	/* SPR */

		return (rapl_dram_energy_units = 15.3 / 1000000);

	default:

		return (rapl_energy_units);
@@ -5447,6 +5453,9 @@ unsigned int intel_model_duplicates(unsigned int model) 
	case INTEL_FAM6_ALDERLAKE_N:

	case INTEL_FAM6_RAPTORLAKE:

	case INTEL_FAM6_RAPTORLAKE_P:

	case INTEL_FAM6_RAPTORLAKE_S:

	case INTEL_FAM6_METEORLAKE:

	case INTEL_FAM6_METEORLAKE_L:

		return INTEL_FAM6_CANNONLAKE_L;



	case INTEL_FAM6_ATOM_TREMONT_L:
@@ -5505,7 +5514,6 @@ void process_cpuid() 
{

	unsigned int eax, ebx, ecx, edx;

	unsigned int fms, family, model, stepping, ecx_flags, edx_flags;

	unsigned int has_turbo;

	unsigned long long ucode_patch = 0;



	eax = ebx = ecx = edx = 0;
@@ -6217,7 +6225,7 @@ int get_and_dump_counters(void) 


void print_version()

{

	fprintf(outf, "turbostat version 2022.07.28 - Len Brown <lenb@kernel.org>\n");

	fprintf(outf, "turbostat version 2022.10.04 - Len Brown <lenb@kernel.org>\n");

}



#define COMMAND_LINE_SIZE 2048