tpm: don't return bool from update_timeouts
Subsystems (2)
PATCH 1/2 tpm: don't return bool from update_timeouts
Set tpm_chip->timeouts_adjusted directly in the update_timeouts code instead of returning bool. In case of tpm read failing print warning that the read failed and continue on.
--- drivers/char/tpm/tpm1-cmd.c | 3 +-- drivers/char/tpm/tpm_tis_core.c | 15 +++++++++------ include/linux/tpm.h | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/char/tpm/tpm1-cmd.c +1 -2
@@ -380,8 +380,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip)* of misreporting. */ if (chip->ops->update_timeouts) - chip->timeout_adjusted = - chip->ops->update_timeouts (chip, timeout_eff); + chip->ops->update_timeouts (chip, timeout_eff);if (!chip->timeout_adjusted) {/* Restore default if chip reported 0 */
drivers/char/tpm/tpm_tis_core.c +9 -6
@@ -521,35 +521,38 @@ static const struct tis_vendor_timeout_override vendor_timeout_overrides[] = { (TIS_SHORT_TIMEOUT*1000), (TIS_SHORT_TIMEOUT*1000) } }, }; -static bool tpm_tis_update_timeouts (struct tpm_chip *chip, +static void tpm_tis_update_timeouts (struct tpm_chip *chip,unsigned long *timeout_cap) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int i, rc;u32 did_vid; + chip->timeout_adjusted = false; +if (chip->ops->clk_enable !=NULL ) chip->ops->clk_enable (chip, true); rc =tpm_tis_read32 (priv,TPM_DID_VID (0 ), &did_vid); -if (rc <0 ) +if (rc <0 ) { +dev_warn (&chip->dev,"%s: failed to read did_vid: %d\n" , + __func__, rc); goto out; + }for (i =0 ; i !=ARRAY_SIZE (vendor_timeout_overrides); i++) {if (vendor_timeout_overrides[i].did_vid != did_vid)continue ;memcpy (timeout_cap, vendor_timeout_overrides[i].timeout_us,sizeof (vendor_timeout_overrides[i].timeout_us)); - rc = true; + chip->timeout_adjusted = true; } - rc = false; - out:if (chip->ops->clk_enable !=NULL ) chip->ops->clk_enable (chip, false); -return rc; +return ; }/*
include/linux/tpm.h +1 -1
@@ -41,7 +41,7 @@ struct tpm_class_ops {int (*send) (struct tpm_chip *chip,u8 *buf,size_t len);void (*cancel) (struct tpm_chip *chip);u8 (*status) (struct tpm_chip *chip); -bool (*update_timeouts)(struct tpm_chip *chip, +void (*update_timeouts)(struct tpm_chip *chip,unsigned long *timeout_cap);int (*go_idle)(struct tpm_chip *chip);int (*cmd_ready)(struct tpm_chip *chip);
Signature · 1 line
2.20.1.98.gecbdaf0899
PATCH 2/2 tpm: don't print error message in tpm_transmit_cmd when tpm still testing
Currently tpm_transmit_cmd will print an error message if the tpm returns something other than TPM2_RC_SUCCESS. This means that if the tpm returns that it is testing an error message will be printed, and this can cause confusion for the end user. So avoid printing the error message if TPM2_RC_TESTING is the return code.
--- drivers/char/tpm/tpm-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/tpm/tpm-interface.c +1 -1
@@ -397,7 +397,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, err =be32_to_cpu (header->return_code);if (err !=0 && err !=TPM_ERR_DISABLED && err !=TPM_ERR_DEACTIVATED - && desc) + && err !=TPM2_RC_TESTING && desc)dev_err (&chip->dev,"A TPM error (%d) occurred %s\n" , err, desc);if (err)
Signature · 1 line
2.20.1.98.gecbdaf0899
Quoted 6 lines · Jerry Snitselaar
Set
tpm_chip->timeouts_adjusteddirectly in theupdate_timeoutscode instead of returning bool. In case of tpm read failing print warning that the read failed and continue on.Reviewed-by Jarkko Sakkinen <[email protected]>Signed-off-by Jerry Snitselaar <[email protected]>
Your signed-off-by should be before my reviewed-by (no need to resend).
/Jarkko
Quoted 10 lines · Jarkko Sakkinen
Quoted 6 lines · Jerry Snitselaar
Set
tpm_chip->timeouts_adjusteddirectly in theupdate_timeoutscode instead of returning bool. In case of tpm read failing print warning that the read failed and continue on.Reviewed-by Jarkko Sakkinen <[email protected]>Signed-off-by Jerry Snitselaar <[email protected]>Your signed-off-by should be before my reviewed-by (no need to resend).
... and linux-security-module is missing (need to resend).
/Jarkko