From: Stefan Wahren <wahrenst@gmx.net>
To: Peter Huewe <peterhuewe@gmx.de>,
Jarkko Sakkinen <jarkko@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>
Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
Stefan Berger <stefanb@linux.ibm.com>,
Stefan Wahren <wahrenst@gmx.net>
Subject: [PATCH RFC 1/2] tpm: tpm_tis_spi: Ensure SPI mode 0
Date: Fri, 6 Sep 2024 08:09:46 +0200 [thread overview]
Message-ID: <20240906060947.4844-2-wahrenst@gmx.net> (raw)
In-Reply-To: <20240906060947.4844-1-wahrenst@gmx.net>
According to TCG PC Client Platform TPM Profile (PTP) Specification
only SPI mode 0 is supported. In order to ensure the SPI controller
supports the necessary settings, call spi_setup() and bail out
as soon as possible in error case.
This change should affect all supported TPM SPI devices, because
tpm_tis_spi_probe is either called direct or indirectly.
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
drivers/char/tpm/tpm_tis_spi_main.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
index 61b42c83ced8..e62d297b040e 100644
--- a/drivers/char/tpm/tpm_tis_spi_main.c
+++ b/drivers/char/tpm/tpm_tis_spi_main.c
@@ -248,6 +248,17 @@ static int tpm_tis_spi_write_bytes(struct tpm_tis_data *data, u32 addr,
int tpm_tis_spi_init(struct spi_device *spi, struct tpm_tis_spi_phy *phy,
int irq, const struct tpm_tis_phy_ops *phy_ops)
{
+ int ret;
+
+ spi->mode &= ~SPI_MODE_X_MASK;
+ spi->mode |= SPI_MODE_0;
+
+ ret = spi_setup(spi);
+ if (ret < 0) {
+ dev_err(&spi->dev, "SPI setup failed: %d\n", ret);
+ return ret;
+ }
+
phy->iobuf = devm_kmalloc(&spi->dev, SPI_HDRSIZE + MAX_SPI_FRAMESIZE, GFP_KERNEL);
if (!phy->iobuf)
return -ENOMEM;
--
2.34.1
next prev parent reply other threads:[~2024-09-06 6:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 6:09 [PATCH RFC 0/2] tpm: Minor improvements Stefan Wahren
2024-09-06 6:09 ` Stefan Wahren [this message]
2024-09-06 9:47 ` [PATCH RFC 1/2] tpm: tpm_tis_spi: Ensure SPI mode 0 Jarkko Sakkinen
2024-09-06 14:46 ` Stefan Wahren
2024-09-09 17:05 ` Jarkko Sakkinen
2024-09-09 17:16 ` Stefan Wahren
2024-09-06 6:09 ` [PATCH RFC 2/2] tpm: tpm_tis: Provide error messages in tpm_tis_core_init Stefan Wahren
2024-09-06 9:50 ` Jarkko Sakkinen
2024-09-06 14:42 ` Stefan Wahren
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=20240906060947.4844-2-wahrenst@gmx.net \
--to=wahrenst@gmx.net \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=stefanb@linux.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
all inboxes | Powered by JetHome®