Re: [PATCH 1/3] drivers/base: move device_shutdown() to base/power
On Fri, Sep 14, 2018 at 5:10 PM Rafael J. Wysocki wrote: > > On Monday, August 20, 2018 11:18:35 AM CEST Pingfan Liu wrote: > > Consider the shutdown as a system state transition, i.e. something like > > suspend, hibernate, hence move it under the base/power. (This is a first > > step to unify the duplicate code logic on devices_kset and dpm_list.) > > I don't really think that device_shutodwn() belongs in base/power/. > > Moving it to a separate file sounds like a good idea, but let that file > reside in base/ proper. > > Then, I would separate the dpm_list definition, locking etc out of > base/power/, move it to the new file containing device_shutdown() and > make the code in base/power/ refer to it (you may want to move the list > entry list head from dev_pm_info to struct device directly while at that > too). > > Then, it should be straightforward enough to switch device_shutdown() over to > using it. > Thanks for your advice. I will find a time slot to redo it. Regards, Pingfan
Re: [PATCH 1/3] drivers/base: move device_shutdown() to base/power
On Fri, Sep 14, 2018 at 5:10 PM Rafael J. Wysocki wrote: > > On Monday, August 20, 2018 11:18:35 AM CEST Pingfan Liu wrote: > > Consider the shutdown as a system state transition, i.e. something like > > suspend, hibernate, hence move it under the base/power. (This is a first > > step to unify the duplicate code logic on devices_kset and dpm_list.) > > I don't really think that device_shutodwn() belongs in base/power/. > > Moving it to a separate file sounds like a good idea, but let that file > reside in base/ proper. > > Then, I would separate the dpm_list definition, locking etc out of > base/power/, move it to the new file containing device_shutdown() and > make the code in base/power/ refer to it (you may want to move the list > entry list head from dev_pm_info to struct device directly while at that > too). > > Then, it should be straightforward enough to switch device_shutdown() over to > using it. > Thanks for your advice. I will find a time slot to redo it. Regards, Pingfan
Re: [PATCH 1/3] drivers/base: move device_shutdown() to base/power
On Monday, August 20, 2018 11:18:35 AM CEST Pingfan Liu wrote: > Consider the shutdown as a system state transition, i.e. something like > suspend, hibernate, hence move it under the base/power. (This is a first > step to unify the duplicate code logic on devices_kset and dpm_list.) I don't really think that device_shutodwn() belongs in base/power/. Moving it to a separate file sounds like a good idea, but let that file reside in base/ proper. Then, I would separate the dpm_list definition, locking etc out of base/power/, move it to the new file containing device_shutdown() and make the code in base/power/ refer to it (you may want to move the list entry list head from dev_pm_info to struct device directly while at that too). Then, it should be straightforward enough to switch device_shutdown() over to using it. Thanks, Rafael
Re: [PATCH 1/3] drivers/base: move device_shutdown() to base/power
On Monday, August 20, 2018 11:18:35 AM CEST Pingfan Liu wrote: > Consider the shutdown as a system state transition, i.e. something like > suspend, hibernate, hence move it under the base/power. (This is a first > step to unify the duplicate code logic on devices_kset and dpm_list.) I don't really think that device_shutodwn() belongs in base/power/. Moving it to a separate file sounds like a good idea, but let that file reside in base/ proper. Then, I would separate the dpm_list definition, locking etc out of base/power/, move it to the new file containing device_shutdown() and make the code in base/power/ refer to it (you may want to move the list entry list head from dev_pm_info to struct device directly while at that too). Then, it should be straightforward enough to switch device_shutdown() over to using it. Thanks, Rafael
[PATCH 1/3] drivers/base: move device_shutdown() to base/power
Consider the shutdown as a system state transition, i.e. something like
suspend, hibernate, hence move it under the base/power. (This is a first
step to unify the duplicate code logic on devices_kset and dpm_list.)
Cc: Greg Kroah-Hartman
Cc: "Rafael J. Wysocki"
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Pingfan Liu
---
drivers/base/core.c | 70 ---
drivers/base/power/Makefile | 1 +
drivers/base/power/shutdown.c | 76 +++
3 files changed, 77 insertions(+), 70 deletions(-)
create mode 100644 drivers/base/power/shutdown.c
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 04bbcd7..7c83384 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2854,76 +2854,6 @@ int device_move(struct device *dev, struct device
*new_parent,
}
EXPORT_SYMBOL_GPL(device_move);
-/**
- * device_shutdown - call ->shutdown() on each device to shutdown.
- */
-void device_shutdown(void)
-{
- struct device *dev, *parent;
-
- wait_for_device_probe();
- device_block_probing();
-
- spin_lock(_kset->list_lock);
- /*
-* Walk the devices list backward, shutting down each in turn.
-* Beware that device unplug events may also start pulling
-* devices offline, even as the system is shutting down.
-*/
- while (!list_empty(_kset->list)) {
- dev = list_entry(devices_kset->list.prev, struct device,
- kobj.entry);
-
- /*
-* hold reference count of device's parent to
-* prevent it from being freed because parent's
-* lock is to be held
-*/
- parent = get_device(dev->parent);
- get_device(dev);
- /*
-* Make sure the device is off the kset list, in the
-* event that dev->*->shutdown() doesn't remove it.
-*/
- list_del_init(>kobj.entry);
- spin_unlock(_kset->list_lock);
-
- /* hold lock to avoid race with probe/release */
- if (parent)
- device_lock(parent);
- device_lock(dev);
-
- /* Don't allow any more runtime suspends */
- pm_runtime_get_noresume(dev);
- pm_runtime_barrier(dev);
-
- if (dev->class && dev->class->shutdown_pre) {
- if (initcall_debug)
- dev_info(dev, "shutdown_pre\n");
- dev->class->shutdown_pre(dev);
- }
- if (dev->bus && dev->bus->shutdown) {
- if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->bus->shutdown(dev);
- } else if (dev->driver && dev->driver->shutdown) {
- if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->driver->shutdown(dev);
- }
-
- device_unlock(dev);
- if (parent)
- device_unlock(parent);
-
- put_device(dev);
- put_device(parent);
-
- spin_lock(_kset->list_lock);
- }
- spin_unlock(_kset->list_lock);
-}
-
/*
* Device logging functions
*/
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index e1bb691..057ddbf 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
+obj-y += shutdown.o
obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o
wakeirq.o
obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o
obj-$(CONFIG_PM_TRACE_RTC) += trace.o
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
new file mode 100644
index 000..c405d09
--- /dev/null
+++ b/drivers/base/power/shutdown.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0
+#include
+#include
+#include
+
+#include "../base.h"
+#include "power.h"
+/**
+ * device_shutdown - call ->shutdown() on each device to shutdown.
+ */
+void device_shutdown(void)
+{
+ struct device *dev, *parent;
+
+ wait_for_device_probe();
+ device_block_probing();
+
+ spin_lock(_kset->list_lock);
+ /*
+* Walk the devices list backward, shutting down each in turn.
+* Beware that device unplug events may also start pulling
+* devices offline, even as the system is shutting down.
+*/
+ while (!list_empty(_kset->list)) {
+ dev = list_entry(devices_kset->list.prev, struct device,
+ kobj.entry);
+
+ /*
+* hold reference count of device's parent to
+* prevent it from being freed because parent's
+* lock is to be held
+*/
+
[PATCH 1/3] drivers/base: move device_shutdown() to base/power
Consider the shutdown as a system state transition, i.e. something like
suspend, hibernate, hence move it under the base/power. (This is a first
step to unify the duplicate code logic on devices_kset and dpm_list.)
Cc: Greg Kroah-Hartman
Cc: "Rafael J. Wysocki"
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Pingfan Liu
---
drivers/base/core.c | 70 ---
drivers/base/power/Makefile | 1 +
drivers/base/power/shutdown.c | 76 +++
3 files changed, 77 insertions(+), 70 deletions(-)
create mode 100644 drivers/base/power/shutdown.c
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 04bbcd7..7c83384 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2854,76 +2854,6 @@ int device_move(struct device *dev, struct device
*new_parent,
}
EXPORT_SYMBOL_GPL(device_move);
-/**
- * device_shutdown - call ->shutdown() on each device to shutdown.
- */
-void device_shutdown(void)
-{
- struct device *dev, *parent;
-
- wait_for_device_probe();
- device_block_probing();
-
- spin_lock(_kset->list_lock);
- /*
-* Walk the devices list backward, shutting down each in turn.
-* Beware that device unplug events may also start pulling
-* devices offline, even as the system is shutting down.
-*/
- while (!list_empty(_kset->list)) {
- dev = list_entry(devices_kset->list.prev, struct device,
- kobj.entry);
-
- /*
-* hold reference count of device's parent to
-* prevent it from being freed because parent's
-* lock is to be held
-*/
- parent = get_device(dev->parent);
- get_device(dev);
- /*
-* Make sure the device is off the kset list, in the
-* event that dev->*->shutdown() doesn't remove it.
-*/
- list_del_init(>kobj.entry);
- spin_unlock(_kset->list_lock);
-
- /* hold lock to avoid race with probe/release */
- if (parent)
- device_lock(parent);
- device_lock(dev);
-
- /* Don't allow any more runtime suspends */
- pm_runtime_get_noresume(dev);
- pm_runtime_barrier(dev);
-
- if (dev->class && dev->class->shutdown_pre) {
- if (initcall_debug)
- dev_info(dev, "shutdown_pre\n");
- dev->class->shutdown_pre(dev);
- }
- if (dev->bus && dev->bus->shutdown) {
- if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->bus->shutdown(dev);
- } else if (dev->driver && dev->driver->shutdown) {
- if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->driver->shutdown(dev);
- }
-
- device_unlock(dev);
- if (parent)
- device_unlock(parent);
-
- put_device(dev);
- put_device(parent);
-
- spin_lock(_kset->list_lock);
- }
- spin_unlock(_kset->list_lock);
-}
-
/*
* Device logging functions
*/
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index e1bb691..057ddbf 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
+obj-y += shutdown.o
obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o
wakeirq.o
obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o
obj-$(CONFIG_PM_TRACE_RTC) += trace.o
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
new file mode 100644
index 000..c405d09
--- /dev/null
+++ b/drivers/base/power/shutdown.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0
+#include
+#include
+#include
+
+#include "../base.h"
+#include "power.h"
+/**
+ * device_shutdown - call ->shutdown() on each device to shutdown.
+ */
+void device_shutdown(void)
+{
+ struct device *dev, *parent;
+
+ wait_for_device_probe();
+ device_block_probing();
+
+ spin_lock(_kset->list_lock);
+ /*
+* Walk the devices list backward, shutting down each in turn.
+* Beware that device unplug events may also start pulling
+* devices offline, even as the system is shutting down.
+*/
+ while (!list_empty(_kset->list)) {
+ dev = list_entry(devices_kset->list.prev, struct device,
+ kobj.entry);
+
+ /*
+* hold reference count of device's parent to
+* prevent it from being freed because parent's
+* lock is to be held
+*/
+
