From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750796AbdANAJ6 (ORCPT ); Fri, 13 Jan 2017 19:09:58 -0500 Received: from mail-pf0-f173.google.com ([209.85.192.173]:36065 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbdANAJ5 (ORCPT ); Fri, 13 Jan 2017 19:09:57 -0500 From: Andrey Pronin To: Peter Huewe , Marcel Selhorst , Jarkko Sakkinen Cc: Andrey Pronin , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, semenzato@chromium.org, groeck@chromium.org Subject: [PATCH] tpm/tpm_i2c_infineon: ensure no ongoing commands on shutdown Date: Fri, 13 Jan 2017 16:09:54 -0800 Message-Id: <20170114000954.17728-1-apronin@chromium.org> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Resetting TPM while processing a command may lead to issues on the next boot. Ensure that we don't have any ongoing commands, and that no further commands can be sent to the chip by unregistering the device in the shutdown handler. tpm_chip_unregister() waits for the completion of an ongoing command, if any, and then clears out chip->ops and unregisters sysfs entities. Signed-off-by: Andrey Pronin --- drivers/char/tpm/tpm_i2c_infineon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c index 62ee44e57ddc..0c829fe26561 100644 --- a/drivers/char/tpm/tpm_i2c_infineon.c +++ b/drivers/char/tpm/tpm_i2c_infineon.c @@ -689,14 +689,18 @@ static int tpm_tis_i2c_probe(struct i2c_client *client, return rc; } -static int tpm_tis_i2c_remove(struct i2c_client *client) +static void tpm_tis_i2c_shutdown(struct i2c_client *client) { struct tpm_chip *chip = tpm_dev.chip; tpm_chip_unregister(chip); release_locality(chip, tpm_dev.locality, 1); tpm_dev.client = NULL; +} +static int tpm_tis_i2c_remove(struct i2c_client *client) +{ + tpm_tis_i2c_shutdown(client); return 0; } @@ -704,6 +708,7 @@ static struct i2c_driver tpm_tis_i2c_driver = { .id_table = tpm_tis_i2c_table, .probe = tpm_tis_i2c_probe, .remove = tpm_tis_i2c_remove, + .shutdown = tpm_tis_i2c_shutdown, .driver = { .name = "tpm_i2c_infineon", .pm = &tpm_tis_i2c_ops, -- 2.11.0.483.g087da7b7c-goog