Skip to contentSkip to conversation

Add "shutdown" to "struct class".

PATCH Superseded Josh Zimmerman 3 participants 4 messages May 12, 2017 – May 15, 2017 Driver core

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add "shutdown" to "struct class".

The TPM class has some common shutdown code that must be executed for all drivers. This adds some needed functionality for that.

(In addition, update a comment to reflect an out-of-date path.)

---
 drivers/base/core.c    | 5 +++++
 include/linux/device.h | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/base/core.c +5 -0
index bbecaf9293be..5c1648875e94 100644
@@ -2667,6 +2667,11 @@ void device_shutdown(void)
 		pm_runtime_get_noresume(dev);
 		pm_runtime_barrier(dev);
 
+		if (dev->class && dev->class->shutdown) {
+			if (initcall_debug)
+				dev_info(dev, "shutdown\n");
+			dev->class->shutdown(dev);
+		}
 		if (dev->bus && dev->bus->shutdown) {
 			if (initcall_debug)
 				dev_info(dev, "shutdown\n");
include/linux/device.h +3 -1
index 9ef518af5515..a150f8d3b3f1 100644
@@ -378,6 +378,7 @@ int subsys_virtual_register(struct bus_type *subsys,
  * @suspend:	Used to put the device to sleep mode, usually to a low power
  *		state.
  * @resume:	Used to bring the device from the sleep mode.
+ * @shutdown:	Called at shut-down time to quiesce the device.
  * @ns_type:	Callbacks so sysfs can detemine namespaces.
  * @namespace:	Namespace of the device belongs to this class.
  * @pm:		The default device power management operations of this class.
@@ -407,6 +408,7 @@ struct class {
 
 	int (*suspend)(struct device *dev, pm_message_t state);
 	int (*resume)(struct device *dev);
+	int (*shutdown)(struct device *dev);
 
 	const struct kobj_ns_type_operations *ns_type;
 	const void *(*namespace)(struct device *dev);
@@ -1228,7 +1230,7 @@ static inline int devtmpfs_delete_node(struct device *dev) { return 0; }
 static inline int devtmpfs_mount(const char *mountpoint) { return 0; }
 #endif
 
-/* drivers/base/power/shutdown.c */
+/* drivers/base/core.c */
 extern void device_shutdown(void);
 
 /* debugging and troubleshooting/diagnostic helpers. */
Signature · 6 lines
2.13.0.rc2.291.g57267f2277-goog


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
#1 lore raw
Quoted 2 lines

The TPM class has some common shutdown code that must be executed for all drivers. This adds some needed functionality for that

The issue with this is, that on some platforms the only storage can be eMMC and TPM is using it,. It has to be ensured that the storage device won't go down before TPM2_shutdown is called. And there is no direct device hierarchy to ensure an orderly shutdown.
Tomas

Quoted 58 lines

(In addition, update a comment to reflect an out-of-date path.)

---
 drivers/base/core.c    | 5 +++++
 include/linux/device.h | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/base/core.c index renamed from drivers/base/core.c +0 -0

bbecaf9293be..5c1648875e94 100644

drivers/base/core.c +5 -0
@@ -2667,6 +2667,11 @@ void device_shutdown(void)
 		pm_runtime_get_noresume(dev);
 		pm_runtime_barrier(dev);
 
+		if (dev->class && dev->class->shutdown) {
+			if (initcall_debug)
+				dev_info(dev, "shutdown\n");
+			dev->class->shutdown(dev);
+		}
 		if (dev->bus && dev->bus->shutdown) {
 			if (initcall_debug)
 				dev_info(dev, "shutdown\n");
include/linux/device.h index renamed from include/linux/device.h +0 -0

9ef518af5515..a150f8d3b3f1 100644

include/linux/device.h +0 -0
@@ -378,6 +378,7 @@ int subsys_virtual_register(struct bus_type *subsys,
  * @suspend:	Used to put the device to sleep mode, usually to a low

power
* state.
* @resume: Used to bring the device from the sleep mode.
+ * @shutdown: Called at shut-down time to quiesce the device.
* @ns_type: Callbacks so sysfs can detemine namespaces.
* @namespace: Namespace of the device belongs to this class.
* @pm: The default device power management operations of
this class.

include/linux/device.h +1 -0
@@ -407,6 +408,7 @@ struct class {
 
 	int (*suspend)(struct device *dev, pm_message_t state);
 	int (*resume)(struct device *dev);
+	int (*shutdown)(struct device *dev);
 
 	const struct kobj_ns_type_operations *ns_type;
 	const void *(*namespace)(struct device *dev); @@ -1228,7 +1230,7

@@ static inline int devtmpfs_delete_node(struct device *dev) { return 0; } static inline int devtmpfs_mount(const char *mountpoint) { return 0; } #endif

include/linux/device.h +1 -2
-/* drivers/base/power/shutdown.c */
+/* drivers/base/core.c */
 extern void device_shutdown(void);
 
 /* debugging and troubleshooting/diagnostic helpers. */
--

2.13.0.rc2.291.g57267f2277-goog

Quoted 7 lines

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
tpmdd-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot

#2 lore raw
Quoted 7 lines · Tomas
Quoted 2 lines

The TPM class has some common shutdown code that must be executed for all drivers. This adds some needed functionality for that

The issue with this is, that on some platforms the only storage can be eMMC and TPM is using it,. It has to be ensured that the storage device won't go down before TPM2_shutdown is called. And there is no direct device hierarchy to ensure an orderly shutdown.

Something will have to use the new device links stuff to define that dependency, but that seems unrelated to this patch?

Can the kernel really shut down the eMMC while the hidden platform stuff is still possibly using it? Goofy..

Jason

#3 lore raw
Quoted 12 lines · Tomas
Quoted 7 lines
Quoted 2 lines

The TPM class has some common shutdown code that must be executed for all drivers. This adds some needed functionality for that

The issue with this is, that on some platforms the only storage can be eMMC and TPM is using it,. It has to be ensured that the storage device won't go down before TPM2_shutdown is called. And there is no direct device hierarchy to ensure an orderly shutdown.

Something will have to use the new device links stuff to define that dependency, but that seems unrelated to this patch?

Yep, it's not directly related to this specific patch, this is more relevant particularly to TPM2_shutdown.

Quoted 2 lines

Can the kernel really shut down the eMMC while the hidden platform stuff is still possibly using it? Goofy..

eMMC is single headed, so yes that can happen.

Tomas

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot