From: Alexander Steffen <Alexander.Steffen@infineon.com>
To: jarkko.sakkinen@linux.intel.com,
tpmdd-devel@lists.sourceforge.net, benoit.houyere@st.com
Cc: linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
Alexander Steffen <Alexander.Steffen@infineon.com>,
stable@vger.kernel.org
Subject: [PATCH RESEND v3 1/2] tpm_tis_spi: Use DMA-safe memory for SPI transfers
Date: Thu, 31 Aug 2017 18:58:18 +0200 [thread overview]
Message-ID: <20170831165819.13544-2-Alexander.Steffen@infineon.com> (raw)
In-Reply-To: <20170831165819.13544-1-Alexander.Steffen@infineon.com>
The buffers used as tx_buf/rx_buf in a SPI transfer need to be DMA-safe.
This cannot be guaranteed for the buffers passed to tpm_tis_spi_read_bytes
and tpm_tis_spi_write_bytes. Therefore, we need to use our own DMA-safe
buffer and copy the data to/from it.
The buffer needs to be allocated separately, to ensure that it is
cacheline-aligned and not shared with other data, so that DMA can work
correctly.
Fixes: 0edbfea537d1 ("tpm/tpm_tis_spi: Add support for spi phy")
Cc: stable@vger.kernel.org
Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm_tis_spi.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c
index 88fe72a..05ce841 100644
--- a/drivers/char/tpm/tpm_tis_spi.c
+++ b/drivers/char/tpm/tpm_tis_spi.c
@@ -47,8 +47,8 @@ struct tpm_tis_spi_phy {
struct tpm_tis_data priv;
struct spi_device *spi_device;
- u8 tx_buf[4];
- u8 rx_buf[4];
+ u8 *tx_buf;
+ u8 *rx_buf;
};
static inline struct tpm_tis_spi_phy *to_tpm_tis_spi_phy(struct tpm_tis_data *data)
@@ -115,10 +115,9 @@ static int tpm_tis_spi_transfer(struct tpm_tis_data *data, u32 addr, u16 len,
if (direction) {
spi_xfer.tx_buf = NULL;
- spi_xfer.rx_buf = buffer;
} else {
- spi_xfer.tx_buf = buffer;
spi_xfer.rx_buf = NULL;
+ memcpy(phy->tx_buf, buffer, transfer_len);
}
spi_message_init(&m);
@@ -127,6 +126,9 @@ static int tpm_tis_spi_transfer(struct tpm_tis_data *data, u32 addr, u16 len,
if (ret < 0)
goto exit;
+ if (direction)
+ memcpy(buffer, phy->rx_buf, transfer_len);
+
len -= transfer_len;
buffer += transfer_len;
}
@@ -194,6 +196,14 @@ static int tpm_tis_spi_probe(struct spi_device *dev)
phy->spi_device = dev;
+ phy->tx_buf = devm_kmalloc(&dev->dev, MAX_SPI_FRAMESIZE, GFP_KERNEL);
+ if (!phy->tx_buf)
+ return -ENOMEM;
+
+ phy->rx_buf = devm_kmalloc(&dev->dev, MAX_SPI_FRAMESIZE, GFP_KERNEL);
+ if (!phy->rx_buf)
+ return -ENOMEM;
+
return tpm_tis_core_init(&dev->dev, &phy->priv, -1, &tpm_spi_phy_ops,
NULL);
}
--
2.7.4
next prev parent reply other threads:[~2017-08-31 16:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 16:58 [PATCH RESEND v3 0/2] tpm_tis_spi: Use DMA-safe memory Alexander Steffen
2017-08-31 16:58 ` Alexander Steffen [this message]
2017-08-31 16:58 ` [PATCH RESEND v3 2/2] tpm_tis_spi: Use a single buffer for SPI transfers Alexander Steffen
2017-09-02 10:54 ` [PATCH RESEND v3 0/2] tpm_tis_spi: Use DMA-safe memory Jarkko Sakkinen
2017-09-06 12:54 ` Jarkko Sakkinen
2017-09-08 12:11 ` 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=20170831165819.13544-2-Alexander.Steffen@infineon.com \
--to=alexander.steffen@infineon.com \
--cc=benoit.houyere@st.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/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).