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

Merge branches 'pm-domains' and 'pm-core' 

Merge additional generic power domains handling update and an
improvement of the PM callback definition macros for 6.1-rc1:

 - 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).

* pm-domains:
  PM: domains: log failures to register always-on domains

* pm-core:
  PM: Improve EXPORT_*_DEV_PM_OPS macros
parents cf4e0f8a 129b60c9 34e1ed18

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;