Commit 8d74f1da authored by Raag Jadav's avatar Raag Jadav Committed by Rafael J. Wysocki
Browse files

PM: sleep: Fix symbol export for _SIMPLE_ variants of _PM_OPS() 



Currently EXPORT_*_SIMPLE_DEV_PM_OPS() use EXPORT_*_DEV_PM_OPS() set
of macros to export dev_pm_ops symbol, which export the symbol in case
CONFIG_PM=y but don't take CONFIG_PM_SLEEP into consideration.

Since _SIMPLE_ variants of _PM_OPS() do not include runtime PM handles
and are only used in case CONFIG_PM_SLEEP=y, we should not be exporting
dev_pm_ops symbol for them in case CONFIG_PM_SLEEP=n.

This can be fixed by having two distinct set of export macros for both
_RUNTIME_ and _SIMPLE_ variants of _PM_OPS(), such that the export of
dev_pm_ops symbol used in each variant depends on CONFIG_PM and
CONFIG_PM_SLEEP respectively.

Introduce _DEV_SLEEP_PM_OPS() set of export macros for _SIMPLE_ variants
of _PM_OPS(), which export dev_pm_ops symbol only in case CONFIG_PM_SLEEP=y
and discard it otherwise.

Fixes: 34e1ed18 ("PM: Improve EXPORT_*_DEV_PM_OPS macros")
Signed-off-by: default avatarRaag Jadav <raag.jadav@intel.com>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f0c71830

include/linux/pm.h

+29 −14
Original line number Diff line number Diff line
@@ -374,25 +374,40 @@ const struct dev_pm_ops name = { \ 
	RUNTIME_PM_OPS(runtime_suspend_fn, runtime_resume_fn, idle_fn) \

}



#ifdef CONFIG_PM

#define _EXPORT_DEV_PM_OPS(name, license, ns)				\

#define _EXPORT_PM_OPS(name, license, ns)				\

	const struct dev_pm_ops name;					\

	__EXPORT_SYMBOL(name, license, ns);				\

	const struct dev_pm_ops name



#define _DISCARD_PM_OPS(name, license, ns)				\

	static __maybe_unused const struct dev_pm_ops __static_##name



#ifdef CONFIG_PM

#define _EXPORT_DEV_PM_OPS(name, license, ns)		_EXPORT_PM_OPS(name, license, ns)

#define EXPORT_PM_FN_GPL(name)				EXPORT_SYMBOL_GPL(name)

#define EXPORT_PM_FN_NS_GPL(name, ns)			EXPORT_SYMBOL_NS_GPL(name, ns)

#else

#define _EXPORT_DEV_PM_OPS(name, license, ns)				\

	static __maybe_unused const struct dev_pm_ops __static_##name

#define _EXPORT_DEV_PM_OPS(name, license, ns)		_DISCARD_PM_OPS(name, license, ns)

#define EXPORT_PM_FN_GPL(name)

#define EXPORT_PM_FN_NS_GPL(name, ns)

#endif



#ifdef CONFIG_PM_SLEEP

#define _EXPORT_DEV_SLEEP_PM_OPS(name, license, ns)	_EXPORT_PM_OPS(name, license, ns)

#else

#define _EXPORT_DEV_SLEEP_PM_OPS(name, license, ns)	_DISCARD_PM_OPS(name, license, ns)

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



#define EXPORT_DEV_SLEEP_PM_OPS(name)			_EXPORT_DEV_SLEEP_PM_OPS(name, "", "")

#define EXPORT_GPL_DEV_SLEEP_PM_OPS(name)		_EXPORT_DEV_SLEEP_PM_OPS(name, "GPL", "")

#define EXPORT_NS_DEV_SLEEP_PM_OPS(name, ns)		_EXPORT_DEV_SLEEP_PM_OPS(name, "", #ns)

#define EXPORT_NS_GPL_DEV_SLEEP_PM_OPS(name, ns)	_EXPORT_DEV_SLEEP_PM_OPS(name, "GPL", #ns)



/*

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

 * to RAM and hibernation.
@@ -404,19 +419,19 @@ const struct dev_pm_ops name = { \ 
	_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) = { \

	EXPORT_DEV_SLEEP_PM_OPS(name) = { \

		SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \

	}

#define EXPORT_GPL_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \

	EXPORT_GPL_DEV_PM_OPS(name) = { \

	EXPORT_GPL_DEV_SLEEP_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_NS_DEV_PM_OPS(name, ns) = { \

	EXPORT_NS_DEV_SLEEP_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_NS_GPL_DEV_PM_OPS(name, ns) = { \

	EXPORT_NS_GPL_DEV_SLEEP_PM_OPS(name, ns) = { \

		SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \

	}