linux.git/drivers/char/tpm, branch v2.6.37

tpm: Autodetect itpm devices

2010-11-29T22:18:01+00:00

Some Lenovos have TPMs that require a quirk to function correctly. This can
be autodetected by checking whether the device has a _HID of INTC0102. This
is an invalid PNPid, and as such is discarded by the pnp layer - however
it's still present in the ACPI code, so we can pull it out that way. This
means that the quirk won't be automatically applied on non-ACPI systems,
but without ACPI we don't have any way to identify the chip anyway so I
don't think that's a great concern.

Signed-off-by: Matthew Garrett 
Acked-by: Rajiv Andrade 
Tested-by: Jiri Kosina 
Tested-by: Andy Isaacson 
Signed-off-by: James Morris

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24T20:41:39+00:00

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c

tpm: change 'tpm_suspend_pcr' to be module parameter

2010-10-20T23:12:42+00:00

Fix the following warning:

drivers/char/tpm/tpm.c:1085: warning: `tpm_suspend_setup' defined but not used

and make the workaround operable in case when TPM is compiled as a module.
As a side-effect the option will be called tpm.suspend_pcr.

Signed-off-by: Dmitry Torokhov 
Cc: Rajiv Andrade 
Cc: David Safford 
Cc: James Morris 
Cc: Debora Velarde 
Signed-off-by: Andrew Morton 
Signed-off-by: James Morris

Update broken web addresses in the kernel.

2010-10-18T09:03:14+00:00

The patch below updates broken web addresses in the kernel

Signed-off-by: Justin P. Mattock 
Cc: Maciej W. Rozycki 
Cc: Geert Uytterhoeven 
Cc: Finn Thain 
Cc: Randy Dunlap 
Cc: Matt Turner 
Cc: Dimitry Torokhov 
Cc: Mike Frysinger 
Acked-by: Ben Pfaff 
Acked-by: Hans J. Koch 
Reviewed-by: Finn Thain 
Signed-off-by: Jiri Kosina

tpm_tis: fix subsequent suspend failures

2010-07-26T00:25:45+00:00

Fix subsequent suspends by issuing tpm_continue_selftest during resume.
Otherwise, the tpm chip seems to be not fully initialized and will reject
the save state command during suspend, thus preventing the whole system
to suspend.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16256

Signed-off-by: Helmut Schaa 
Signed-off-by: Rajiv Andrade 
Cc: James Morris 
Cc: Debora Velarde 
Cc: David Safford 
Signed-off-by: Andrew Morton 
Signed-off-by: James Morris

TPM: ReadPubEK output struct fix

2010-06-14T23:26:28+00:00

This patch adds a missing element of the ReadPubEK command output,
that prevents future overflow of this buffer when copying the
TPM output result into it.

Prevents a kernel panic in case the user tries to read the
pubek from sysfs.

Signed-off-by: Rajiv Andrade 
Signed-off-by: James Morris

TPM: ACPI/PNP dependency removal

2010-05-16T23:08:18+00:00

This patch pushes the ACPI dependency into the device driver code
itself. Now, even without ACPI/PNP enabled, the device can be registered
using the TIS specified memory space. This will however result in the
lack of access to the BIOS event log, being the only implication of such
ACPI removal.

Signed-off-by: Rajiv Andrade 
Acked-by: Mimi Zohar 
Signed-off-by: James Morris

Revert "TPM: ACPI/PNP dependency removal"

2010-05-06T23:19:29+00:00

This reverts commit b89e66e1e396f7b5436af154e58209320cc08aed.

> > When CONFIG_PM is not set:
> >
> > drivers/built-in.o: In function `acpi_init':
> > bus.c:(.init.text+0x2d84): undefined reference to `pm_flags'
> > bus.c:(.init.text+0x2d91): undefined reference to `pm_flags'
>
> CONFIG_ACPI depends on CONFIG_PM,
> so acpi/bus.c should not be compiled for CONFIG_PM=n
>
> Hmm, is is somebody doing something strange, like "select ACPI"
> without guaranteeing that all of ACPI's dependencies are satisfied?

Signed-off-by: James Morris

Merge branch 'master' into next

2010-05-06T00:56:07+00:00

TPM: ACPI/PNP dependency removal

2010-05-04T23:59:57+00:00

This patch pushes the ACPI dependency into the device driver code
itself. Now, even without ACPI/PNP enabled, the device can be registered
using the TIS specified memory space. This will however result in the
lack of access to the bios event log, being the only implication of such
ACPI removal.

Signed-off-by: Rajiv Andrade 
Acked-by: Mimi Zohar 
Signed-off-by: James Morris