2019-03-29 14:12:17 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-11-06 04:14:04 +08:00
|
|
|
From: Tomas Winkler <tomas.winkler@intel.com>
|
|
|
|
Date: Fri, 21 Sep 2018 15:50:27 +0300
|
2019-03-29 14:12:17 +08:00
|
|
|
Subject: [PATCH] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read()
|
2018-11-06 04:14:04 +08:00
|
|
|
|
|
|
|
Rename tpm1_pcr_read_dev to tpm1_pcr_read() to match
|
|
|
|
the counterpart tpm2_pcr_read().
|
|
|
|
|
|
|
|
V4: New in the series
|
|
|
|
V5: Resend.
|
|
|
|
|
|
|
|
Change-Id: Ibda2b7167787664f194b9459d64af94beb663891
|
|
|
|
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
|
|
|
|
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
|
|
|
|
---
|
|
|
|
drivers/char/tpm/tpm-interface.c | 2 +-
|
|
|
|
drivers/char/tpm/tpm-sysfs.c | 2 +-
|
|
|
|
drivers/char/tpm/tpm.h | 2 +-
|
|
|
|
drivers/char/tpm/tpm1-cmd.c | 4 ++--
|
|
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index aacbbfe9b994..9245ec538217 100644
|
2018-11-06 04:14:04 +08:00
|
|
|
--- a/drivers/char/tpm/tpm-interface.c
|
|
|
|
+++ b/drivers/char/tpm/tpm-interface.c
|
2019-03-29 14:12:17 +08:00
|
|
|
@@ -475,7 +475,7 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
|
2018-11-06 04:14:04 +08:00
|
|
|
if (chip->flags & TPM_CHIP_FLAG_TPM2)
|
|
|
|
rc = tpm2_pcr_read(chip, pcr_idx, res_buf);
|
|
|
|
else
|
|
|
|
- rc = tpm1_pcr_read_dev(chip, pcr_idx, res_buf);
|
|
|
|
+ rc = tpm1_pcr_read(chip, pcr_idx, res_buf);
|
|
|
|
|
|
|
|
tpm_put_ops(chip);
|
|
|
|
return rc;
|
|
|
|
diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index 6b2eda26c638..5cb05efae3a2 100644
|
2018-11-06 04:14:04 +08:00
|
|
|
--- a/drivers/char/tpm/tpm-sysfs.c
|
|
|
|
+++ b/drivers/char/tpm/tpm-sysfs.c
|
2019-10-12 04:05:26 +08:00
|
|
|
@@ -118,7 +118,7 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr,
|
2018-11-06 04:14:04 +08:00
|
|
|
|
|
|
|
num_pcrs = be32_to_cpu(cap.num_pcrs);
|
|
|
|
for (i = 0; i < num_pcrs; i++) {
|
|
|
|
- rc = tpm1_pcr_read_dev(chip, i, digest);
|
|
|
|
+ rc = tpm1_pcr_read(chip, i, digest);
|
|
|
|
if (rc)
|
|
|
|
break;
|
|
|
|
str += sprintf(str, "PCR-%02d: ", i);
|
|
|
|
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
|
2020-10-27 02:14:06 +08:00
|
|
|
index 6ebe6399fa19..7080699777ed 100644
|
2018-11-06 04:14:04 +08:00
|
|
|
--- a/drivers/char/tpm/tpm.h
|
|
|
|
+++ b/drivers/char/tpm/tpm.h
|
2020-10-27 02:14:06 +08:00
|
|
|
@@ -529,7 +529,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip);
|
2018-11-06 04:14:04 +08:00
|
|
|
unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);
|
|
|
|
int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,
|
|
|
|
const char *log_msg);
|
|
|
|
-int tpm1_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);
|
|
|
|
+int tpm1_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);
|
|
|
|
ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
|
|
|
|
const char *desc, size_t min_cap_length);
|
|
|
|
int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max);
|
|
|
|
diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index d30f336518f6..05b772477bac 100644
|
2018-11-06 04:14:04 +08:00
|
|
|
--- a/drivers/char/tpm/tpm1-cmd.c
|
|
|
|
+++ b/drivers/char/tpm/tpm1-cmd.c
|
|
|
|
@@ -572,7 +572,7 @@ int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max)
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TPM_ORD_PCRREAD 21
|
|
|
|
-int tpm1_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
|
|
|
|
+int tpm1_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
|
|
|
|
{
|
|
|
|
struct tpm_buf buf;
|
|
|
|
int rc;
|
|
|
|
@@ -660,7 +660,7 @@ int tpm1_do_selftest(struct tpm_chip *chip)
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* Attempt to read a PCR value */
|
|
|
|
- rc = tpm1_pcr_read_dev(chip, 0, dummy);
|
|
|
|
+ rc = tpm1_pcr_read(chip, 0, dummy);
|
|
|
|
|
|
|
|
/* Some buggy TPMs will not respond to tpm_tis_ready() for
|
|
|
|
* around 300ms while the self test is ongoing, keep trying
|
|
|
|
--
|
2019-04-08 18:08:36 +08:00
|
|
|
https://clearlinux.org
|
2018-11-06 04:14:04 +08:00
|
|
|
|