From: Jerry Snitselaar <jsnitsel@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Christian Bundy <christianbundy@fraction.io>,
Dan Williams <dan.j.williams@intel.com>,
Peter Huewe <peterhuewe@gmx.de>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
stable@vger.kernel.org, linux-integrity@vger.kernel.org
Subject: [PATCH v2] tpm_tis: reserve chip for duration of tpm_tis_core_init
Date: Wed, 11 Dec 2019 16:54:55 -0700 [thread overview]
Message-ID: <20191211235455.24424-1-jsnitsel@redhat.com> (raw)
In-Reply-To: <20191211231758.22263-1-jsnitsel@redhat.com>
Instead of repeatedly calling tpm_chip_start/tpm_chip_stop when
issuing commands to the tpm during initialization, just reserve the
chip after wait_startup, and release it when we are ready to call
tpm_chip_register.
Cc: Christian Bundy <christianbundy@fraction.io>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Peter Huewe <peterhuewe@gmx.de>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Cc: linux-integrity@vger.kernel.org
Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()")
Fixes: 5b359c7c4372 ("tpm_tis_core: Turn on the TPM before probing IRQ's")
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
v2: Fix integrity list address and add 5b359c7c4372 to fixes
drivers/char/tpm/tpm_tis_core.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 8af2cee1a762..308756d278b3 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -978,13 +978,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
if (wait_startup(chip, 0) != 0) {
rc = -ENODEV;
- goto out_err;
+ goto out_start;
}
/* Take control of the TPM's interrupt hardware and shut it off */
rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
if (rc < 0)
- goto out_err;
+ goto out_start;
intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT |
TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT;
@@ -993,9 +993,8 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
rc = tpm_chip_start(chip);
if (rc)
- goto out_err;
+ goto out_start;
rc = tpm2_probe(chip);
- tpm_chip_stop(chip);
if (rc)
goto out_err;
@@ -1059,7 +1058,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
goto out_err;
}
- tpm_chip_start(chip);
chip->flags |= TPM_CHIP_FLAG_IRQ;
if (irq) {
tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
@@ -1070,18 +1068,17 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
} else {
tpm_tis_probe_irq(chip, intmask);
}
- tpm_chip_stop(chip);
}
+ tpm_chip_stop(chip);
rc = tpm_chip_register(chip);
if (rc)
- goto out_err;
-
- if (chip->ops->clk_enable != NULL)
- chip->ops->clk_enable(chip, false);
+ goto out_start;
return 0;
out_err:
+ tpm_chip_stop(chip);
+out_start:
if ((chip->ops != NULL) && (chip->ops->clk_enable != NULL))
chip->ops->clk_enable(chip, false);
--
2.24.0
next prev parent reply other threads:[~2019-12-11 23:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 23:17 [PATCH] tpm_tis: reserve chip for duration of tpm_tis_core_init Jerry Snitselaar
2019-12-11 23:26 ` Jerry Snitselaar
2019-12-11 23:30 ` Dan Williams
2019-12-11 23:49 ` Jerry Snitselaar
2019-12-11 23:54 ` Jerry Snitselaar [this message]
2019-12-12 2:15 ` [PATCH v2] " Dan Williams
2019-12-12 2:18 ` Dan Williams
2019-12-17 1:25 ` Jarkko Sakkinen
2019-12-17 0:58 ` Jarkko Sakkinen
2019-12-17 1:18 ` Dan Williams
2019-12-17 2:00 ` Jerry Snitselaar
2019-12-17 2:14 ` Dan Williams
2019-12-17 12:05 ` Jarkko Sakkinen
2019-12-17 17:18 ` Jerry Snitselaar
2019-12-17 17:26 ` Jerry Snitselaar
2019-12-18 23:09 ` Jarkko Sakkinen
2019-12-18 23:06 ` Jarkko Sakkinen
2019-12-18 23:31 ` Dan Williams
2019-12-19 10:07 ` Jerry Snitselaar
2019-12-27 5:09 ` Jarkko Sakkinen
2019-12-27 5:42 ` Jarkko Sakkinen
2019-12-27 6:03 ` Jarkko Sakkinen
2019-12-17 20:29 ` Jerry Snitselaar
2019-12-18 23:12 ` Jarkko Sakkinen
2019-12-17 1:19 ` Jarkko Sakkinen
2019-12-17 0:43 ` [PATCH] " Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191211235455.24424-1-jsnitsel@redhat.com \
--to=jsnitsel@redhat.com \
--cc=christianbundy@fraction.io \
--cc=dan.j.williams@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=stable@vger.kernel.org \
--cc=stefanb@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).