2.6.27-rc3-mmotm tpm-correct-tpm-timeouts-to-jiffies-conversion-d820-fix.patch
PATCH v2 1/1 2.6.27-rc3-mmotm tpm-correct-tpm-timeouts-to-jiffies-conversion-d820-fix.patch
Patch tpm-correct-tpm-timeouts-to-jiffies-conversion reveals a bug in the Broadcom BCM0102 TPM chipset used in the Dell Latitude D820 - although most of the timeouts are returned in usecs as per the spec, one is apparently returned in msecs, which results in a too-small value leading to a timeout when the code treats it as usecs. To prevent a regression, we check for the known too-short value and adjust it to a value that makes things work.
Version 2: Clarify comment somewhat, fix if statement to properly deal with variant HZ values.
Signed-off-by Valdis Kletnieks <[email protected]>
cc Marcin Obara <[email protected]>
drivers/char/tpm/tpm.c +7 -0
@@ -557,6 +557,13 @@usecs_to_jiffies (be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_1_IDX )))); +/* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above +* value wrong and apparently reports msecs rather than usecs. So we +* fix up the resulting too-small TPM_SHORT value to make things work. +*/ +if (chip->vendor.duration[TPM_SHORT ] < (HZ /100 )) + chip->vendor.duration[TPM_SHORT ] =HZ ; + chip->vendor.duration[TPM_MEDIUM ] = usecs_to_jiffies(be32_to_cpu (*((__be32 *) (data +