lkml.org 
[lkml]   [2010]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] tpm: Autodetect itpm devices
On Mon, 29 Nov 2010, Jiri Kosina wrote:

> > Signed-off-by: Matthew Garrett <mjg@redhat.com>
>
> Tested-by: Jiri Kosina <jkosina@suse.cz>
>
> This definitely is .37 material still, as it fixes suspend regression on
> various machines, as reported here:
>
> http://lkml.org/lkml/2010/11/1/493
> http://lkml.org/lkml/2010/11/29/219
>
> James, any word on this? It doesn't seem to be present either in Linus'
> tree, nor in linux-next.

I'm pretty sure this is the first I've seen of this, which would explain
why it's not in my tree (Rajiv: as mainatiner please collect and forward
TPM patches to me, or at least cc me when acking them).

I can push this to Linus.


>
> Thanks.
>
> > ---
> > drivers/char/tpm/tpm_tis.c | 24 ++++++++++++++++++++++++
> > 1 files changed, 24 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> > index 1030f84..c17a305 100644
> > --- a/drivers/char/tpm/tpm_tis.c
> > +++ b/drivers/char/tpm/tpm_tis.c
> > @@ -25,6 +25,7 @@
> > #include <linux/slab.h>
> > #include <linux/interrupt.h>
> > #include <linux/wait.h>
> > +#include <linux/acpi.h>
> > #include "tpm.h"
> >
> > #define TPM_HEADER_SIZE 10
> > @@ -78,6 +79,26 @@ enum tis_defaults {
> > static LIST_HEAD(tis_chips);
> > static DEFINE_SPINLOCK(tis_lock);
> >
> > +#ifdef CONFIG_ACPI
> > +static int is_itpm(struct pnp_dev *dev)
> > +{
> > + struct acpi_device *acpi = pnp_acpi_device(dev);
> > + struct acpi_hardware_id *id;
> > +
> > + list_for_each_entry(id, &acpi->pnp.ids, list) {
> > + if (!strcmp("INTC0102", id->id))
> > + return 1;
> > + }
> > +
> > + return 0;
> > +}
> > +#else
> > +static int is_itpm(struct pnp_dev *dev)
> > +{
> > + return 0;
> > +}
> > +#endif
> > +
> > static int check_locality(struct tpm_chip *chip, int l)
> > {
> > if ((ioread8(chip->vendor.iobase + TPM_ACCESS(l)) &
> > @@ -472,6 +493,9 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
> > "1.2 TPM (device-id 0x%X, rev-id %d)\n",
> > vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
> >
> > + if (is_itpm(to_pnp_dev(dev)))
> > + itpm = 1;
> > +
> > if (itpm)
> > dev_info(dev, "Intel iTPM workaround enabled\n");
> >
> >
>
> --
> Jiri Kosina
> SUSE Labs, Novell Inc.
>

--
James Morris
<jmorris@namei.org>


\
 
 \ /
  Last update: 2010-11-29 23:11    [W:0.062 / U:10.328 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site