Fix TPM 1.2 resume
Subsystems (3)
Jarkko Sakkinen
maintainercover Fix TPM 1.2 resume
During TPM 1.2 resume, the first PCR read operation used inside tpm1_do_selftest() fails. Fix two bugs that can prevent the operation from working.
Jarkko Sakkinen (2):
tpm_tis: Use tpm_chip_{start,stop} decoration inside tpm_tis_resume
tpm: Prevent hwrng from activating during resume
drivers/char/tpm/tpm-chip.c | 4 +++ drivers/char/tpm/tpm-interface.c | 10 ++++++++ drivers/char/tpm/tpm_tis_core.c | 43 ++++++++++++++------------------ include/linux/tpm.h | 13 +++++----- 4 files changed, 40 insertions(+), 30 deletions(-)
Signature · 1 line
2.39.2
Jarkko Sakkinen
maintainerPATCH 1/2 tpm_tis: Use tpm_chip_{start,stop} decoration inside tpm_tis_resume
Before sending a TPM command, CLKRUN protocol must be disabled. This is not done in the case of tpm1_do_selftest() call site inside tpm_tis_resume().
Address this by decorating the calls with tpm_chip_{start,stop}, which arm and disarm the TPM chip for transmission, and take care of disabling and re-enabling CLKRUN, among other things.
--- drivers/char/tpm/tpm_tis_core.c | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-)
drivers/char/tpm/tpm_tis_core.c +19 -24
@@ -1209,25 +1209,20 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)u32 intmask;int rc; -if (chip->ops->clk_enable !=NULL ) - chip->ops->clk_enable (chip, true); - -/* reenable interrupts that device may have lost or -* BIOS/firmware may have disabled +/* +* Re-enable interrupts that device may have lost or BIOS/firmware may +* have disabled. */ rc =tpm_tis_write8 (priv,TPM_INT_VECTOR (priv->locality), priv->irq); -if (rc <0 ) - goto out; +if (rc <0 ) { +dev_err (&chip->dev,"Setting IRQ failed.\n" ); +return ; + } intmask = priv->int_mask |TPM_GLOBAL_INT_ENABLE ; - -tpm_tis_write32 (priv,TPM_INT_ENABLE (priv->locality), intmask); - -out: -if (chip->ops->clk_enable !=NULL ) - chip->ops->clk_enable (chip, false); - -return ; + rc =tpm_tis_write32 (priv,TPM_INT_ENABLE (priv->locality), intmask); +if (rc <0 ) +dev_err (&chip->dev,"Enabling interrupts failed.\n" ); }int tpm_tis_resume (struct device *dev)
@@ -1235,27 +1230,27 @@ int tpm_tis_resume(struct device *dev)struct tpm_chip *chip =dev_get_drvdata (dev);int ret; - ret =tpm_tis_request_locality (chip,0 ); -if (ret <0 ) + ret =tpm_chip_start (chip); +if (ret)return ret;if (chip->flags &TPM_CHIP_FLAG_IRQ )tpm_tis_reenable_interrupts (chip); - ret =tpm_pm_resume (dev); -if (ret) - goto out; -/* * TPM 1.2 requires self-test on resume. This function actually returns * an error code but for unknown reason it isn't handled. */ if (!(chip->flags &TPM_CHIP_FLAG_TPM2 ))tpm1_do_selftest (chip); -out: -tpm_tis_relinquish_locality (chip,0 ); - return ret; +tpm_chip_stop (chip); + + ret =tpm_pm_resume (dev); +if (ret) +return ret; + + return 0; }EXPORT_SYMBOL_GPL (tpm_tis_resume);#endif
Signature · 1 line
2.39.2
Re: [PATCH 1/2] tpm_tis: Use tpm_chip_{start,stop} decoration inside tpm_tis_resume
Quoted 7 lines · Jarkko Sakkinen
Before sending a TPM command, CLKRUN protocol must be disabled. This is not done in the case of
tpm1_do_selftest()call site insidetpm_tis_resume().Address this by decorating the calls with tpm_chip_{start,stop}, which arm and disarm the TPM chip for transmission, and take care of disabling and re-enabling CLKRUN, among other things.
Quoted 8 lines
Reported-by Jason A. Donenfeld <[email protected]>Fixes a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()")Signed-off-by Jarkko Sakkinen <[email protected]>--- drivers/char/tpm/tpm_tis_core.c | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-)
Quoted 81 lines
drivers/char/tpm/tpm_tis_core.c +19
-24@@ -1209,25 +1209,20 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)u32 intmask;int rc; -if (chip->ops->clk_enable !=NULL ) - chip->ops->clk_enable (chip, true); - -/* reenable interrupts that device may have lost or -* BIOS/firmware may have disabled +/* +* Re-enable interrupts that device may have lost or BIOS/firmware may +* have disabled. */ rc =tpm_tis_write8 (priv,TPM_INT_VECTOR (priv->locality), priv->irq); -if (rc <0 ) - goto out; +if (rc <0 ) { +dev_err (&chip->dev,"Setting IRQ failed.\n" ); +return ; + } intmask = priv->int_mask |TPM_GLOBAL_INT_ENABLE ; - -tpm_tis_write32 (priv,TPM_INT_ENABLE (priv->locality), intmask); - -out: -if (chip->ops->clk_enable !=NULL ) - chip->ops->clk_enable (chip, false); - -return ; + rc =tpm_tis_write32 (priv,TPM_INT_ENABLE (priv->locality), intmask); +if (rc <0 ) +dev_err (&chip->dev,"Enabling interrupts failed.\n" ); }int tpm_tis_resume (struct device *dev)@@ -1235,27 +1230,27 @@ int tpm_tis_resume(struct device *dev)struct tpm_chip *chip =dev_get_drvdata (dev);int ret; - ret =tpm_tis_request_locality (chip,0 ); -if (ret <0 ) + ret =tpm_chip_start (chip); +if (ret)return ret;if (chip->flags &TPM_CHIP_FLAG_IRQ )tpm_tis_reenable_interrupts (chip); - ret =tpm_pm_resume (dev); -if (ret) - goto out; -/* * TPM 1.2 requires self-test on resume. This function actually returns * an error code but for unknown reason it isn't handled. */ if (!(chip->flags &TPM_CHIP_FLAG_TPM2 ))tpm1_do_selftest (chip); -out: -tpm_tis_relinquish_locality (chip,0 ); - return ret; +tpm_chip_stop (chip); + + ret =tpm_pm_resume (dev); +if (ret) +return ret; + + return 0; }EXPORT_SYMBOL_GPL (tpm_tis_resume);#endif Signature · 1 line
2.39.2
Jarkko Sakkinen
maintainerPATCH 2/2 tpm: Prevent hwrng from activating during resume
In reply to Jarkko SakkinenSet TPM_CHIP_FLAG_SUSPENDED in tpm_pm_suspend() and reset in tpm_pm_resume(). While the flag is set, tpm_hwrng() gives back zero bytes. This prevents hwrng from racing during resume.
--- drivers/char/tpm/tpm-chip.c | 4 ++++ drivers/char/tpm/tpm-interface.c | 10 ++++++++++ include/linux/tpm.h | 13 +++++++------ 3 files changed, 21 insertions(+), 6 deletions(-)
drivers/char/tpm/tpm-chip.c +4 -0
@@ -572,6 +572,10 @@ static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait) { struct tpm_chip *chip = container_of(rng, struct tpm_chip, hwrng); +/* Give back zero bytes, as TPM chip has not yet fully resumed: */ +if (chip->flags &TPM_CHIP_FLAG_SUSPENDED ) +return 0 ; +return tpm_get_random (chip, data, max); }
drivers/char/tpm/tpm-interface.c +10 -0
@@ -412,6 +412,8 @@ int tpm_pm_suspend(struct device *dev) } suspended: + chip->flags |=TPM_CHIP_FLAG_SUSPENDED ; +if (rc)dev_err (dev,"Ignoring error %d while suspending\n" , rc);return 0 ;
@@ -429,6 +431,14 @@ int tpm_pm_resume(struct device *dev)if (chip ==NULL )return -ENODEV ; + chip->flags &= ~TPM_CHIP_FLAG_SUSPENDED ; + +/* +* Guarantee that SUSPENDED is written last, so that hwrng does not +* activate before the chip has been fully resumed. +*/ +wmb (); +return 0 ; }EXPORT_SYMBOL_GPL (tpm_pm_resume);
include/linux/tpm.h +7 -6
@@ -274,13 +274,14 @@ enum tpm2_cc_attrs {#define TPM_VID_ATML 0x1114enum tpm_chip_flags { -TPM_CHIP_FLAG_TPM2 =BIT (1 ), -TPM_CHIP_FLAG_IRQ =BIT (2 ), -TPM_CHIP_FLAG_VIRTUAL =BIT (3 ), -TPM_CHIP_FLAG_HAVE_TIMEOUTS =BIT (4 ), -TPM_CHIP_FLAG_ALWAYS_POWERED =BIT (5 ), +TPM_CHIP_FLAG_SUSPENDED =BIT (0 ), +TPM_CHIP_FLAG_TPM2 =BIT (1 ), +TPM_CHIP_FLAG_IRQ =BIT (2 ), +TPM_CHIP_FLAG_VIRTUAL =BIT (3 ), +TPM_CHIP_FLAG_HAVE_TIMEOUTS =BIT (4 ), +TPM_CHIP_FLAG_ALWAYS_POWERED =BIT (5 ),TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED =BIT (6 ), -TPM_CHIP_FLAG_FIRMWARE_UPGRADE =BIT (7 ), +TPM_CHIP_FLAG_FIRMWARE_UPGRADE =BIT (7 ), };#define to_tpm_chip (d) container_of(d, struct tpm_chip, dev)
Signature · 1 line
2.39.2
Re: [PATCH 2/2] tpm: Prevent hwrng from activating during resume
Quoted 7 lines · Jarkko Sakkinen
Set
TPM_CHIP_FLAG_SUSPENDEDintpm_pm_suspend()and reset intpm_pm_resume(). While the flag is set,tpm_hwrng()gives back zero bytes. This prevents hwrng from racing during resume.Fixes 6e592a065d51 ("tpm: Move Linux RNG connection to hwrng")Signed-off-by Jarkko Sakkinen <[email protected]>
Quoted 77 lines
--- drivers/char/tpm/tpm-chip.c | 4 ++++ drivers/char/tpm/tpm-interface.c | 10 ++++++++++ include/linux/tpm.h | 13 +++++++------ 3 files changed, 21 insertions(+), 6 deletions(-)drivers/char/tpm/tpm-chip.c +4
-0@@ -572,6 +572,10 @@ static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait) { struct tpm_chip *chip = container_of(rng, struct tpm_chip, hwrng); +/* Give back zero bytes, as TPM chip has not yet fully resumed: */ +if (chip->flags &TPM_CHIP_FLAG_SUSPENDED ) +return 0 ; +return tpm_get_random (chip, data, max); }drivers/char/tpm/tpm-interface.c +10
-0@@ -412,6 +412,8 @@ int tpm_pm_suspend(struct device *dev) } suspended: + chip->flags |=TPM_CHIP_FLAG_SUSPENDED ; +if (rc)dev_err (dev,"Ignoring error %d while suspending\n" , rc);return 0 ;@@ -429,6 +431,14 @@ int tpm_pm_resume(struct device *dev)if (chip ==NULL )return -ENODEV ; + chip->flags &= ~TPM_CHIP_FLAG_SUSPENDED ; + +/* +* Guarantee that SUSPENDED is written last, so that hwrng does not +* activate before the chip has been fully resumed. +*/ +wmb (); +return 0 ; }EXPORT_SYMBOL_GPL (tpm_pm_resume);include/linux/tpm.h +7
-6@@ -274,13 +274,14 @@ enum tpm2_cc_attrs {#define TPM_VID_ATML 0x1114enum tpm_chip_flags { -TPM_CHIP_FLAG_TPM2 =BIT (1 ), -TPM_CHIP_FLAG_IRQ =BIT (2 ), -TPM_CHIP_FLAG_VIRTUAL =BIT (3 ), -TPM_CHIP_FLAG_HAVE_TIMEOUTS =BIT (4 ), -TPM_CHIP_FLAG_ALWAYS_POWERED =BIT (5 ), +TPM_CHIP_FLAG_SUSPENDED =BIT (0 ), +TPM_CHIP_FLAG_TPM2 =BIT (1 ), +TPM_CHIP_FLAG_IRQ =BIT (2 ), +TPM_CHIP_FLAG_VIRTUAL =BIT (3 ), +TPM_CHIP_FLAG_HAVE_TIMEOUTS =BIT (4 ), +TPM_CHIP_FLAG_ALWAYS_POWERED =BIT (5 ),TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED =BIT (6 ), -TPM_CHIP_FLAG_FIRMWARE_UPGRADE =BIT (7 ), +TPM_CHIP_FLAG_FIRMWARE_UPGRADE =BIT (7 ), };#define to_tpm_chip (d) container_of(d, struct tpm_chip, dev)Signature · 1 line
2.39.2
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] tpm: Prevent hwrng from activating during resume
Quoted 11 lines · Jerry Snitselaar
Quoted 7 lines · Jarkko Sakkinen
Set
TPM_CHIP_FLAG_SUSPENDEDintpm_pm_suspend()and reset intpm_pm_resume(). While the flag is set,tpm_hwrng()gives back zero bytes. This prevents hwrng from racing during resume.Fixes 6e592a065d51 ("tpm: Move Linux RNG connection to hwrng")Signed-off-by Jarkko Sakkinen <[email protected]>Reviewed-by Jerry Snitselaar <[email protected]
Thanks Jerry! I'm planning to schedule these patches to rc2. So any tested-by's are welcome before that (I'll send it the following week of rc1 release).
BR, Jarkko