]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
tpm: correct tpm timeouts to jiffies conversion
authorMarcin Obara <marcin_obara@users.sourceforge.net>
Thu, 16 Oct 2008 05:04:34 +0000 (22:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 18:21:49 +0000 (11:21 -0700)
commit9e5b1b12226d5a501fbc6706ca090e00d18a01ad
tree4d2a7b40739e94e15b3bb525043abb0689b4d4cd
parent612de10db06c0704a66bbe7fd13990cb1c2cb958
tpm: correct tpm timeouts to jiffies conversion

This patch fixes timeouts conversion to jiffies, by replacing
msecs_to_jiffies() calls with usecs_to_jiffies().  According to TCG TPM
Specification Version 1.2 Revision 103 (pages 166, 167) TPM timeouts and
durations are returned in microseconds (usec) not in miliseconds (msec).

This fixes a long hang while loading TPM driver, if TPM chip starts in
"Idle" state instead of "Ready" state.  Without this patch - 'modprobe'
may hang for 30 seconds or more.

Signed-off-by: Marcin Obara <marcin_obara@users.sourceforge.net>
Cc: Marcel Selhorst <tpm@selhorst.net>
Cc: Kylene Jo Hall <kjhall@us.ibm.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/tpm/tpm.c