[2/2] tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)

Commit Message

[e-mail] June 19, 2016, 8:20 a.m. UTC

From: Jason Gunthorpe <[e-mail]>

The command flow is exactly the same, the core simply needs to probe
for TPM 2.0 capability.

Signed-off-by: Andrew Azmansky <[e-mail]>
Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1 +
 drivers/char/tpm/tpm_i2c_nuvoton.c                        | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Rob Herring (Arm) June 20, 2016, 5:59 p.m. UTC | #1

On Sun, Jun 19, 2016 at 11:20:01AM +0300, andrew zamansky wrote:
> From: Jason Gunthorpe <[e-mail]>
> 
> The command flow is exactly the same, the core simply needs to probe
> for TPM 2.0 capability.
> 
> Signed-off-by: Andrew Azmansky <[e-mail]>
> Signed-off-by: Jason Gunthorpe <[e-mail]>
> ---
>  Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1 +

Acked-by: Rob Herring <[e-mail]>

>  drivers/char/tpm/tpm_i2c_nuvoton.c                        | 7 ++++---
>  2 files changed, 5 insertions(+), 3 deletions(-)

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports. http://sdm.link/zohomanageengine

Patch

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 53987449..d4f6542 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -62,6 +62,7 @@  national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware M
 national,lm85		Temperature sensor with integrated fan control
 national,lm92		±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface
 nuvoton,npct501		i2c trusted platform module (TPM)
+nuvoton,npct601		i2c trusted platform module (TPM2)
 nxp,pca9556		Octal SMBus and I2C registered interface
 nxp,pca9557		8-bit I2C-bus and SMBus I/O port with reset
 nxp,pcf8563		Real-time clock/calendar
diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
index b64effc..dbf6095 100644
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -1,5 +1,5 @@ 
 /******************************************************************************
- * Nuvoton TPM I2C Device Driver Interface for WPCT301/NPCT501,
+ * Nuvoton TPM I2C Device Driver Interface for WPCT301/NPCT501/NPCT6XX,
  * based on the TCG TPM Interface Spec version 1.2.
  * Specifications at www.trustedcomputinggroup.org
  *
@@ -163,7 +163,7 @@  static int i2c_nuvoton_get_burstcount(struct i2c_client *client,
 }
 
 /*
- * WPCT301/NPCT501 SINT# supports only dataAvail
+ * WPCT301/NPCT501/NPCT6XX SINT# supports only dataAvail
  * any call to this function which is not waiting for dataAvail will
  * set queue to NULL to avoid waiting for interrupt
  */
@@ -456,7 +456,7 @@  static bool i2c_nuvoton_req_canceled(struct tpm_chip *chip, u8 status)
 }
 
 static const struct tpm_class_ops tpm_i2c = {
-	.flags = TPM_OPS_AUTO_STARTUP,
+	.flags = TPM_OPS_AUTO_STARTUP | TPM_OPS_PROBE_TPM2,
 	.status = i2c_nuvoton_read_status,
 	.recv = i2c_nuvoton_recv,
 	.send = i2c_nuvoton_send,
@@ -623,6 +623,7 @@  MODULE_DEVICE_TABLE(i2c, i2c_nuvoton_id);
 static const struct of_device_id i2c_nuvoton_of_match[] = {
 	{.compatible = "nuvoton,npct501"},
 	{.compatible = "winbond,wpct301"},
+	{.compatible = "nuvoton,npct601"},
 	{},
 };
 MODULE_DEVICE_TABLE(of, i2c_nuvoton_of_match);