Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1731743 > unrolled thread
| Started by | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| First post | 2017-09-13 19:30 +0200 |
| Last post | 2017-09-13 21:00 +0200 |
| Articles | 2 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH 3/3] tpm: fix type of a local variables in tpm_tis_spi.c Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2017-09-13 19:30 +0200
Re: [PATCH 3/3] tpm: fix type of a local variables in tpm_tis_spi.c Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2017-09-13 21:00 +0200
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2017-09-13 19:30 +0200 |
| Subject | [PATCH 3/3] tpm: fix type of a local variables in tpm_tis_spi.c |
| Message-ID | <upjE6-1RR-23@gated-at.bofh.it> |
Use __le32 type for data in that format.
Fixes: 0edbfea537d1 ("tpm/tpm_tis_spi: Add support for spi phy")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm_tis_spi.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c
index 7e97eb07b200..bfe972959183 100644
--- a/drivers/char/tpm/tpm_tis_spi.c
+++ b/drivers/char/tpm/tpm_tis_spi.c
@@ -153,29 +153,40 @@ static int tpm_tis_spi_write_bytes(struct tpm_tis_data *data, u32 addr,
static int tpm_tis_spi_read16(struct tpm_tis_data *data, u32 addr, u16 *result)
{
+ __le16 result_le;
int rc;
- rc = data->phy_ops->read_bytes(data, addr, sizeof(u16), (u8 *)result);
+ rc = data->phy_ops->read_bytes(data, addr, sizeof(u16),
+ (u8 *)&result_le);
if (!rc)
- *result = le16_to_cpu(*result);
+ *result = le16_to_cpu(result_le);
+
return rc;
}
static int tpm_tis_spi_read32(struct tpm_tis_data *data, u32 addr, u32 *result)
{
+ __le32 result_le;
int rc;
- rc = data->phy_ops->read_bytes(data, addr, sizeof(u32), (u8 *)result);
+ rc = data->phy_ops->read_bytes(data, addr, sizeof(u32),
+ (u8 *)&result_le);
if (!rc)
- *result = le32_to_cpu(*result);
+ *result = le32_to_cpu(result_le);
+
return rc;
}
static int tpm_tis_spi_write32(struct tpm_tis_data *data, u32 addr, u32 value)
{
- value = cpu_to_le32(value);
- return data->phy_ops->write_bytes(data, addr, sizeof(u32),
- (u8 *)&value);
+ __le32 value_le;
+ int rc;
+
+ value_le = cpu_to_le32(value);
+ rc = data->phy_ops->write_bytes(data, addr, sizeof(u32),
+ (u8 *)&value_le);
+
+ return rc;
}
static const struct tpm_tis_phy_ops tpm_spi_phy_ops = {
--
2.14.1
[toc] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2017-09-13 21:00 +0200 |
| Message-ID | <upl3b-2DF-9@gated-at.bofh.it> |
| In reply to | #1731743 |
Applied (as other similar) already to master because these are
very obvious things to fix. I'll wait for reviews and tests before
applying to next.
/Jarkko
On Wed, Sep 13, 2017 at 10:26:54AM -0700, Jarkko Sakkinen wrote:
> Use __le32 type for data in that format.
>
> Fixes: 0edbfea537d1 ("tpm/tpm_tis_spi: Add support for spi phy")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
> drivers/char/tpm/tpm_tis_spi.c | 25 ++++++++++++++++++-------
> 1 file changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c
> index 7e97eb07b200..bfe972959183 100644
> --- a/drivers/char/tpm/tpm_tis_spi.c
> +++ b/drivers/char/tpm/tpm_tis_spi.c
> @@ -153,29 +153,40 @@ static int tpm_tis_spi_write_bytes(struct tpm_tis_data *data, u32 addr,
>
> static int tpm_tis_spi_read16(struct tpm_tis_data *data, u32 addr, u16 *result)
> {
> + __le16 result_le;
> int rc;
>
> - rc = data->phy_ops->read_bytes(data, addr, sizeof(u16), (u8 *)result);
> + rc = data->phy_ops->read_bytes(data, addr, sizeof(u16),
> + (u8 *)&result_le);
> if (!rc)
> - *result = le16_to_cpu(*result);
> + *result = le16_to_cpu(result_le);
> +
> return rc;
> }
>
> static int tpm_tis_spi_read32(struct tpm_tis_data *data, u32 addr, u32 *result)
> {
> + __le32 result_le;
> int rc;
>
> - rc = data->phy_ops->read_bytes(data, addr, sizeof(u32), (u8 *)result);
> + rc = data->phy_ops->read_bytes(data, addr, sizeof(u32),
> + (u8 *)&result_le);
> if (!rc)
> - *result = le32_to_cpu(*result);
> + *result = le32_to_cpu(result_le);
> +
> return rc;
> }
>
> static int tpm_tis_spi_write32(struct tpm_tis_data *data, u32 addr, u32 value)
> {
> - value = cpu_to_le32(value);
> - return data->phy_ops->write_bytes(data, addr, sizeof(u32),
> - (u8 *)&value);
> + __le32 value_le;
> + int rc;
> +
> + value_le = cpu_to_le32(value);
> + rc = data->phy_ops->write_bytes(data, addr, sizeof(u32),
> + (u8 *)&value_le);
> +
> + return rc;
> }
>
> static const struct tpm_tis_phy_ops tpm_spi_phy_ops = {
> --
> 2.14.1
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web