Commit f77af151 authored by Josh Zimmerman's avatar Josh Zimmerman Committed by James Morris
Browse files

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.

Signed-off-by: default avatarJosh Zimmerman <joshz@google.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Fixes: 74d6b3ce ("tpm: fix suspend/resume paths for TPM 2.0")
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent b4b8cbf6

drivers/base/core.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -2664,7 +2664,11 @@ void device_shutdown(void) 
		pm_runtime_get_noresume(dev);

		pm_runtime_get_noresume(dev);

		pm_runtime_barrier(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)

			if (initcall_debug)

				dev_info(dev, "shutdown\n");

				dev_info(dev, "shutdown\n");

			dev->bus->shutdown(dev);

			dev->bus->shutdown(dev);

include/linux/device.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -375,6 +375,7 @@ int subsys_virtual_register(struct bus_type *subsys, 
 * @suspend:	Used to put the device to sleep mode, usually to a low power

 * @suspend:	Used to put the device to sleep mode, usually to a low power

 *		state.

 *		state.

 * @resume:	Used to bring the device from the sleep mode.

 * @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.

 * @ns_type:	Callbacks so sysfs can detemine namespaces.

 * @namespace:	Namespace of the device belongs to this class.

 * @namespace:	Namespace of the device belongs to this class.

 * @pm:		The default device power management operations of this class.

 * @pm:		The default device power management operations of this class.
@@ -403,6 +404,7 @@ struct class { 




	int (*suspend)(struct device *dev, pm_message_t state);

	int (*suspend)(struct device *dev, pm_message_t state);

	int (*resume)(struct device *dev);

	int (*resume)(struct device *dev);

	int (*shutdown)(struct device *dev);





	const struct kobj_ns_type_operations *ns_type;

	const struct kobj_ns_type_operations *ns_type;

	const void *(*namespace)(struct device *dev);

	const void *(*namespace)(struct device *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE