2007-11-18 23:35:58

by Marcel Selhorst

Subject: [PATCH] TPM TIS device driver locality request

Dear all,

during the initialization of the TPM TIS driver, the necessary
locality has to be requested earlier in the init-process. Depending on
the used TPM chip, this leads to wrong information.
For example: Lenovo X61s with Atmel TPM:

tpm_tis 00:0a: 1.2 TPM (device-id 0xFFFF, rev-id 255)

But correct is:

tpm_tis 00:0c: 1.2 TPM (device-id 0x3203, rev-id 9)

This short patch fixes this issue.

Signed-Off-by Marcel Selhorst <[email protected]>
---
--- tpm_tis.c.orig 2007-11-19 00:21:09.000000000 +0100
+++ tpm_tis.c 2007-11-19 00:21:23.000000000 +0100
@@ -450,6 +450,11 @@ static int tpm_tis_init(struct device *d
goto out_err;
}

+ if (request_locality(chip, 0) != 0) {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));

/* Default timeouts */
@@ -487,11 +492,6 @@ static int tpm_tis_init(struct device *d
if (intfcaps & TPM_INTF_DATA_AVAIL_INT)
dev_dbg(dev, "\tData Avail Int Support\n");

- if (request_locality(chip, 0) != 0) {
- rc = -ENODEV;
- goto out_err;
- }
-
/* INTERRUPT Setup */
init_waitqueue_head(&chip->vendor.read_queue);
init_waitqueue_head(&chip->vendor.int_queue);

2007-11-20 06:23:44

by Andrew Morton

Subject: Re: [PATCH] TPM TIS device driver locality request

On Mon, 19 Nov 2007 00:32:51 +0100 Marcel Selhorst <[email protected]> wrote:

> Dear all,
>
> during the initialization of the TPM TIS driver, the necessary
> locality has to be requested earlier in the init-process. Depending on
> the used TPM chip, this leads to wrong information.
> For example: Lenovo X61s with Atmel TPM:
>
> tpm_tis 00:0a: 1.2 TPM (device-id 0xFFFF, rev-id 255)
>
> But correct is:
>
> tpm_tis 00:0c: 1.2 TPM (device-id 0x3203, rev-id 9)
>
> This short patch fixes this issue.

Is this bug sufficiently serious to warrant inclusion of the fix in
2.6.24? 2.6.23.x?

It looks like it's just a cosmetic thing, but I'd like to check...

> Signed-Off-by Marcel Selhorst <[email protected]>

Signed-off-by:, please.

> ---
> --- tpm_tis.c.orig 2007-11-19 00:21:09.000000000 +0100
> +++ tpm_tis.c 2007-11-19 00:21:23.000000000 +0100

`patch -p1' form, please. This should have been

--- a/drivers/char/tpm/tpm_tis.c
+++ a/drivers/char/tpm/tpm_tis.c

> @@ -450,6 +450,11 @@ static int tpm_tis_init(struct device *d
> goto out_err;
> }
>
> + if (request_locality(chip, 0) != 0) {
> + rc = -ENODEV;
> + goto out_err;
> + }
> +

Your email client is converting tabs to spaces.

http://mbligh.org/linuxdocs/Email/Clients/Thunderbird has help for this.

Thanks.

2007-11-21 08:32:22

by Marcel Selhorst

Subject: Re: [PATCH] TPM TIS device driver locality request

Hi,

>> tpm_tis 00:0a: 1.2 TPM (device-id 0xFFFF, rev-id 255)
>> But correct is:
>> tpm_tis 00:0c: 1.2 TPM (device-id 0x3203, rev-id 9)
>> This short patch fixes this issue.
> Is this bug sufficiently serious to warrant inclusion of the fix in
> 2.6.24? 2.6.23.x?

I think including the patch for 2.6.24 is enough.

> Your email client is converting tabs to spaces.
> http://mbligh.org/linuxdocs/Email/Clients/Thunderbird has help for this.

Thanks for the hint,

Best regards,
Marcel Selhorst