On Fri, Mar 21, 2025 at 04:49:15PM +0000, Jonathan McDowell wrote:
> Jarkko, I've realised I've somehow introduced a typo in the patch below that
> means it doesn't fire correctly; I'm not sure how this happened as my local
> copy I was testing on is definitely correct. Would you like a one line fix
> up patch, or can you manually fix it up in your tree?
>
> This hunk:
>
> > @@ -545,9 +551,11 @@ static int tpm_tis_send_main(struct tpm_chip *chip,
> > const u8 *buf, size_t len)
> > if (rc >= 0)
> > /* Data transfer done successfully */
> > break;
> > - else if (rc != -EIO)
> > + else if (rc != EAGAIN && rc != -EIO)
> > /* Data transfer failed, not recoverable */
> > return rc;
> > +
> > + usleep_range(priv->timeout_min, priv->timeout_max);
> > }
> > /* go and do it */
>
> should be "rc != -EAGAIN" - the "-" sign has somehow been lost.
>
> Apologies for this, let me know what's easiest for you in terms of resolving
> it.
NP, I missed it too so we're in the same boat ;-)
I did:
$ git -P diff
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 4ab69c3e103c..ed0d3d8449b3 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -551,7 +551,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const
u8 *buf, size_t len)
if (rc >= 0)
/* Data transfer done successfully */
break;
- else if (rc != EAGAIN && rc != -EIO)
+ else if (rc != -EAGAIN && rc != -EIO)
/* Data transfer failed, not recoverable */
return rc;
Ping, if anything else.
BR, Jarkko
