lkml.org 
[lkml]   [2009]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] TPM: DATA_EXPECT bit check bypass
    From
    Date
    Sending now inline in order to work ok with git-am, sorry for the flood.

    This patch depends on patch http://patchwork.kernel.org/patch/33486/

    Since the iTPM doesn't set the DATA_EXPECT bit when it should, we bypass
    this bit check in case we're running the code over this specific TPM.

    Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    ---
    drivers/char/tpm/tpm.h | 1 +
    drivers/char/tpm/tpm_tis.c | 11 ++++++++++-
    2 files changed, 11 insertions(+), 1 deletions(-)

    diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
    index 8e00b4d..ed4ecf0 100644
    --- a/drivers/char/tpm/tpm.h
    +++ b/drivers/char/tpm/tpm.h
    @@ -109,6 +109,7 @@ struct tpm_chip {

    struct list_head list;
    void (*release) (struct device *);
    + bool is_itpm;
    };

    #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor)
    diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
    index aec1931..74a60d7 100644
    --- a/drivers/char/tpm/tpm_tis.c
    +++ b/drivers/char/tpm/tpm_tis.c
    @@ -27,6 +27,7 @@
    #include "tpm.h"

    #define TPM_HEADER_SIZE 10
    +#define ITPM_ID "INTC0102"

    enum tis_access {
    TPM_ACCESS_VALID = 0x80,
    @@ -293,7 +294,9 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
    wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
    &chip->vendor.int_queue);
    status = tpm_tis_status(chip);
    - if ((status & TPM_STS_DATA_EXPECT) == 0) {
    + /* iTPM never sets the DATA_EXPECT bit */
    + if (((status & TPM_STS_DATA_EXPECT) == 0) &&
    + (!chip->is_itpm)) {
    rc = -EIO;
    goto out_err;
    }
    @@ -582,6 +585,12 @@ static int tpm_tis_init(struct device *dev, resource_size_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;
    +
    return 0;
    out_err:
    if (chip->vendor.iobase)
    --
    1.6.3.1



    \
     
     \ /
      Last update: 2009-07-16 19:47    [W:0.021 / U:184.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site