Commit f4d916b7 authored by Tomas Winkler's avatar Tomas Winkler Committed by Jarkko Sakkinen
Browse files

tpm: move tpm_getcap to tpm1-cmd.c 



1. Move tpm_getcap to tpm1-cmd. Rename the function to tpm1_getcap.
2. Remove unused tpm_getcap_header with unused constant
as this functionality is already implemented using tpm_buf construct.

Fixes warning:
drivers/char/tpm/tpm-interface.c:452:38: warning: ‘tpm_getcap_header’ defined but not used [-Wunused-const-variable=]
 static const struct tpm_input_header tpm_getcap_header = {
                                      ^~~~~~~~~~~~~~~~~
3. Drop unused TPM_DIGEST_SIZE. It's already defined in
include/linux/tpm.h

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 1ad6640c

drivers/char/tpm/tpm-interface.c

+1 −46
Original line number Diff line number Diff line
@@ -454,52 +454,6 @@ int tpm_startup(struct tpm_chip *chip) 
	return rc;

}



#define TPM_DIGEST_SIZE 20

#define TPM_RET_CODE_IDX 6

#define TPM_INTERNAL_RESULT_SIZE 200

#define TPM_ORD_GET_CAP 101

#define TPM_ORD_GET_RANDOM 70



static const struct tpm_input_header tpm_getcap_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(22),

	.ordinal = cpu_to_be32(TPM_ORD_GET_CAP)

};



ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		   const char *desc, size_t min_cap_length)

{

	struct tpm_buf buf;

	int rc;



	rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_GET_CAP);

	if (rc)

		return rc;



	if (subcap_id == TPM_CAP_VERSION_1_1 ||

	    subcap_id == TPM_CAP_VERSION_1_2) {

		tpm_buf_append_u32(&buf, subcap_id);

		tpm_buf_append_u32(&buf, 0);

	} else {

		if (subcap_id == TPM_CAP_FLAG_PERM ||

		    subcap_id == TPM_CAP_FLAG_VOL)

			tpm_buf_append_u32(&buf, TPM_CAP_FLAG);

		else

			tpm_buf_append_u32(&buf, TPM_CAP_PROP);



		tpm_buf_append_u32(&buf, 4);

		tpm_buf_append_u32(&buf, subcap_id);

	}

	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE,

			      min_cap_length, 0, desc);

	if (!rc)

		*cap = *(cap_t *)&buf.data[TPM_HEADER_SIZE + 4];



	tpm_buf_destroy(&buf);

	return rc;

}

EXPORT_SYMBOL_GPL(tpm_getcap);



int tpm_get_timeouts(struct tpm_chip *chip)

{

	if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)
@@ -857,6 +811,7 @@ int tpm_pm_resume(struct device *dev) 
}

EXPORT_SYMBOL_GPL(tpm_pm_resume);



#define TPM_ORD_GET_RANDOM 70

#define TPM_GETRANDOM_RESULT_SIZE	18

static const struct tpm_input_header tpm_getrandom_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

drivers/char/tpm/tpm-sysfs.c

