Patch "Add "shutdown" to "struct class"." has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 18, 2017

Subsystems (2)

Stable branch Driver core

lore

Share & tools

lore

[email protected]

author maintainer Applied

2017-07-18 15:50 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

Add "shutdown" to "struct class".

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
add-shutdown-to-struct-class.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f77af15165847406b15d8f70c382c4cb15846b2a Mon Sep 17 00:00:00 2001

From: Josh Zimmerman <[email protected]>
Date: Sun, 25 Jun 2017 14:53:23 -0700
Subject: Add "shutdown" to "struct class".

From: Josh Zimmerman <[email protected]>

commit f77af15165847406b15d8f70c382c4cb15846b2a upstream.

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

Signed-off-by Josh Zimmerman <[email protected]>

Acked-by Greg Kroah-Hartman <[email protected]>

Fixes 74d6b3ceaa17 ("tpm: fix suspend/resume paths for TPM 2.0")

Reviewed-by Jarkko Sakkinen <[email protected]>

Tested-by Jarkko Sakkinen <[email protected]>

Signed-off-by Jarkko Sakkinen <[email protected]>

Signed-off-by James Morris <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/base/core.c    |    6 +++++-
 include/linux/device.h |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

drivers/base/core.c +5 -1

@@ -2094,7 +2094,11 @@ void device_shutdown(void)
 		pm_runtime_get_noresume(dev);
 		pm_runtime_barrier(dev);
 
-		if (dev->bus && dev->bus->shutdown) {
+		if (dev->class && dev->class->shutdown) {
+			if (initcall_debug)
+				dev_info(dev, "shutdown\n");
+			dev->class->shutdown(dev);
+		} else if (dev->bus && dev->bus->shutdown) {
 			if (initcall_debug)
 				dev_info(dev, "shutdown\n");
 			dev->bus->shutdown(dev);

include/linux/device.h +2 -0

@@ -368,6 +368,7 @@ int subsys_virtual_register(struct bus_t
  * @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.

@@ -396,6 +397,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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/add-shutdown-to-struct-class.patch queue-4.4/tpm-issue-a-tpm2_shutdown-for-tpm2-devices.patch