* [RFC 5/6] drivers: move drivers/sh/pm_runtime.c to drivers/base
@ 2014-03-17 11:15 Ben Dooks
2014-03-17 21:12 ` Laurent Pinchart
0 siblings, 1 reply; 2+ messages in thread
From: Ben Dooks @ 2014-03-17 11:15 UTC (permalink / raw)
To: linux-sh
Move the drivers/sh/pm_runtime.c code to drivers/base as it may be of
use to any systems that need some generic platformbus power management.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
drivers/base/Kconfig | 8 +++++
drivers/base/Makefile | 1 +
drivers/base/pm_runtime_platform.c | 65 ++++++++++++++++++++++++++++++++++++++
drivers/sh/Makefile | 2 --
drivers/sh/pm_runtime.c | 60 -----------------------------------
include/linux/platform_device.h | 2 ++
6 files changed, 76 insertions(+), 62 deletions(-)
create mode 100644 drivers/base/pm_runtime_platform.c
delete mode 100644 drivers/sh/pm_runtime.c
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index ec36e77..6249834 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -188,6 +188,14 @@ config GENERIC_CPU_DEVICES
config SOC_BUS
bool
+config PM_RUNTIME_PLATFORM
+ bool "Generic PM runtime support for platform bus"
+ default y if CONFIG_ARCH_SHMOBILE || CONFIG_SUPERH
+ help
+ This option enables a default pm domain for the platform bus
+ for controlling device power management without any system
+ specific code.
+
source "drivers/base/regmap/Kconfig"
config DMA_SHARED_BUFFER
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 04b314e..0ddd9c1 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
obj-$(CONFIG_REGMAP) += regmap/
obj-$(CONFIG_SOC_BUS) += soc.o
obj-$(CONFIG_PINCTRL) += pinctrl.o
+obj-$(CONFIG_PM_RUNTIME_PLATFORM) += pm_runtime_platform.o
ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
diff --git a/drivers/base/pm_runtime_platform.c b/drivers/base/pm_runtime_platform.c
new file mode 100644
index 0000000..c55e364
--- /dev/null
+++ b/drivers/base/pm_runtime_platform.c
@@ -0,0 +1,65 @@
+/*
+ * Runtime PM support code
+ *
+ * Copyright (C) 2009-2010 Magnus Damm
+ * Copyright (C) 2014 Codethink Limited
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
+#include <linux/pm_clock.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/sh_clk.h>
+#include <linux/bitmap.h>
+#include <linux/slab.h>
+
+#ifdef CONFIG_PM_RUNTIME
+static struct dev_pm_domain default_pm_domain = {
+ .ops = {
+ .runtime_suspend = pm_clk_suspend,
+ .runtime_resume = pm_clk_resume,
+ USE_PLATFORM_PM_SLEEP_OPS
+ },
+};
+
+#define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
+
+#else
+
+#define DEFAULT_PM_DOMAIN_PTR NULL
+
+#endif /* CONFIG_PM_RUNTIME */
+
+static struct pm_clk_notifier_block platform_bus_notifier = {
+ .pm_domain = DEFAULT_PM_DOMAIN_PTR,
+ .con_ids = { NULL, },
+};
+
+static bool platbus_pm_on;
+
+int __init platformbus_pm_runtime_init(void)
+{
+ platbus_pm_on = true;
+ pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
+ return 0;
+}
+
+static int __init platformbus_pm_runtime_late_init(void)
+{
+ if (platbus_pm_on)
+ pm_genpd_poweroff_unused();
+ return 0;
+}
+late_initcall(platformbus_pm_runtime_late_init);
+
+#if defined(CONFIG_ARCH_SHMOBILE_LEGACY) || defined(CONFIG_SH)
+core_initcall(platformbus_pm_runtime_init);
+#endif
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index b4d588c..5eec207 100644
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -9,5 +9,3 @@ endif
obj-$(CONFIG_MAPLE) += maple/
obj-$(CONFIG_SUPERHYWAY) += superhyway/
-
-obj-y += pm_runtime.o
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
deleted file mode 100644
index f4f8851..0000000
--- a/drivers/sh/pm_runtime.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Runtime PM support code
- *
- * Copyright (C) 2009-2010 Magnus Damm
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/pm_runtime.h>
-#include <linux/pm_domain.h>
-#include <linux/pm_clock.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/sh_clk.h>
-#include <linux/bitmap.h>
-#include <linux/slab.h>
-
-#ifdef CONFIG_PM_RUNTIME
-static struct dev_pm_domain default_pm_domain = {
- .ops = {
- .runtime_suspend = pm_clk_suspend,
- .runtime_resume = pm_clk_resume,
- USE_PLATFORM_PM_SLEEP_OPS
- },
-};
-
-#define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
-
-#else
-
-#define DEFAULT_PM_DOMAIN_PTR NULL
-
-#endif /* CONFIG_PM_RUNTIME */
-
-static struct pm_clk_notifier_block platform_bus_notifier = {
- .pm_domain = DEFAULT_PM_DOMAIN_PTR,
- .con_ids = { NULL, },
-};
-
-static bool default_pm_on;
-
-int __init sh_pm_runtime_init(void)
-{
- default_pm_on = true;
- pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
- return 0;
-}
-
-static int __init sh_pm_runtime_late_init(void)
-{
- if (default_pm_on)
- pm_genpd_poweroff_unused();
- return 0;
-}
-late_initcall(sh_pm_runtime_late_init);
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 16f6654..1551ea5 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -326,4 +326,6 @@ extern int platform_pm_restore(struct device *dev);
#define USE_PLATFORM_PM_SLEEP_OPS
#endif
+extern int platformbus_pm_runtime_init(void);
+
#endif /* _PLATFORM_DEVICE_H_ */
--
1.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [RFC 5/6] drivers: move drivers/sh/pm_runtime.c to drivers/base
2014-03-17 11:15 [RFC 5/6] drivers: move drivers/sh/pm_runtime.c to drivers/base Ben Dooks
@ 2014-03-17 21:12 ` Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2014-03-17 21:12 UTC (permalink / raw)
To: linux-sh
Hi Ben,
(CC'ing Rafael Wysocki)
Thank you for the patch.
On Monday 17 March 2014 11:15:16 Ben Dooks wrote:
> Move the drivers/sh/pm_runtime.c code to drivers/base as it may be of
> use to any systems that need some generic platformbus power management.
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
> drivers/base/Kconfig | 8 +++++
> drivers/base/Makefile | 1 +
> drivers/base/pm_runtime_platform.c | 65 +++++++++++++++++++++++++++++++++++
> drivers/sh/Makefile | 2 --
> drivers/sh/pm_runtime.c | 60 -----------------------------------
> include/linux/platform_device.h | 2 ++
> 6 files changed, 76 insertions(+), 62 deletions(-)
> create mode 100644 drivers/base/pm_runtime_platform.c
> delete mode 100644 drivers/sh/pm_runtime.c
>
> diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
> index ec36e77..6249834 100644
> --- a/drivers/base/Kconfig
> +++ b/drivers/base/Kconfig
> @@ -188,6 +188,14 @@ config GENERIC_CPU_DEVICES
> config SOC_BUS
> bool
>
> +config PM_RUNTIME_PLATFORM
> + bool "Generic PM runtime support for platform bus"
> + default y if CONFIG_ARCH_SHMOBILE || CONFIG_SUPERH
> + help
> + This option enables a default pm domain for the platform bus
> + for controlling device power management without any system
> + specific code.
Quoting Documentation/power/devices.txt:
"Sometimes devices share reference clocks or other power resources. In those
cases it generally is not possible to put devices into low-power states
individually. Instead, a set of devices sharing a power resource can be put
into a low-power state together at the same time by turning off the shared
power resource. Of course, they also need to be put into the full-power state
together, by turning the shared power resource on. A set of devices with this
property is often referred to as a power domain."
If that still holds true (I'm not a power domain expert, documentation might
be outdated) I think the concept of a default power domain common to all
devices is a concept that doesn't make much sense.
Furthermore, the proposed implementation below implement runtime_suspend and
runtime_resume using just pm_clk_suspend and pm_clk_resume, which makes it
impossible for device types, classes, busses or drivers to perform any
operation at runtime suspend or resume. That doesn't seem right to me.
> source "drivers/base/regmap/Kconfig"
>
> config DMA_SHARED_BUFFER
> diff --git a/drivers/base/Makefile b/drivers/base/Makefile
> index 04b314e..0ddd9c1 100644
> --- a/drivers/base/Makefile
> +++ b/drivers/base/Makefile
> @@ -22,6 +22,7 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
> obj-$(CONFIG_REGMAP) += regmap/
> obj-$(CONFIG_SOC_BUS) += soc.o
> obj-$(CONFIG_PINCTRL) += pinctrl.o
> +obj-$(CONFIG_PM_RUNTIME_PLATFORM) += pm_runtime_platform.o
>
> ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
>
> diff --git a/drivers/base/pm_runtime_platform.c
> b/drivers/base/pm_runtime_platform.c new file mode 100644
> index 0000000..c55e364
> --- /dev/null
> +++ b/drivers/base/pm_runtime_platform.c
> @@ -0,0 +1,65 @@
> +/*
> + * Runtime PM support code
> + *
> + * Copyright (C) 2009-2010 Magnus Damm
> + * Copyright (C) 2014 Codethink Limited
> + *
> + * This file is subject to the terms and conditions of the GNU General
> Public + * License. See the file "COPYING" in the main directory of this
> archive + * for more details.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/kernel.h>
> +#include <linux/io.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/pm_domain.h>
> +#include <linux/pm_clock.h>
> +#include <linux/platform_device.h>
> +#include <linux/clk.h>
> +#include <linux/sh_clk.h>
> +#include <linux/bitmap.h>
> +#include <linux/slab.h>
> +
> +#ifdef CONFIG_PM_RUNTIME
> +static struct dev_pm_domain default_pm_domain = {
> + .ops = {
> + .runtime_suspend = pm_clk_suspend,
> + .runtime_resume = pm_clk_resume,
> + USE_PLATFORM_PM_SLEEP_OPS
> + },
> +};
> +
> +#define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
> +
> +#else
> +
> +#define DEFAULT_PM_DOMAIN_PTR NULL
> +
> +#endif /* CONFIG_PM_RUNTIME */
> +
> +static struct pm_clk_notifier_block platform_bus_notifier = {
> + .pm_domain = DEFAULT_PM_DOMAIN_PTR,
> + .con_ids = { NULL, },
> +};
> +
> +static bool platbus_pm_on;
> +
> +int __init platformbus_pm_runtime_init(void)
> +{
> + platbus_pm_on = true;
> + pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
> + return 0;
> +}
> +
> +static int __init platformbus_pm_runtime_late_init(void)
> +{
> + if (platbus_pm_on)
> + pm_genpd_poweroff_unused();
> + return 0;
> +}
> +late_initcall(platformbus_pm_runtime_late_init);
> +
> +#if defined(CONFIG_ARCH_SHMOBILE_LEGACY) || defined(CONFIG_SH)
> +core_initcall(platformbus_pm_runtime_init);
> +#endif
> diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
> index b4d588c..5eec207 100644
> --- a/drivers/sh/Makefile
> +++ b/drivers/sh/Makefile
> @@ -9,5 +9,3 @@ endif
>
> obj-$(CONFIG_MAPLE) += maple/
> obj-$(CONFIG_SUPERHYWAY) += superhyway/
> -
> -obj-y += pm_runtime.o
> diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
> deleted file mode 100644
> index f4f8851..0000000
> --- a/drivers/sh/pm_runtime.c
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -/*
> - * Runtime PM support code
> - *
> - * Copyright (C) 2009-2010 Magnus Damm
> - *
> - * This file is subject to the terms and conditions of the GNU General
> Public - * License. See the file "COPYING" in the main directory of this
> archive - * for more details.
> - */
> -
> -#include <linux/init.h>
> -#include <linux/kernel.h>
> -#include <linux/io.h>
> -#include <linux/pm_runtime.h>
> -#include <linux/pm_domain.h>
> -#include <linux/pm_clock.h>
> -#include <linux/platform_device.h>
> -#include <linux/clk.h>
> -#include <linux/sh_clk.h>
> -#include <linux/bitmap.h>
> -#include <linux/slab.h>
> -
> -#ifdef CONFIG_PM_RUNTIME
> -static struct dev_pm_domain default_pm_domain = {
> - .ops = {
> - .runtime_suspend = pm_clk_suspend,
> - .runtime_resume = pm_clk_resume,
> - USE_PLATFORM_PM_SLEEP_OPS
> - },
> -};
> -
> -#define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
> -
> -#else
> -
> -#define DEFAULT_PM_DOMAIN_PTR NULL
> -
> -#endif /* CONFIG_PM_RUNTIME */
> -
> -static struct pm_clk_notifier_block platform_bus_notifier = {
> - .pm_domain = DEFAULT_PM_DOMAIN_PTR,
> - .con_ids = { NULL, },
> -};
> -
> -static bool default_pm_on;
> -
> -int __init sh_pm_runtime_init(void)
> -{
> - default_pm_on = true;
> - pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
> - return 0;
> -}
> -
> -static int __init sh_pm_runtime_late_init(void)
> -{
> - if (default_pm_on)
> - pm_genpd_poweroff_unused();
> - return 0;
> -}
> -late_initcall(sh_pm_runtime_late_init);
> diff --git a/include/linux/platform_device.h
> b/include/linux/platform_device.h index 16f6654..1551ea5 100644
> --- a/include/linux/platform_device.h
> +++ b/include/linux/platform_device.h
> @@ -326,4 +326,6 @@ extern int platform_pm_restore(struct device *dev);
> #define USE_PLATFORM_PM_SLEEP_OPS
> #endif
>
> +extern int platformbus_pm_runtime_init(void);
> +
> #endif /* _PLATFORM_DEVICE_H_ */
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-17 21:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-17 11:15 [RFC 5/6] drivers: move drivers/sh/pm_runtime.c to drivers/base Ben Dooks
2014-03-17 21:12 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox