Add tpm i2c ptp driver
Subsystems (3)
v12 cover Add tpm i2c ptp driver
From: Amir Mizinski <[email protected]>
This patch set adds support for TPM devices that implement the I2C. Interface defined by TCG PTP specification:
https://trustedcomputinggroup.org/wp-content/uploads/TCG_PC_Client_Platform_TPM_Profile_PTP_2.0_r1.03_v22.pdf
The driver was tested on Raspberry-Pie 3, using Nuvoton NPCT75X TPM.
Interrupts are not implemented yet, preparing it for the next patch.
This patch is based on initial work by oshri Alkoby, Alexander Steffen and Christophe Ricard
Changes since version 1:
-"char:tpm:Add check_data handle to tpm_tis_phy_ops in order to check data integrity"
- Fixed and extended commit description.
- Fixed an issue regarding handling max retries.
-"dt-bindings: tpm: Add YAML schema for TPM TIS I2C options":
-Converted "tpm_tis_i2c.txt" to "tpm-tis-i2c.yaml".
- Renamed "tpm_tis-i2c" to "tpm-tis-i2c".
- Removed interrupts properties.
-"char: tpm: add tpm_tis_i2c driver"
- Replaced "tpm_tis-i2c" with "tpm-tis-i2c" in "tpm_tis_i2c.c".
Addressed comments from:
- Jarkko Sakkinen: https://patchwork.kernel.org/patch/11236257/
- Rob Herring: https://patchwork.kernel.org/patch/11236253/
Changes since version 2:
- Added 2 new commits with improvements suggested by Benoit Houyere.
-"Fix expected bit handling and send all bytes in one shot without last byte in exception" -"Handle an exception for TPM Firmware Update mode."
- Updated patch to latest v5.5
-"dt-bindings: tpm: Add YAML schema for TPM TIS I2C options"
- Added "interrupts" and "crc-checksum" to properties.
- Updated binding description and commit info.
-"char: tpm: add tpm_tis_i2c driver" (suggested by Benoit Houyere)
- Added repeat I2C frame after NACK.
- Checksum I2C feature activation in DTS file configuration.
Addressed comments from:
- Rob Herring: https://lore.kernel.org/patchwork/patch/1161287/
Changes since version 3:
- Updated patch to latest v5.6
- Updated commits headlines and development credit format by Jarkko Sakkinen suggestion -"tpm: tpm_tis: Make implementation of read16 read32 write32 optional"
- Updated commit description.
-"dt-bindings: tpm: Add YAML schema for TPM TIS I2C options"
- Fixed 'make dt_binding_check' errors on YAML file.
- Removed interrupts from required and examples since there is no use for them in current patch.
Addressed comments from:
- Jarkko Sakkinen: https://lore.kernel.org/patchwork/patch/1192101/
- Rob Herring: https://lore.kernel.org/patchwork/patch/1192099/
Changes since version 4:
-"tpm: tpm_tis: Make implementation of read16 read32 write32 optional"
-Added a "Reviewed-by" tag:
-"tpm: tpm_tis: Add check_data handle to tpm_tis_phy_ops in order to check data integrity"
-Fixed credit typos.
-"tpm: tpm_tis: rewrite "tpm_tis_req_canceled()""
-Added fixes tag and removed changes for STM.
-"tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception"
-Fixed typos, edited description to be clearer, and added a "Suggested-by" tag.
-"tpm: Handle an exception for TPM Firmware Update mode."
-Added a "Suggested-by" tag.
-"dt-bindings: tpm: Add YAML schema for TPM TIS I2C options"
-Fixed 'make dt_binding_check' errors.
-"tpm: tpm_tis: add tpm_tis_i2c driver"
-Added tested-by tag by Eddie James.
-Fixed indent in Kconfig file.
-Fixed 'MODULE_DESCRIPTION'.
Addressed comments from:
- Jarkko Sakkinen: https://patchwork.kernel.org/patch/11467645/
https://patchwork.kernel.org/patch/11467655/ https://patchwork.kernel.org/patch/11467643/ https://patchwork.kernel.org/patch/11467659/ https://patchwork.kernel.org/patch/11467651/
- Rob Herring: https://patchwork.kernel.org/patch/11467653/
- Randy Dunlap: https://patchwork.kernel.org/patch/11467651/
- Eddie James: https://lore.kernel.org/patchwork/patch/1192104/
Changes since version 5:
-"tpm: tpm_tis: Add check_data handle to tpm_tis_phy_ops"
-Updated short description and fixed long description to be more clear.
Addressed comments from:
- Jarkko Sakkinen: https://lkml.org/lkml/2020/4/6/748
Changes since version 6:
-"tpm: tpm_tis: Make implementation of read16, read32 and write32 optional"
-Fixed short description.
-fixed long description proofreading issues.
-"tpm: tpm_tis: Add check_data handle to tpm_tis_phy_ops"
-Fixed long description by Jarkko comments and proofreading issues. -Replaced "check_data" with verify_data_integrity". -New line before return statement.
-"tpm: tpm_tis: rewrite "tpm_tis_req_canceled()"
-Fixed line over 80 characters.
-fixed long description proofreading issues.
-" tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot"
-fixed long description proofreading issues.
-"dt-bindings: tpm: Add YAML schema for TPM TIS I2C option"
-Replaced "tpm-tis-i2c@2e" with "tpm_tis@2e".
-Fixed CRC_Checksum description.
-"tpm: tpm_tis: add tpm_tis_i2c driver"
-Replaced "depends on CRC_CCIT" with "select CRC_CCIT". -Added tested-by tag by Joel Stanley.
-Fixed checkpatch.pl warnings.
Addressed comments from:
Addressed comments from:
- Jarkko Sakkinen:
https://lore.kernel.org/patchwork/patch/1221336/ https://lore.kernel.org/patchwork/patch/1221337/ https://lore.kernel.org/patchwork/patch/1221339/ - Joel Stanley: https://lore.kernel.org/patchwork/patch/1220543/ - Rob Herring: https://lore.kernel.org/patchwork/patch/1221334/
Changes since version 7:
- Added a new commit with improvements suggested by Benoit Houyere. -"tpm: tpm_tis: verify TPM_STS register is valid after locality request"
-"tpm: tpm_tis: Rewrite "tpm_tis_req_canceled()""
-Fixed Hash for Fixes tag.
-"tpm: Add YAML schema for TPM TIS I2C options"
-Added a compatible string specific to the nuvoton npct75x chip.
-"tpm: tpm_tis: add tpm_tis_i2c driver"
-added a compatible string according to yaml file.
Addressed comments from:
- Jarkko Sakkinen:
https://lore.kernel.org/patchwork/patch/1231524/ - Rob Herring: https://lore.kernel.org/patchwork/patch/1231526/
Changes since version 8:
- "tpm: tpm_tis: Make implementation of read16, read32 and write32 optional"
-Fixed a compile error conflicting CR50
- "tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception" -Moved commit backwards from 4/8 to 2/8 for a better flow with new data integrity check design
- "tpm: tpm_tis: Add retry in case of protocol failure or data integrity (on I2C only) failure." -Renamed from "tpm: tpm_tis: Add check_data handle to tpm_tis_phy_ops"
-Redesign and added a retry for additional error cases.
- "tpm: Add YAML schema for TPM TIS I2C options"
-Fixed Dual-license new binding
-Removed "oneOf"
-Fixed tpm_tis@2e to tpm@2e
Addressed comments from:
- Jarkko Sakkinen:
https://lore.kernel.org/patchwork/patch/1240728/ https://lore.kernel.org/patchwork/patch/1240736/ - Rob Herring: https://lore.kernel.org/patchwork/patch/1240733/
Changes since version 9:
- "tpm: Make read{16, 32}() and write32() in tpm_tis_phy_ops optional"
-Fixed short description
- "tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception" -Canceled wait_for_tpm_stat() function renaming.
-Fixed long description
- "tpm: Add YAML schema for TPM TIS I2C options"
-Added a reviewed-by tag.
Addressed comments from:
- Jarkko Sakkinen:
https://lore.kernel.org/patchwork/patch/1247163/ https://lore.kernel.org/patchwork/patch/1247164/ - Rob Herring: https://lore.kernel.org/patchwork/patch/1247161/
Changes since version 10:
- "tpm: Make read{16, 32}() and write32() in tpm_tis_phy_ops optional"
-Added a Reviewed-by and Tested-by tags
- "tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception" -Renamed "mask_result" parameter with "stat"
- "tpm: tpm_tis: Add retry in case of protocol failure or data integrity (on I2C only) failure." -Edited long description.
-Modified tpm_tis_recv() to __tpm_tis_recv() and Introduced a new tpm_tis_recv() function
Addressed comments from:
- Jarkko Sakkinen:
https://lore.kernel.org/patchwork/patch/1252428/ https://lore.kernel.org/patchwork/patch/1252422/ https://lore.kernel.org/patchwork/patch/1252424/
Cahnges since version 11:
- "tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception" -Added a "Reviewed-by" tag
-Renamed 'wait_for_tpm_stat()' function with 'tpm_tis_wait_for_stat()'
- "tpm: tpm_tis: Add retry in case of protocol failure."
-Removed data integrity check and created a new commit for it.
-Edited short and long description.
- "tpm: tpm_tis: Add verify_data_integrity handle to tpm_tis_phy_ops"
-This is a new commit.
Addressed comments from:
- Jarkko Sakkinen:
https://lore.kernel.org/patchwork/patch/1258107/ https://lore.kernel.org/patchwork/patch/1258110/
Amir Mizinski (9):
tpm: Make read{16, 32}() and write32() in tpm_tis_phy_ops optional
tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot
without last byte in exception
tpm: tpm_tis: Add retry in case of protocol failure.
tpm: tpm_tis: Add verify_data_integrity handle to tpm_tis_phy_ops
tpm: tpm_tis: Rewrite "tpm_tis_req_canceled()"
tpm: Handle an exception for TPM Firmware Update mode.
tpm: tpm_tis: verify TPM_STS register is valid after locality request
tpm: Add YAML schema for TPM TIS I2C options
tpm: tpm_tis: add tpm_tis_i2c driver
.../bindings/security/tpm/tpm-tis-i2c.yaml | 50 ++++ drivers/char/tpm/Kconfig | 12 + drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm2-cmd.c | 4 + drivers/char/tpm/tpm_tis_core.c | 158 ++++++----- drivers/char/tpm/tpm_tis_core.h | 41 ++- drivers/char/tpm/tpm_tis_i2c.c | 292 +++++++++++++++++++++ drivers/char/tpm/tpm_tis_spi.h | 4 - drivers/char/tpm/tpm_tis_spi_cr50.c | 3 - drivers/char/tpm/tpm_tis_spi_main.c | 41 --- include/linux/tpm.h | 1 + 11 files changed, 486 insertions(+), 121 deletions(-) create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm-tis-i2c.yaml create mode 100644 drivers/char/tpm/tpm_tis_i2c.c
Signature · 1 line
2.7.4
PATCH v12 1/9 tpm: Make read{16, 32}() and write32() in tpm_tis_phy_ops optional
From: Amir Mizinski <[email protected]>
Only tpm_tis can use memory-mapped I/O, which is truly mapped into the kernel's memory space. Therefore, using ioread16/ioread32/iowrite32 turns into a straightforward pointer dereference.
Every other driver requires more complicated operations to read more than one byte at a time and will just fall back to read_bytes/write_bytes. Therefore, move this common code out of tpm_tis_spi and into tpm_tis_core so that it is used automatically when low-level drivers do not implement the specialized methods.
--- drivers/char/tpm/tpm_tis_core.h | 38 +++++++++++++++++++++++++++++++--- drivers/char/tpm/tpm_tis_spi.h | 4 ---- drivers/char/tpm/tpm_tis_spi_cr50.c | 3 --- drivers/char/tpm/tpm_tis_spi_main.c | 41 ------------------------------------- 4 files changed, 35 insertions(+), 51 deletions(-)
drivers/char/tpm/tpm_tis_core.h +35 -3
@@ -122,13 +122,35 @@ 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); +__le16 result_le; +int rc; + +if (data->phy_ops->read16) +return data->phy_ops->read16 (data, addr, result); + + 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); +__le32 result_le; +int rc; + +if (data->phy_ops->read32) +return data->phy_ops->read32 (data, addr, result); + + 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 +167,17 @@ 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); +__le32 value_le; +int rc; + +if (data->phy_ops->write32) +return data->phy_ops->write32 (data, addr, value); + + 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 )
drivers/char/tpm/tpm_tis_spi.h +0 -4
@@ -31,10 +31,6 @@ extern int tpm_tis_spi_init(struct spi_device *spi, struct tpm_tis_spi_phy *phy,extern int tpm_tis_spi_transfer (struct tpm_tis_data *data,u32 addr,u16 len,u8 *in,const u8 *out); -extern int tpm_tis_spi_read16 (struct tpm_tis_data *data,u32 addr,u16 *result); -extern int tpm_tis_spi_read32 (struct tpm_tis_data *data,u32 addr,u32 *result); -extern int tpm_tis_spi_write32 (struct tpm_tis_data *data,u32 addr,u32 value); -#ifdef CONFIG_TCG_TIS_SPI_CR50 extern int cr50_spi_probe (struct spi_device *spi);#else
drivers/char/tpm/tpm_tis_spi_cr50.c +0 -3
@@ -215,9 +215,6 @@ static int tpm_tis_spi_cr50_write_bytes(struct tpm_tis_data *data, u32 addr,static const struct tpm_tis_phy_ops tpm_spi_cr50_phy_ops = { .read_bytes = tpm_tis_spi_cr50_read_bytes, .write_bytes = tpm_tis_spi_cr50_write_bytes, - .read16 = tpm_tis_spi_read16, - .read32 = tpm_tis_spi_read32, - .write32 = tpm_tis_spi_write32, };static void cr50_print_fw_version (struct tpm_tis_data *data)
drivers/char/tpm/tpm_tis_spi_main.c +0 -41
53 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v12 2/9 tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception
In reply to [email protected]From: Amir Mizinski <[email protected]>
Detected the following incorrect implementation of the send command:
polling on the TPM_STS.stsValid field followed by checking the TPM_STS.expect field only once. Since TPM_STS.stsValid represents the TPM_STS.expect validity, both fields should be polled at the same time.
This fix modifies the signature of 'wait_for_tpm_stat()', adding an additional "mask_result" parameter to its call and renaming it to 'tpm_tis_wait_for_stat()' for better alignment with other naming. 'tpm_tis_wait_for_stat()' is now polling the TPM_STS with a mask and waits for the value in mask_result. The fix adds the ability to check if certain TPM_STS bits have been cleared.
This change is also aligned to verifying the CRC on I2C TPM. The CRC verification should be done after the TPM_STS.expect field is cleared (TPM received all expected command bytes and set the calculated CRC value in the register).
In addition, the send command was changed to comply with TCG_DesignPrinciples_TPM2p0Driver_vp24_pubrev.pdf as follows:
- send all command bytes in one loop
- remove special handling of the last byte
--- drivers/char/tpm/tpm_tis_core.c | 70 +++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 44 deletions(-)
drivers/char/tpm/tpm_tis_core.c +26 -44
@@ -44,9 +44,9 @@ static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,return false; } -static int wait_for_tpm_stat (struct tpm_chip *chip,u8 mask, -unsigned long timeout,wait_queue_head_t *queue, -bool check_cancel) +static int tpm_tis_wait_for_stat (struct tpm_chip *chip,u8 mask,u8 stat, +unsigned long timeout, +wait_queue_head_t *queue,bool check_cancel) {unsigned long stop;long rc;
@@ -55,7 +55,7 @@ static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,/* check current status */ status = chip->ops->status (chip); -if ((status & mask) == mask) +if ((status & mask) == stat)return 0 ; stop = jiffies + timeout;
@@ -83,7 +83,7 @@ static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,usleep_range (TPM_TIMEOUT_USECS_MIN ,TPM_TIMEOUT_USECS_MAX ); status = chip->ops->status (chip); -if ((status & mask) == mask) +if ((status & mask) == stat)return 0 ; }while (time_before (jiffies, stop)); }
@@ -281,10 +281,11 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)int size =0 , burstcnt, rc;while (size < count) { - rc =wait_for_tpm_stat (chip, -TPM_STS_DATA_AVAIL |TPM_STS_VALID , - chip->timeout_c, - &priv->read_queue, true); + rc =tpm_tis_wait_for_stat (chip, +TPM_STS_DATA_AVAIL |TPM_STS_VALID , +TPM_STS_DATA_AVAIL |TPM_STS_VALID , + chip->timeout_c, &priv->read_queue, + true);if (rc <0 )return rc; burstcnt =get_burstcount (chip);
@@ -337,8 +338,9 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) goto out; } -if (wait_for_tpm_stat (chip,TPM_STS_VALID , chip->timeout_c, - &priv->int_queue, false) <0 ) { +if (tpm_tis_wait_for_stat (chip,TPM_STS_VALID ,TPM_STS_VALID , + chip->timeout_c, &priv->int_queue, + false) <0 ) { size = -ETIME ; goto out; }
@@ -364,61 +366,40 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int rc, status, burstcnt;size_t count =0 ; -bool itpm = priv->flags &TPM_TIS_ITPM_WORKAROUND ; status =tpm_tis_status (chip);if ((status &TPM_STS_COMMAND_READY ) ==0 ) {tpm_tis_ready (chip); -if (wait_for_tpm_stat - (chip,TPM_STS_COMMAND_READY , chip->timeout_b, - &priv->int_queue, false) <0 ) { +if (tpm_tis_wait_for_stat (chip,TPM_STS_COMMAND_READY , +TPM_STS_COMMAND_READY , + chip->timeout_b, &priv->int_queue, + false) <0 ) { rc = -ETIME ; goto out_err; } } -while (count < len -1 ) { +while (count < len) { burstcnt =get_burstcount (chip);if (burstcnt <0 ) {dev_err (&chip->dev,"Unable to read burstcount\n" ); rc = burstcnt; goto out_err; } - burstcnt =min_t (int, burstcnt, len - count -1 ); + burstcnt =min_t (int, burstcnt, len - count); rc =tpm_tis_write_bytes (priv,TPM_DATA_FIFO (priv->locality), burstcnt, buf + count);if (rc <0 ) goto out_err; count += burstcnt; - -if (wait_for_tpm_stat (chip,TPM_STS_VALID , chip->timeout_c, - &priv->int_queue, false) <0 ) { - rc = -ETIME ; - goto out_err; - } - status =tpm_tis_status (chip); -if (!itpm && (status &TPM_STS_DATA_EXPECT ) ==0 ) { - rc = -EIO ; - goto out_err; - } } - -/* write last byte */ - rc =tpm_tis_write8 (priv,TPM_DATA_FIFO (priv->locality), buf[count]); -if (rc <0 ) - goto out_err; - -if (wait_for_tpm_stat (chip,TPM_STS_VALID , chip->timeout_c, - &priv->int_queue, false) <0 ) { +if (tpm_tis_wait_for_stat (chip,TPM_STS_VALID |TPM_STS_DATA_EXPECT , +TPM_STS_VALID , chip->timeout_a, + &priv->int_queue, false) <0 ) { rc = -ETIME ; goto out_err; } - status =tpm_tis_status (chip); -if (!itpm && (status &TPM_STS_DATA_EXPECT ) !=0 ) { - rc = -EIO ; - goto out_err; - }return 0 ;
@@ -470,9 +451,10 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) ordinal =be32_to_cpu (*((__be32 *) (buf +6 ))); dur =tpm_calc_ordinal_duration (chip, ordinal); -if (wait_for_tpm_stat - (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , dur, - &priv->read_queue, false) <0 ) { +if (tpm_tis_wait_for_stat (chip, +TPM_STS_DATA_AVAIL |TPM_STS_VALID , +TPM_STS_DATA_AVAIL |TPM_STS_VALID , + dur, &priv->read_queue, false) <0 ) { rc = -ETIME ; goto out_err; }
Signature · 1 line
2.7.4
PATCH v12 3/9 tpm: tpm_tis: Add retry in case of protocol failure.
In reply to [email protected]From: Amir Mizinski <[email protected]>
Added a retry mechanism on any protocol error when sending a command or receiving a response. This was changed to comply with
the TCG PC Client Device Driver Design Principles for TPM 2.0.
When sending a command, a loop is added in "tpm_tis_send_main()" that calls "tpm_tis_send_data()" and then issues a retry attempt if any error occurs. When receiving a response, the following new function derived from "tpm_tis_recv()" is added: "__tpm_tis_recv()". "tpm_tis_recv()" is modified to call "__tpm_tis_recv()" in a loop. If any error occurs, a retry is initiated by setting TPM_STS.responseRetry and "__tpm_tis_recv()" is called again.
In both cases a retry is attempted up to "TPM_RETRY" times.
--- drivers/char/tpm/tpm_tis_core.c | 62 ++++++++++++++++++++++++++--------------- drivers/char/tpm/tpm_tis_core.h | 1 + 2 files changed, 41 insertions(+), 22 deletions(-)
drivers/char/tpm/tpm_tis_core.c +40 -22
@@ -305,29 +305,24 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)return size; } -static int tpm_tis_recv (struct tpm_chip *chip,u8 *buf,size_t count) +static int __tpm_tis_recv (struct tpm_chip *chip,u8 *buf,size_t count) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int size =0 ;int status;u32 expected; -if (count <TPM_HEADER_SIZE ) { - size = -EIO ; - goto out; - } - size =recv_data (chip, buf,TPM_HEADER_SIZE );/* read first 10 bytes, including tag, paramsize, and result */ if (size <TPM_HEADER_SIZE ) {dev_err (&chip->dev,"Unable to read header\n" ); - goto out; +return size; } expected =be32_to_cpu (*(__be32 *) (buf +2 ));if (expected > count || expected <TPM_HEADER_SIZE ) { size = -EIO ; - goto out; +return size; } size += recv_data(chip, &buf[TPM_HEADER_SIZE],
@@ -335,22 +330,45 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)if (size < expected) {dev_err (&chip->dev,"Unable to read remainder of result\n" ); size = -ETIME ; - goto out; +return size; }if (tpm_tis_wait_for_stat (chip,TPM_STS_VALID ,TPM_STS_VALID , chip->timeout_c, &priv->int_queue, false) <0 ) { size = -ETIME ; - goto out; +return size; } + status =tpm_tis_status (chip);if (status &TPM_STS_DATA_AVAIL ) {/* retry? */ dev_err (&chip->dev,"Error left over data\n" ); size = -EIO ; +return size; + } + +return size; +} + +static int tpm_tis_recv (struct tpm_chip *chip,u8 *buf,size_t count) +{ +struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev); +int size; +int i; + +if (count <TPM_HEADER_SIZE ) { + size = -EIO ; goto out; } +for (i =0 ; i <TPM_RETRY ; i++) { + size =__tpm_tis_recv (chip, buf, count); +if (size <=0 ) +tpm_tis_write8 (priv,TPM_STS (priv->locality), +TPM_STS_RESPONSE_RETRY ); +else + goto out; + } out:tpm_tis_ready (chip);return size;
@@ -375,7 +393,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) chip->timeout_b, &priv->int_queue, false) < 0) { rc = -ETIME ; - goto out_err; +return rc; } }
@@ -384,13 +402,13 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)if (burstcnt <0 ) {dev_err (&chip->dev,"Unable to read burstcount\n" ); rc = burstcnt; - goto out_err; +return rc; } burstcnt =min_t (int, burstcnt, len - count); rc =tpm_tis_write_bytes (priv,TPM_DATA_FIFO (priv->locality), burstcnt, buf + count);if (rc <0 ) - goto out_err; +return rc; count += burstcnt; }
@@ -398,14 +416,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) TPM_STS_VALID, chip->timeout_a, &priv->int_queue, false) < 0) { rc = -ETIME ; - goto out_err; +return rc; }return 0 ; - -out_err: -tpm_tis_ready (chip); -return rc; }static void disable_interrupts (struct tpm_chip *chip)
@@ -434,13 +448,17 @@ static void disable_interrupts(struct tpm_chip *chip)static int tpm_tis_send_main (struct tpm_chip *chip,const u8 *buf,size_t len) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev); -int rc; +int rc, i;u32 ordinal;unsigned long dur; - rc =tpm_tis_send_data (chip, buf, len); -if (rc <0 ) -return rc; +for (i =0 ; i <TPM_RETRY ; i++) { + rc =tpm_tis_send_data (chip, buf, len); +if (rc >=0 ) +break ; + } +if (i ==TPM_RETRY ) + goto out_err;/* go and do it */ rc =tpm_tis_write8 (priv,TPM_STS (priv->locality),TPM_STS_GO );
drivers/char/tpm/tpm_tis_core.h +1 -0
@@ -34,6 +34,7 @@ enum tis_status {TPM_STS_GO =0x20 ,TPM_STS_DATA_AVAIL =0x10 ,TPM_STS_DATA_EXPECT =0x08 , + TPM_STS_RESPONSE_RETRY = 0x02, }; enum tis_int_flags {
Signature · 1 line
2.7.4
Re: [PATCH v12 3/9] tpm: tpm_tis: Add retry in case of protocol failure.
Quoted 5 lines · On Thu, Jun 25, 2020 at 05:46:43PM +0300, [email protected] wrote:
From: Amir Mizinski <[email protected]>
Added a retry mechanism on any protocol error when sending a command or receiving a response. This was changed to comply with
the TCG PC Client Device Driver Design Principles for TPM 2.0.
We don't have to comply with this.
Quoted 180 lines
When sending a command, a loop is added in "
tpm_tis_send_main()" that calls "tpm_tis_send_data()" and then issues a retry attempt if any error occurs. When receiving a response, the following new function derived from "tpm_tis_recv()" is added: "__tpm_tis_recv()". "tpm_tis_recv()" is modified to call "__tpm_tis_recv()" in a loop. If any error occurs, a retry is initiated by setting TPM_STS.responseRetry and "__tpm_tis_recv()" is called again.
In both cases a retry is attempted up to "TPM_RETRY" times.Co-developed-by Christophe Ricard <[email protected]>Signed-off-by Christophe Ricard <[email protected]>Signed-off-by Amir Mizinski <[email protected]>--- drivers/char/tpm/tpm_tis_core.c | 62 ++++++++++++++++++++++++++--------------- drivers/char/tpm/tpm_tis_core.h | 1 + 2 files changed, 41 insertions(+), 22 deletions(-)drivers/char/tpm/tpm_tis_core.c +40
-22@@ -305,29 +305,24 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)return size; } -static int tpm_tis_recv (struct tpm_chip *chip,u8 *buf,size_t count) +static int __tpm_tis_recv (struct tpm_chip *chip,u8 *buf,size_t count) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int size =0 ;int status;u32 expected; -if (count <TPM_HEADER_SIZE ) { - size = -EIO ; - goto out; - } - size =recv_data (chip, buf,TPM_HEADER_SIZE );/* read first 10 bytes, including tag, paramsize, and result */ if (size <TPM_HEADER_SIZE ) {dev_err (&chip->dev,"Unable to read header\n" ); - goto out; +return size; } expected =be32_to_cpu (*(__be32 *) (buf +2 ));if (expected > count || expected <TPM_HEADER_SIZE ) { size = -EIO ; - goto out; +return size; } size += recv_data(chip, &buf[TPM_HEADER_SIZE],@@ -335,22 +330,45 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)if (size < expected) {dev_err (&chip->dev,"Unable to read remainder of result\n" ); size = -ETIME ; - goto out; +return size; }if (tpm_tis_wait_for_stat (chip,TPM_STS_VALID ,TPM_STS_VALID , chip->timeout_c, &priv->int_queue, false) <0 ) { size = -ETIME ; - goto out; +return size; } + status =tpm_tis_status (chip);if (status &TPM_STS_DATA_AVAIL ) {/* retry? */ dev_err (&chip->dev,"Error left over data\n" ); size = -EIO ; +return size; + } + +return size; +} + +static int tpm_tis_recv (struct tpm_chip *chip,u8 *buf,size_t count) +{ +struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev); +int size; +int i; + +if (count <TPM_HEADER_SIZE ) { + size = -EIO ; goto out; } +for (i =0 ; i <TPM_RETRY ; i++) { + size =__tpm_tis_recv (chip, buf, count); +if (size <=0 ) +tpm_tis_write8 (priv,TPM_STS (priv->locality), +TPM_STS_RESPONSE_RETRY ); +else + goto out; + } out:tpm_tis_ready (chip);return size;@@ -375,7 +393,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) chip->timeout_b, &priv->int_queue, false) < 0) { rc = -ETIME ; - goto out_err; +return rc; } }@@ -384,13 +402,13 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)if (burstcnt <0 ) {dev_err (&chip->dev,"Unable to read burstcount\n" ); rc = burstcnt; - goto out_err; +return rc; } burstcnt =min_t (int, burstcnt, len - count); rc =tpm_tis_write_bytes (priv,TPM_DATA_FIFO (priv->locality), burstcnt, buf + count);if (rc <0 ) - goto out_err; +return rc; count += burstcnt; }@@ -398,14 +416,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) TPM_STS_VALID, chip->timeout_a, &priv->int_queue, false) < 0) { rc = -ETIME ; - goto out_err; +return rc; }return 0 ; - -out_err: -tpm_tis_ready (chip); -return rc; }static void disable_interrupts (struct tpm_chip *chip)@@ -434,13 +448,17 @@ static void disable_interrupts(struct tpm_chip *chip)static int tpm_tis_send_main (struct tpm_chip *chip,const u8 *buf,size_t len) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev); -int rc; +int rc, i;u32 ordinal;unsigned long dur; - rc =tpm_tis_send_data (chip, buf, len); -if (rc <0 ) -return rc; +for (i =0 ; i <TPM_RETRY ; i++) { + rc =tpm_tis_send_data (chip, buf, len); +if (rc >=0 ) +break ; + } +if (i ==TPM_RETRY ) + goto out_err;/* go and do it */ rc =tpm_tis_write8 (priv,TPM_STS (priv->locality),TPM_STS_GO );drivers/char/tpm/tpm_tis_core.h +1
-0@@ -34,6 +34,7 @@ enum tis_status {TPM_STS_GO =0x20 ,TPM_STS_DATA_AVAIL =0x10 ,TPM_STS_DATA_EXPECT =0x08 , + TPM_STS_RESPONSE_RETRY = 0x02, }; enum tis_int_flags {Signature · 1 line
2.7.4
Just based on the explanation this looks like a bunch of unconsidered changes. You have explain yourself better.
/Jarkko
PATCH v12 4/9 tpm: tpm_tis: Add verify_data_integrity handle to tpm_tis_phy_ops
In reply to [email protected]From: Amir Mizinski <[email protected]>
When using I2C bus protocol, the TPM has the ability to report data integrity on incoming or outgoing command parameter bytes. According to the TCG specs, if this data validation functionality is enabled via the TPM_DATA_CSUM_ENABLE register, the TPM will update the TPM_DATA_CSUM register after reception of the last command byte and after the last response byte has been read.
Data integrity is checked if a "verify_data_integrity" handle is defined in "tpm_tis_phy_ops".
--- drivers/char/tpm/tpm_tis_core.c | 14 ++++++++++++++ drivers/char/tpm/tpm_tis_core.h | 2 ++ 2 files changed, 16 insertions(+)
drivers/char/tpm/tpm_tis_core.c +14 -0
@@ -347,6 +347,13 @@ static int __tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)return size; } +if (priv->phy_ops->verify_data_integrity) +if (!priv->phy_ops->verify_data_integrity (priv, buf, + size)) { + size = -EIO ; +return size; + } +return size; }
@@ -419,6 +426,13 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)return rc; } +if (priv->phy_ops->verify_data_integrity) { +if (!priv->phy_ops->verify_data_integrity (priv, buf, len)) { + rc = -EIO ; +return rc; + } + } +return 0 ; }
drivers/char/tpm/tpm_tis_core.h +2 -0
@@ -107,6 +107,8 @@ struct tpm_tis_phy_ops {int (*read16)(struct tpm_tis_data *data,u32 addr,u16 *result);int (*read32)(struct tpm_tis_data *data,u32 addr,u32 *result);int (*write32)(struct tpm_tis_data *data,u32 addr,u32 src); +bool (*verify_data_integrity)(struct tpm_tis_data *data,const u8 *buf, +size_t len); }; static inline int tpm_tis_read_bytes(struct tpm_tis_data *data, u32 addr,
Signature · 1 line
2.7.4
Re: [PATCH v12 4/9] tpm: tpm_tis: Add verify_data_integrity handle to tpm_tis_phy_ops
Quoted 68 lines · On Thu, Jun 25, 2020 at 05:46:44PM +0300, [email protected] wrote:
From: Amir Mizinski <[email protected]>
When using I2C bus protocol, the TPM has the ability to report data integrity on incoming or outgoing command parameter bytes. According to the TCG specs, if this data validation functionality is enabled via the
TPM_DATA_CSUM_ENABLEregister, the TPM will update theTPM_DATA_CSUMregister after reception of the last command byte and after the last response byte has been read.Data integrity is checked if a "
verify_data_integrity" handle is defined in "tpm_tis_phy_ops".Co-developed-by Christophe Ricard <[email protected]>Signed-off-by Christophe Ricard <[email protected]>Signed-off-by Amir Mizinski <[email protected]>--- drivers/char/tpm/tpm_tis_core.c | 14 ++++++++++++++ drivers/char/tpm/tpm_tis_core.h | 2 ++ 2 files changed, 16 insertions(+)drivers/char/tpm/tpm_tis_core.c +14
-0@@ -347,6 +347,13 @@ static int __tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)return size; } +if (priv->phy_ops->verify_data_integrity) +if (!priv->phy_ops->verify_data_integrity (priv, buf, + size)) { + size = -EIO ; +return size; + } +return size; }@@ -419,6 +426,13 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)return rc; } +if (priv->phy_ops->verify_data_integrity) { +if (!priv->phy_ops->verify_data_integrity (priv, buf, len)) { + rc = -EIO ; +return rc; + } + } +return 0 ; }drivers/char/tpm/tpm_tis_core.h +2
-0@@ -107,6 +107,8 @@ struct tpm_tis_phy_ops {int (*read16)(struct tpm_tis_data *data,u32 addr,u16 *result);int (*read32)(struct tpm_tis_data *data,u32 addr,u32 *result);int (*write32)(struct tpm_tis_data *data,u32 addr,u32 src); +bool (*verify_data_integrity)(struct tpm_tis_data *data,const u8 *buf, +size_t len); }; static inline int tpm_tis_read_bytes(struct tpm_tis_data *data, u32 addr,Signature · 1 line
2.7.4
As I've said before, I'm not too eager to add a new callback and nothing in the commit message rationalizes adding one.
/Jarkko
PATCH v12 5/9 tpm: tpm_tis: Rewrite "tpm_tis_req_canceled()"
In reply to [email protected]From: Amir Mizinski <[email protected]>
Using this function while reading/writing data resulted in an aborted operation.
After investigating the issue according to the TCG TPM Profile (PTP) Specifications, I found that "request to cancel" should occur only if TPM_STS.commandReady bit is lit.
Note that i couldn't find a case where the present condition (in the linux kernel) is valid, so I'm removing the case for "TPM_VID_WINBOND" since we have no need for it.
Also, the default comparison is wrong. Only cmdReady bit needs to be compared instead of the full lower status register byte.
--- drivers/char/tpm/tpm_tis_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/char/tpm/tpm_tis_core.c +2 -4
@@ -701,13 +701,11 @@ static bool tpm_tis_req_canceled(struct tpm_chip *chip, u8 status)struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);switch (priv->manufacturer_id) { -case TPM_VID_WINBOND : -return ((status ==TPM_STS_VALID ) || - (status == (TPM_STS_VALID |TPM_STS_COMMAND_READY )));case TPM_VID_STM :return (status == (TPM_STS_VALID |TPM_STS_COMMAND_READY ));default : -return (status ==TPM_STS_COMMAND_READY ); +return ((status &TPM_STS_COMMAND_READY ) == +TPM_STS_COMMAND_READY ); } }
Signature · 1 line
2.7.4
PATCH v12 6/9 tpm: Handle an exception for TPM Firmware Update mode.
In reply to [email protected]From: Amir Mizinski <[email protected]>
An extra precaution for TPM Firmware Update Mode.
For example if TPM power was cut while in Firmware update, platform should ignore "selftest" failure and skip TPM initialization sequence.
--- drivers/char/tpm/tpm2-cmd.c | 4 ++++ include/linux/tpm.h | 1 + 2 files changed, 5 insertions(+)
drivers/char/tpm/tpm2-cmd.c +4 -0
@@ -727,6 +727,10 @@ int tpm2_auto_startup(struct tpm_chip *chip) goto out; rc =tpm2_do_selftest (chip); + +if (rc ==TPM2_RC_UPGRADE || rc ==TPM2_RC_COMMAND_CODE ) +return 0 ; +if (rc && rc !=TPM2_RC_INITIALIZE ) goto out;
include/linux/tpm.h +1 -0
@@ -199,6 +199,7 @@ enum tpm2_return_codes {TPM2_RC_INITIALIZE =0x0100 ,/* RC_VER1 */ TPM2_RC_FAILURE =0x0101 ,TPM2_RC_DISABLED =0x0120 , +TPM2_RC_UPGRADE =0x012D ,TPM2_RC_COMMAND_CODE =0x0143 ,TPM2_RC_TESTING =0x090A ,/* RC_WARN */ TPM2_RC_REFERENCE_H0 = 0x0910,
Signature · 1 line
2.7.4
PATCH v12 7/9 tpm: tpm_tis: verify TPM_STS register is valid after locality request
In reply to [email protected]From: Amir Mizinski <[email protected]>
Issue could result when the TPM does not update TPM_STS register after a locality request (TPM_STS Initial value = 0xFF) and a TPM_STS register read occurs (tpm_tis_status(chip)).
Checking the next condition("if ((status & TPM_STS_COMMAND_READY) == 0)"), the status will be at 0xFF and will be considered, wrongly, in "Ready" state (by checking only one bit). However, at this moment the TPM is, in fact, in "Idle" state and remains in "Idle" state because "tpm_tis_ready(chip);" was not executed.
--- drivers/char/tpm/tpm_tis_core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/char/tpm/tpm_tis_core.c +7 -1
@@ -221,8 +221,14 @@ static int request_locality(struct tpm_chip *chip, int l) }else {/* wait for burstcount */ do { -if (check_locality (chip, l)) +if (check_locality (chip, l)) { +if (wait_for_tpm_stat (chip,TPM_STS_GO ,0 , + chip->timeout_c, + &priv->int_queue, + false) <0 ) +return -ETIME ;return l; + }tpm_msleep (TPM_TIMEOUT ); }while (time_before (jiffies, stop)); }
Signature · 1 line
2.7.4
kernel test robot
build botRe: [PATCH v12 7/9] tpm: tpm_tis: verify TPM_STS register is valid after locality request
Thank you for the patch! Yet something to improve:
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on jss-tpmdd/next]
[also build test ERROR on robh/for-next soc/for-next linus/master v5.8-rc2 next-20200625] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/amirmizi6-gmail-com/Add-tpm-i2c-ptp-driver/20200625-225437 base: git://git.infradead.org/users/jjs/linux-tpmdd next config: x86_64-randconfig-s022-20200624 (attached as .config) compiler: gcc-9 (Debian 9.3.0-13) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-dirty # save the attached .config to linux build tree make W=1 C=1 ARCH=x86_64 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/char/tpm/tpm_tis_core.c: In function 'request_locality':
>> drivers/char/tpm/tpm_tis_core.c:225:9: error: implicit declaration of function 'wait_for_tpm_stat'; did you mean 'wait_for_tpm_stat_cond'? [-Werror=implicit-function-declaration]
225 | if (wait_for_tpm_stat(chip, TPM_STS_GO, 0,
| ^~~~~~~~~~~~~~~~~
| wait_for_tpm_stat_condcc1: some warnings being treated as errors
vim +225 drivers/char/tpm/tpm_tis_core.c
190
191 static int request_locality(struct tpm_chip *chip, int l)
192 {
193 struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
194 unsigned long stop, timeout;
195 long rc;
196
197 if (check_locality(chip, l))
198 return l;
199
200 rc = tpm_tis_write8(priv, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE);
201 if (rc < 0)
202 return rc;
203
204 stop = jiffies + chip->timeout_a;
205
206 if (chip->flags & TPM_CHIP_FLAG_IRQ) {
207 again:
208 timeout = stop - jiffies;
209 if ((long)timeout <= 0)
210 return -1;
211 rc = wait_event_interruptible_timeout(priv->int_queue,
212 (check_locality
213 (chip, l)),
214 timeout);
215 if (rc > 0)
216 return l;
217 if (rc == -ERESTARTSYS && freezing(current)) {
218 clear_thread_flag(TIF_SIGPENDING);
219 goto again;
220 }
221 } else {
222 /* wait for burstcount */
223 do {
224 if (check_locality(chip, l)) {
> 225 if (wait_for_tpm_stat(chip, TPM_STS_GO, 0, 226 chip->timeout_c, 227 &priv->int_queue, 228 false) < 0)
229 return -ETIME;
230 return l;
231 }
232 tpm_msleep(TPM_TIMEOUT);
233 } while (time_before(jiffies, stop));
234 }
235 return -1;
236 }
237
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
kernel test robot
build botRe: [PATCH v12 7/9] tpm: tpm_tis: verify TPM_STS register is valid after locality request
In reply to [email protected]Thank you for the patch! Yet something to improve:
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on jss-tpmdd/next]
[also build test ERROR on robh/for-next soc/for-next linus/master v5.8-rc2 next-20200625] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/amirmizi6-gmail-com/Add-tpm-i2c-ptp-driver/20200625-225437 base: git://git.infradead.org/users/jjs/linux-tpmdd next config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 8911a35180c6777188fefe0954a2451a2b91deaf)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/char/tpm/tpm_tis_core.c:225:9: error: implicit declaration of function 'wait_for_tpm_stat' [-Werror,-Wimplicit-function-declaration]
if (wait_for_tpm_stat(chip, TPM_STS_GO, 0,
^
drivers/char/tpm/tpm_tis_core.c:225:9: note: did you mean 'wait_for_tpm_stat_cond'?
drivers/char/tpm/tpm_tis_core.c:32:13: note: 'wait_for_tpm_stat_cond' declared here
static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,
^1 error generated.
vim +/wait_for_tpm_stat +225 drivers/char/tpm/tpm_tis_core.c
190
191 static int request_locality(struct tpm_chip *chip, int l)
192 {
193 struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
194 unsigned long stop, timeout;
195 long rc;
196
197 if (check_locality(chip, l))
198 return l;
199
200 rc = tpm_tis_write8(priv, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE);
201 if (rc < 0)
202 return rc;
203
204 stop = jiffies + chip->timeout_a;
205
206 if (chip->flags & TPM_CHIP_FLAG_IRQ) {
207 again:
208 timeout = stop - jiffies;
209 if ((long)timeout <= 0)
210 return -1;
211 rc = wait_event_interruptible_timeout(priv->int_queue,
212 (check_locality
213 (chip, l)),
214 timeout);
215 if (rc > 0)
216 return l;
217 if (rc == -ERESTARTSYS && freezing(current)) {
218 clear_thread_flag(TIF_SIGPENDING);
219 goto again;
220 }
221 } else {
222 /* wait for burstcount */
223 do {
224 if (check_locality(chip, l)) {
> 225 if (wait_for_tpm_stat(chip, TPM_STS_GO, 0, 226 chip->timeout_c, 227 &priv->int_queue, 228 false) < 0)
229 return -ETIME;
230 return l;
231 }
232 tpm_msleep(TPM_TIMEOUT);
233 } while (time_before(jiffies, stop));
234 }
235 return -1;
236 }
237
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
PATCH v12 8/9 tpm: Add YAML schema for TPM TIS I2C options
In reply to [email protected]From: Amir Mizinski <[email protected]>
Added a YAML schema to support tpm tis i2c related dt-bindings for the I2c PTP based physical layer.
This patch adds the documentation for corresponding device tree bindings of I2C based Physical TPM.
Refer to the 'I2C Interface Definition' section in
'TCG PC Client PlatformTPMProfile(PTP) Specification' publication for specification.
--- .../bindings/security/tpm/tpm-tis-i2c.yaml | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm-tis-i2c.yaml
Documentation/devicetree/bindings/security/tpm/tpm-tis-i2c.yaml new file +50 -0
@@ -0,0 +1,50 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/security/tpm/tpm-tis-i2c.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: I2C PTP based TPM Device Tree Bindings + +maintainers: + - Amir Mizinski <[email protected]> + +description: + Device Tree Bindings for I2C based Trusted Platform Module(TPM). + +properties: + compatible: + items: + - enum: + # Nuvoton's Trusted Platform Module (TPM) (NPCT75x) + - nuvoton,npct75x + - const: tcg,tpm-tis-i2c + + reg: + maxItems: 1 + + interrupt: + maxItems: 1 + + crc-checksum: + $ref: /schemas/types.yaml#/definitions/flag + description: + Set this flag to enable CRC checksum. + +required: + - compatible + - reg + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + tpm@2e { + compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c"; + reg = <0x2e>; + crc-checksum; + }; + }; +...
Signature · 1 line
2.7.4
PATCH v12 9/9 tpm: tpm_tis: add tpm_tis_i2c driver
In reply to [email protected]From: Amir Mizinski <[email protected]>
Implements the functionality needed to communicate with an I2C TPM according to the TCG TPM I2C Interface Specification.
--- drivers/char/tpm/Kconfig | 12 ++ drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_tis_i2c.c | 292 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 305 insertions(+) create mode 100644 drivers/char/tpm/tpm_tis_i2c.c
drivers/char/tpm/Kconfig +12 -0
@@ -74,6 +74,18 @@ config TCG_TIS_SPI_CR50 If you have a H1 secure module running Cr50 firmware on SPI bus, say Yes and it will be accessible from within Linux. +config TCG_TIS_I2C + tristate "TPM I2C Interface Specification" + depends on I2C + select CRC_CCITT + select TCG_TIS_CORE + help + If you have a TPM security chip which is connected to a regular + I2C master (i.e. most embedded platforms) that is compliant with the + TCG TPM I2C Interface Specification say Yes and it will be accessible from + within Linux. To compile this driver as a module, choose M here; + the module will be called tpm_tis_i2c. + config TCG_TIS_I2C_ATMEL tristate "TPM Interface Specification 1.2 Interface (I2C - Atmel)" depends on I2C
drivers/char/tpm/Makefile +1 -0
@@ -26,6 +26,7 @@ obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o tpm_tis_spi-y := tpm_tis_spi_main.o tpm_tis_spi-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o +obj-$(CONFIG_TCG_TIS_I2C) += tpm_tis_i2c.o obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
drivers/char/tpm/tpm_tis_i2c.c new file +292 -0
292 lines not on this page · raw message
Signature · 1 line
2.7.4
kernel test robot
build botRe: [PATCH v12 9/9] tpm: tpm_tis: add tpm_tis_i2c driver
Thank you for the patch! Perhaps something to improve:
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on jss-tpmdd/next]
[also build test WARNING on robh/for-next soc/for-next linus/master v5.8-rc2 next-20200626] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/amirmizi6-gmail-com/Add-tpm-i2c-ptp-driver/20200625-225437 base: git://git.infradead.org/users/jjs/linux-tpmdd next config: arm-randconfig-r003-20200628 (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 8cd117c24f48428e01f88cf18480e5af7eb20c0c)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/char/tpm/tpm_tis_i2c.c:271:36: warning: unused variable 'acpi_tis_i2c_match' [-Wunused-const-variable]
static const struct acpi_device_id acpi_tis_i2c_match[] = {
^1 warning generated.
vim +/acpi_tis_i2c_match +271 drivers/char/tpm/tpm_tis_i2c.c
270
> 271 static const struct acpi_device_id acpi_tis_i2c_match[] = { 272 {"SMO0768", 0},
273 {}
274 };
275 MODULE_DEVICE_TABLE(acpi, acpi_tis_i2c_match);
276
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org