[RFC,1/2] tpm: Make implementation of read16/read32/write32 optional
diff mbox series

Message ID 20190718170355.6464-2-Alexander.Steffen@infineon.com
State New
Headers show
Series
  • tpm: Simple implementation of tpm_tis_i2c
Related show

Commit Message

Alexander Steffen July 18, 2019, 5:03 p.m. UTC
Only tpm_tis has a faster way to access multiple bytes at once, every other
driver will just fall back to read_bytes/write_bytes. Therefore, move this
common code out of tpm_tis_spi into tpm_tis_core, so that it is
automatically used when low-level drivers do not implement the specialized
methods.

Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
---
 drivers/char/tpm/tpm_tis_core.h | 41 ++++++++++++++++++++++++++++++---
 drivers/char/tpm/tpm_tis_spi.c  | 41 ---------------------------------
 2 files changed, 38 insertions(+), 44 deletions(-)

Comments

Jarkko Sakkinen Aug. 2, 2019, 8:12 p.m. UTC | #1
On Thu, Jul 18, 2019 at 07:03:54PM +0200, Alexander Steffen wrote:
> Only tpm_tis has a faster way to access multiple bytes at once, every other
> driver will just fall back to read_bytes/write_bytes. Therefore, move this
> common code out of tpm_tis_spi into tpm_tis_core, so that it is
> automatically used when low-level drivers do not implement the specialized
> methods.
> 
> Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
> ---
>  drivers/char/tpm/tpm_tis_core.h | 41 ++++++++++++++++++++++++++++++---
>  drivers/char/tpm/tpm_tis_spi.c  | 41 ---------------------------------
>  2 files changed, 38 insertions(+), 44 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
> index 7337819f5d7b..2c6557b29a1d 100644
> --- a/drivers/char/tpm/tpm_tis_core.h
> +++ b/drivers/char/tpm/tpm_tis_core.h
> @@ -122,13 +122,37 @@ static inline int tpm_tis_read8(struct tpm_tis_data *data, u32 addr, u8 *result)
>  static inline int tpm_tis_read16(struct tpm_tis_data *data, u32 addr,
>  				 u16 *result)
>  {
> -	return data->phy_ops->read16(data, addr, result);
> +	if (data->phy_ops->read16) {
> +		return data->phy_ops->read16(data, addr, result);
> +	} else {
> +		__le16 result_le;
> +		int rc;
> +
> +		rc = data->phy_ops->read_bytes(data, addr, sizeof(u16),
> +					       (u8 *)&result_le);
> +		if (!rc)
> +			*result = le16_to_cpu(result_le);
> +
> +		return rc;
> +	}

Looks great.

I prefer to have variable declarations in the beginning of function for
most of the time. Other than that looks legit.

/Jarkko

Patch
diff mbox series

diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index 7337819f5d7b..2c6557b29a1d 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -122,13 +122,37 @@  static inline int tpm_tis_read8(struct tpm_tis_data *data, u32 addr, u8 *result)
 static inline int tpm_tis_read16(struct tpm_tis_data *data, u32 addr,
 				 u16 *result)
 {
-	return data->phy_ops->read16(data, addr, result);
+	if (data->phy_ops->read16) {
+		return data->phy_ops->read16(data, addr, result);
+	} else {
+		__le16 result_le;
+		int rc;
+
+		rc = data->phy_ops->read_bytes(data, addr, sizeof(u16),
+					       (u8 *)&result_le);
+		if (!rc)
+			*result = le16_to_cpu(result_le);
+
+		return rc;
+	}
 }
 
 static inline int tpm_tis_read32(struct tpm_tis_data *data, u32 addr,
 				 u32 *result)
 {
-	return data->phy_ops->read32(data, addr, result);
+	if (data->phy_ops->read32) {
+		return data->phy_ops->read32(data, addr, result);
+	} else {
+		__le32 result_le;
+		int rc;
+
+		rc = data->phy_ops->read_bytes(data, addr, sizeof(u32),
+					       (u8 *)&result_le);
+		if (!rc)
+			*result = le32_to_cpu(result_le);
+
+		return rc;
+	}
 }
 
 static inline int tpm_tis_write_bytes(struct tpm_tis_data *data, u32 addr,
@@ -145,7 +169,18 @@  static inline int tpm_tis_write8(struct tpm_tis_data *data, u32 addr, u8 value)
 static inline int tpm_tis_write32(struct tpm_tis_data *data, u32 addr,
 				  u32 value)
 {
-	return data->phy_ops->write32(data, addr, value);
+	if (data->phy_ops->write32) {
+		return data->phy_ops->write32(data, addr, value);
+	} else {
+		__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 inline bool is_bsw(void)
diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c
index 19513e622053..da82924b08fe 100644
--- a/drivers/char/tpm/tpm_tis_spi.c
+++ b/drivers/char/tpm/tpm_tis_spi.c
@@ -146,50 +146,9 @@  static int tpm_tis_spi_write_bytes(struct tpm_tis_data *data, u32 addr,
 	return tpm_tis_spi_transfer(data, addr, len, NULL, value);
 }
 
-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_le);
-	if (!rc)
-		*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_le);
-	if (!rc)
-		*result = le32_to_cpu(result_le);
-
-	return rc;
-}
-
-static int tpm_tis_spi_write32(struct tpm_tis_data *data, u32 addr, u32 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 = {
 	.read_bytes = tpm_tis_spi_read_bytes,
 	.write_bytes = tpm_tis_spi_write_bytes,
-	.read16 = tpm_tis_spi_read16,
-	.read32 = tpm_tis_spi_read32,
-	.write32 = tpm_tis_spi_write32,
 };
 
 static int tpm_tis_spi_probe(struct spi_device *dev)