+24 −24
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr, 
	char *str = buf;

	struct tpm_chip *chip = to_tpm_chip(dev);



	rc = tpm_getcap(chip, TPM_CAP_PROP_PCR, &cap,

	rc = tpm1_getcap(chip, TPM_CAP_PROP_PCR, &cap,

			 "attempting to determine the number of PCRS",

			 sizeof(cap.num_pcrs));

	if (rc)
@@ -132,7 +132,7 @@ static ssize_t enabled_show(struct device *dev, struct device_attribute *attr, 
	cap_t cap;

	ssize_t rc;



	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &cap,

	rc = tpm1_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &cap,

			 "attempting to determine the permanent enabled state",

			 sizeof(cap.perm_flags));

	if (rc)
@@ -149,7 +149,7 @@ static ssize_t active_show(struct device *dev, struct device_attribute *attr, 
	cap_t cap;

	ssize_t rc;



	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &cap,

	rc = tpm1_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &cap,

			 "attempting to determine the permanent active state",

			 sizeof(cap.perm_flags));

	if (rc)
@@ -166,7 +166,7 @@ static ssize_t owned_show(struct device *dev, struct device_attribute *attr, 
	cap_t cap;

	ssize_t rc;



	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_PROP_OWNER, &cap,

	rc = tpm1_getcap(to_tpm_chip(dev), TPM_CAP_PROP_OWNER, &cap,

			 "attempting to determine the owner state",

			 sizeof(cap.owned));

	if (rc)
@@ -183,7 +183,7 @@ static ssize_t temp_deactivated_show(struct device *dev, 
	cap_t cap;

	ssize_t rc;



	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_VOL, &cap,

	rc = tpm1_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_VOL, &cap,

			 "attempting to determine the temporary state",

			 sizeof(cap.stclear_flags));

	if (rc)
@@ -202,7 +202,7 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr, 
	ssize_t rc;

	char *str = buf;



	rc = tpm_getcap(chip, TPM_CAP_PROP_MANUFACTURER, &cap,

	rc = tpm1_getcap(chip, TPM_CAP_PROP_MANUFACTURER, &cap,

			 "attempting to determine the manufacturer",

			 sizeof(cap.manufacturer_id));

	if (rc)
@@ -211,7 +211,7 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr, 
		       be32_to_cpu(cap.manufacturer_id));



	/* Try to get a TPM version 1.2 TPM_CAP_VERSION_INFO */

	rc = tpm_getcap(chip, TPM_CAP_VERSION_1_2, &cap,

	rc = tpm1_getcap(chip, TPM_CAP_VERSION_1_2, &cap,

			 "attempting to determine the 1.2 version",

			 sizeof(cap.tpm_version_1_2));

	if (!rc) {
@@ -223,7 +223,7 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr, 
			       cap.tpm_version_1_2.revMinor);

	} else {

		/* Otherwise just use TPM_STRUCT_VER */

		rc = tpm_getcap(chip, TPM_CAP_VERSION_1_1, &cap,

		rc = tpm1_getcap(chip, TPM_CAP_VERSION_1_1, &cap,

				 "attempting to determine the 1.1 version",

				 sizeof(cap.tpm_version));

		if (rc)

drivers/char/tpm/tpm.h

+2 −2
Original line number Diff line number Diff line
@@ -541,8 +541,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 
			 size_t min_rsp_body_length, unsigned int flags,

			 const char *desc);

int tpm_startup(struct tpm_chip *chip);

ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		   const char *desc, size_t min_cap_length);

int tpm_get_timeouts(struct tpm_chip *);

int tpm1_auto_startup(struct tpm_chip *chip);

int tpm_do_selftest(struct tpm_chip *chip);
@@ -551,6 +549,8 @@ int tpm1_get_timeouts(struct tpm_chip *chip); 
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);

ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		    const char *desc, size_t min_cap_length);

unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm_pm_suspend(struct device *dev);

int tpm_pm_resume(struct device *dev);

drivers/char/tpm/tpm1-cmd.c

+43 −8
Original line number Diff line number Diff line
@@ -314,13 +314,13 @@ int tpm1_get_timeouts(struct tpm_chip *chip) 
	unsigned long timeout_old[4], timeout_chip[4], timeout_eff[4];

	ssize_t rc;



	rc = tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL,

	rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL,

			 sizeof(cap.timeout));

	if (rc == TPM_ERR_INVALID_POSTINIT) {

		if (tpm_startup(chip))

			return rc;



		rc = tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap,

		rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap,

				 "attempting to determine the timeouts",

				 sizeof(cap.timeout));

	}
@@ -383,7 +383,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip) 
	chip->timeout_c = usecs_to_jiffies(timeout_eff[2]);

	chip->timeout_d = usecs_to_jiffies(timeout_eff[3]);



	rc = tpm_getcap(chip, TPM_CAP_PROP_TIS_DURATION, &cap,

	rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_DURATION, &cap,

			 "attempting to determine the durations",

			  sizeof(cap.duration));

	if (rc)
@@ -434,3 +434,38 @@ int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash, 
	tpm_buf_destroy(&buf);

	return rc;

}



#define TPM_ORD_GET_CAP 101

ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		    const char *desc, size_t min_cap_length)

{

	struct tpm_buf buf;

	int rc;



	rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_GET_CAP);

	if (rc)

		return rc;



	if (subcap_id == TPM_CAP_VERSION_1_1 ||

	    subcap_id == TPM_CAP_VERSION_1_2) {

		tpm_buf_append_u32(&buf, subcap_id);

		tpm_buf_append_u32(&buf, 0);

	} else {

		if (subcap_id == TPM_CAP_FLAG_PERM ||

		    subcap_id == TPM_CAP_FLAG_VOL)

			tpm_buf_append_u32(&buf, TPM_CAP_FLAG);

		else

			tpm_buf_append_u32(&buf, TPM_CAP_PROP);



		tpm_buf_append_u32(&buf, 4);

		tpm_buf_append_u32(&buf, subcap_id);

	}

	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE,

			      min_cap_length, 0, desc);

	if (!rc)

		*cap = *(cap_t *)&buf.data[TPM_HEADER_SIZE + 4];



	tpm_buf_destroy(&buf);

	return rc;

}

EXPORT_SYMBOL_GPL(tpm1_getcap);

drivers/char/tpm/tpm_tis_core.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) 
	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);

	else

		return tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc,

		return tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc,

				  0);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE