lkml.org 
[lkml]   [2009]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] TPM: DATA_EXPECT bit check bypass
From
Date
On Mon, 2009-07-20 at 16:28 -0700, Andy Isaacson wrote:
> On Thu, Jul 16, 2009 at 06:20:26PM -0300, Rajiv Andrade wrote:
> > On Thu, 2009-07-16 at 16:08 -0400, Valdis.Kletnieks@vt.edu wrote:
> > > On Thu, 16 Jul 2009 14:43:32 -0300, Rajiv Andrade said:
> > >
> > > > @@ -582,6 +585,12 @@ static int tpm_tis_init(struct device *dev, resource_siz
> > > e_t start,
> > > > tpm_get_timeouts(chip);
> > > > tpm_continue_selftest(chip);
> > > >
> > > > + for (i=0; i < 8; i++)
> > > > + if (ITPM_ID[i] != to_pnp_dev(dev)->id->id[i])
> > > > + break;
> > > > + if (i == 8)
> > > > + chip->is_itpm = 1;
> > > > +
> > >
> > > strcmp() variant of some sort instead?
> >
> > Wait, is to_pnp_dev(dev)->id->id[i] null terminated? Maybe memcmp() fits
> > better here..
>
> Rather than checking the PNP ID at this point, I suggest something like:
>
> (the context here depends on my earlier series, but it's fairly
> obvious.)
>
> @@ -467,6 +481,11 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
> "1.2 TPM (%04X:%04X rev %d)\n", vendor & 0xffff,
> vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
>
> + if (vendor == 0x10208086) {
> + dev_info(dev, "Intel iTPM workaround enabled\n");
> + chip->itpm = 1;
> + }
> +
> /* Figure out the capabilities */
> intfcaps =
> ioread32(chip->vendor.iobase +
>
> (I suppose there should be a #define of 0x10208086 somewhere.)
>

Much better, my patch would break everything in case force option was
set.

> I'll cook up a refreshed patch series.

Great, I'll ack this one when I get it, thanks.

Rajiv
+++



\
 
 \ /
  Last update: 2009-07-24 19:15    [W:0.504 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site