On Tue, Apr 21, 2026 at 08:50:20AM +0800, Baoli Zhang wrote: > From: "Baoli Zhang" <[email protected]> > > Commit 207696b17f38 ("tpm: use a map for tpm2_calc_ordinal_duration()") > inadvertently reduced the timeout for TPM2 key creation commands > (`CREATE_PRIMARY`, `CREATE`, `CREATE_LOADED`) from 300 seconds to 30 > seconds. > > This causes intermittent timeout failures, with several failures observed > across hundreds of test runs on some Intel platforms using Infineon > SLB9670 and SLB9672 TPM modules. Restore the timeout to 300 seconds to > avoid spurious failures. > > Fixes: 207696b17f38 ("tpm: use a map for tpm2_calc_ordinal_duration()") > Co-developed-by: Lili Li <[email protected]> > Signed-off-by: Lili Li <[email protected]> > Signed-off-by: Baoli Zhang <[email protected]> > --- > Changes in v2: > - Add description of intermittent nature of the timeout issue. > - Fix Co-developed-by and Signed-off-by tag ordering. > > v1: > https://patchwork.kernel.org/project/linux-integrity/patch/[email protected]/ > > drivers/char/tpm/tpm2-cmd.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c > index 3a77be7ebf4aa..430022f695f24 100644 > --- a/drivers/char/tpm/tpm2-cmd.c > +++ b/drivers/char/tpm/tpm2-cmd.c > @@ -71,9 +71,9 @@ static const struct { > {TPM2_CC_HIERARCHY_CHANGE_AUTH, 2000}, > {TPM2_CC_GET_CAPABILITY, 750}, > {TPM2_CC_NV_READ, 2000}, > - {TPM2_CC_CREATE_PRIMARY, 30000}, > - {TPM2_CC_CREATE, 30000}, > - {TPM2_CC_CREATE_LOADED, 30000}, > + {TPM2_CC_CREATE_PRIMARY, 300000}, > + {TPM2_CC_CREATE, 300000}, > + {TPM2_CC_CREATE_LOADED, 300000}, > }; > > /** > -- > 2.43.0 >
Much better! I'm fine with this and it is a regression. On travel right now but I do have one SLB9670 connected to RPi4. I'll do peer testing once at home (next week). BR, Jarkko
