hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm1: rename tpm1_pcr_read_dev to tpm1_pcr_read() 

Rename tpm1_pcr_read_dev to tpm1_pcr_read() to match
the counterpart tpm2_pcr_read().

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Tomas Winkler 2018-10-19 21:23:04 +03:00 committed by Jarkko Sakkinen
parent 5e335b5ecf
commit cfddcb05e1
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/tpm/tpm-interface.c
View File

@ -465,7 +465,7 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
if (chip->flags & TPM_CHIP_FLAG_TPM2) if (chip->flags & TPM_CHIP_FLAG_TPM2)
rc = tpm2_pcr_read(chip, pcr_idx, res_buf); rc = tpm2_pcr_read(chip, pcr_idx, res_buf);
else else
rc = tpm1_pcr_read_dev(chip, pcr_idx, res_buf); rc = tpm1_pcr_read(chip, pcr_idx, res_buf);
tpm_put_ops(chip); tpm_put_ops(chip);
return rc; return rc;

2
drivers/char/tpm/tpm-sysfs.c
View File

@ -114,7 +114,7 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr,
num_pcrs = be32_to_cpu(cap.num_pcrs); num_pcrs = be32_to_cpu(cap.num_pcrs);
for (i = 0; i < num_pcrs; i++) { for (i = 0; i < num_pcrs; i++) {
rc = tpm1_pcr_read_dev(chip, i, digest); rc = tpm1_pcr_read(chip, i, digest);
if (rc) if (rc)
break; break;
str += sprintf(str, "PCR-%02d: ", i); str += sprintf(str, "PCR-%02d: ", i);

2
drivers/char/tpm/tpm.h
View File

@ -525,7 +525,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip);
unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal); 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, int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,
const char *log_msg); 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, ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
const char *desc, size_t min_cap_length); const char *desc, size_t min_cap_length);
int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max); int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max);

4
drivers/char/tpm/tpm1-cmd.c
View File

@ -572,7 +572,7 @@ out:
} }
#define TPM_ORD_PCRREAD 21 #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; struct tpm_buf buf;
int rc; int rc;
@ -660,7 +660,7 @@ int tpm1_do_selftest(struct tpm_chip *chip)
do { do {
/* Attempt to read a PCR value */ /* 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 /* Some buggy TPMs will not respond to tpm_tis_ready() for
* around 300ms while the self test is ongoing, keep trying * around 300ms while the self test is ongoing, keep trying