On Thu, May 25, 2017 at 4:06 PM, Josh Zimmerman <joshz@xxxxxxxxxx> wrote:
> 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 <joshz@xxxxxxxxxx>
> Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
>
> -----
> v2: Add Signed-off-by.
> v3: Remove logically separate change.
> v4: Add "acked-by" and "cc".
> ---
> drivers/base/core.c | 5 +++++
> include/linux/device.h | 2 ++
> 2 files changed, 7 insertions(+)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index 6bb60fb6a30b..687668d9afbe 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -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");
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 9ef518af5515..f240baac2001 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -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);
> --
> 2.13.0.219.gdb65acc882-goog
>
This was not meant to be sent explicitly to stable@; git send-email
"helpfully" added stable@ to the emails cc's despite my --suppress-cc
argument. Apologies.
Josh