diff options
| author |   Stefan Berger <stefanb@linux.vnet.ibm.com> | 2011-03-30 12:13:28 -0400 |
|---|---|---|
| committer |   Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2011-07-12 18:53:08 -0300 |
| commit | 6259210176510c64251a314ffb74834a790f09a0 (patch) | |
| tree | 41cdcab9da0e98e93f1b30b31d58ca13abd3ca9b /drivers/char/tpm/tpm.c | |
| parent | tpm: Adjust interface timeouts if they are too small (diff) | |
| download | linux-dev-6259210176510c64251a314ffb74834a790f09a0.tar.xz linux-dev-6259210176510c64251a314ffb74834a790f09a0.zip | |
tpm_tis: Add timeouts sysfs entry
Display the TPM's interface timeouts in a 'timeouts' sysfs entry. Display
the entries as having been adjusted when they were scaled due to their values
being reported in milliseconds rather than microseconds.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm/tpm.c')
| -rw-r--r-- | drivers/char/tpm/tpm.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index 533ae359cb28..873ef50aad90 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c @@ -557,6 +557,7 @@ void tpm_get_timeouts(struct tpm_chip *chip) if (timeout && timeout < 1000) { /* timeouts in msec rather usec */ scale = 1000; + chip->vendor.timeout_adjusted = true; } if (timeout) chip->vendor.timeout_a = usecs_to_jiffies(timeout * scale); @@ -965,6 +966,21 @@ ssize_t tpm_show_durations(struct device *dev, struct device_attribute *attr, } EXPORT_SYMBOL_GPL(tpm_show_durations); +ssize_t tpm_show_timeouts(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + + return sprintf(buf, "%d %d %d %d [%s]\n", + jiffies_to_usecs(chip->vendor.timeout_a), + jiffies_to_usecs(chip->vendor.timeout_b), + jiffies_to_usecs(chip->vendor.timeout_c), + jiffies_to_usecs(chip->vendor.timeout_d), + chip->vendor.timeout_adjusted + ? "adjusted" : "original"); +} +EXPORT_SYMBOL_GPL(tpm_show_timeouts); + ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { |