Commit 8f1b1a50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  tpm: Autodetect itpm devices
parents a01af8e4 3f0d3d01

drivers/char/tpm/tpm_tis.c

+24 −0
Original line number Diff line number Diff line
@@ -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");