Content-Type: multipart/alternative; boundary="_000_831D55AF5A11D64C9B4B43F59EEBF72036396BE71BFTLPMAILBOX02_" --_000_831D55AF5A11D64C9B4B43F59EEBF72036396BE71BFTLPMAILBOX02_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Patch to fix timeout bug introduced by tboot.hg changeset 176. Either the T= PM in the hp6930p doesn't operate to spec or the code was never tested. Wi= th the patch, the values read from the tpm are equal to the default values = used before tpm timeout code was added in changesets 163 and 176. Signed-off-by: Christian Limpach christian.limpach@eu.citrix.com Acked-by: Ross Philipson ross.philipson@citrix.com diff -r 75e242a56344 tboot/common/tpm.c --- a/tboot/common/tpm.c Tue Jan 05 23:05:07 2010 -0800 +++ b/tboot/common/tpm.c Fri Jan 29 00:59:05 2010 +0000 @@ -1944,10 +1944,10 @@ * timeout_x represents the number of milliseconds for the timeout * and timeout[x] represents the number of microseconds. */ - g_timeout.timeout_a =3D timeout[0]/1000; - g_timeout.timeout_b =3D timeout[1]/1000; - g_timeout.timeout_c =3D timeout[2]/1000; - g_timeout.timeout_d =3D timeout[3]/1000; + g_timeout.timeout_a =3D timeout[0]; + g_timeout.timeout_b =3D timeout[1]; + g_timeout.timeout_c =3D timeout[2]; + g_timeout.timeout_d =3D timeout[3]; printk("TPM timeout values: A: %u, B: %u, C: %u, D: %u\n", g_timeout.timeout_a, g_timeout.timeout_b, g_timeout.timeout= _c, g_timeout.timeout_d); --_000_831D55AF5A11D64C9B4B43F59EEBF72036396BE71BFTLPMAILBOX02_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Patch to fix timeout bug introduced by tboot.hg cha= ngeset 176. Either the TPM in the hp6930p doesn't operate to spec or the code was never tested.  With the patch, the values read from the tpm are equal = to the default values used before tpm timeout code was added in changesets 163 and 176.

 

Signed-off-b= y: Christian Limpach christian.limpac= h@eu.citrix.com

Acked-by: Ro= ss Philipson ross.philipson@citri= x.com

 

 

diff -r 75e242a56344 tboot/common/tpm.c

--- a/tboot/common/tpm.c    =   Tue Jan 05 23:05:07 2010 -0800

+++ b/tboot/common/tpm.c    =   Fri Jan 29 00:59:05 2010 +0000

@@ -1944,10 +1944,10 @@

        =   * timeout_x represents the number of milliseconds for the timeout

        =   * and timeout[x] represents the number of microseconds.

        =   */

-        g_ti= meout.timeout_a =3D timeout[0]/1000;

-        g_ti= meout.timeout_b =3D timeout[1]/1000;

-        g_ti= meout.timeout_c =3D timeout[2]/1000;

-        g_ti= meout.timeout_d =3D timeout[3]/1000;

+        g_ti= meout.timeout_a =3D timeout[0];

+        g_ti= meout.timeout_b =3D timeout[1];

+        g_ti= meout.timeout_c =3D timeout[2];

+        g_ti= meout.timeout_d =3D timeout[3];

        = printk("TPM timeout values: A: %u, B: %u, C: %u, D: %u\n",

        =         g_timeout.timeout_a, g_timeout.timeout_b, g_timeout.timeout_c,

        =         g_timeout.timeout_d);=

 

--_000_831D55AF5A11D64C9B4B43F59EEBF72036396BE71BFTLPMAILBOX02_--