Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e907481b authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Peter Huewe
Browse files

tpm: Remove tpm_show_caps_1_2 



The version of the TPM should not depend on the bus it is connected
through. 1.1, 1.2 and soon 2.0 TPMS will be all be able to use the
same bus interfaces.

Make tpm_show_caps try the 1.2 capability first. If that fails then
fall back to the 1.1 capability. This effectively auto-detects what
interface the TPM supports at run-time.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarJoel Schopp <jschopp@linux.vnet.ibm.com>
Reviewed-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent cb996158

drivers/char/tpm/tpm.c

+23 −33
Original line number Diff line number Diff line
@@ -1020,43 +1020,33 @@ ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr, 
	str += sprintf(str, "Manufacturer: 0x%x\n",

		       be32_to_cpu(cap.manufacturer_id));



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

	rc = tpm_getcap(dev, CAP_VERSION_1_2, &cap,

			 "attempting to determine the 1.2 version");

	if (!rc) {

		str += sprintf(str,

			       "TCG version: %d.%d\nFirmware version: %d.%d\n",

			       cap.tpm_version_1_2.Major,

			       cap.tpm_version_1_2.Minor,

			       cap.tpm_version_1_2.revMajor,

			       cap.tpm_version_1_2.revMinor);

	} else {

		/* Otherwise just use TPM_STRUCT_VER */

		rc = tpm_getcap(dev, CAP_VERSION_1_1, &cap,

				"attempting to determine the 1.1 version");

		if (rc)

			return 0;

		str += sprintf(str,

			       "TCG version: %d.%d\nFirmware version: %d.%d\n",

		       cap.tpm_version.Major, cap.tpm_version.Minor,

		       cap.tpm_version.revMajor, cap.tpm_version.revMinor);

	return str - buf;

			       cap.tpm_version.Major,

			       cap.tpm_version.Minor,

			       cap.tpm_version.revMajor,

			       cap.tpm_version.revMinor);

	}

EXPORT_SYMBOL_GPL(tpm_show_caps);



ssize_t tpm_show_caps_1_2(struct device * dev,

			  struct device_attribute * attr, char *buf)

{

	cap_t cap;

	ssize_t rc;

	char *str = buf;



	rc = tpm_getcap(dev, TPM_CAP_PROP_MANUFACTURER, &cap,

			"attempting to determine the manufacturer");

	if (rc)

		return 0;

	str += sprintf(str, "Manufacturer: 0x%x\n",

		       be32_to_cpu(cap.manufacturer_id));

	rc = tpm_getcap(dev, CAP_VERSION_1_2, &cap,

			 "attempting to determine the 1.2 version");

	if (rc)

		return 0;

	str += sprintf(str,

		       "TCG version: %d.%d\nFirmware version: %d.%d\n",

		       cap.tpm_version_1_2.Major, cap.tpm_version_1_2.Minor,

		       cap.tpm_version_1_2.revMajor,

		       cap.tpm_version_1_2.revMinor);

	return str - buf;

}

EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);

EXPORT_SYMBOL_GPL(tpm_show_caps);



ssize_t tpm_show_durations(struct device *dev, struct device_attribute *attr,

			  char *buf)

drivers/char/tpm/tpm.h

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ extern ssize_t tpm_show_pcrs(struct device *, struct device_attribute *attr, 
				char *);

extern ssize_t tpm_show_caps(struct device *, struct device_attribute *attr,

				char *);

extern ssize_t tpm_show_caps_1_2(struct device *, struct device_attribute *attr,

				char *);

extern ssize_t tpm_store_cancel(struct device *, struct device_attribute *attr,

				const char *, size_t);

extern ssize_t tpm_show_enabled(struct device *, struct device_attribute *attr,

drivers/char/tpm/tpm_i2c_infineon.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); 
static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL);

static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL);

static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, NULL);

static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL);

static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL);

static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);

static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL);

static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);

drivers/char/tpm/tpm_i2c_stm_st33.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); 
static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL);

static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL);

static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, NULL);

static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL);

static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL);

static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);



static struct attribute *stm_tpm_attrs[] = {

drivers/char/tpm/tpm_ibmvtpm.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); 
static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL);

static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated,

		   NULL);

static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL);

static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL);

static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);

static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL);

static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);