On Tue, May 30, 2017 at 12:54 AM, Jarkko Sakkinen
<[email protected]> wrote:
> On Thu, May 25, 2017 at 04:20:30PM -0700, Josh Zimmerman 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 <[email protected]>
>> Acked-by: Greg Kroah-Hartman <[email protected]>
>> Cc: [email protected]
>
> Does not apply yet to security-next (ancestor missing).
Hm, it applied cleanly for me to the "next" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git.
Are you referring to something else with "security-next"?
>> -----
>> 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) {
I just looked again at this line, which I am suddenly skeptical of. Is there
any reason to run _both_ the class and the bus or driver shutdown
functions? In the code as-is, only the bus or the driver function will
execute. Right now, this patch will change that behavior. I suspect I
should just add the appropriate "else", but I'm not sure if there is
some reason to prefer the behavior as implemented in this version of
the patch.
>> 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
------------------------------------------------------------------------------
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
