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

Commit 04ab2293 authored by Stefan Berger's avatar Stefan Berger Committed by Rajiv Andrade
Browse files

tpm_tis: Introduce durations sysfs entry 



Display the TPM's command timeouts in a 'durations' 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: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Tested-by: default avatarGuillaume Chazarain <guichaz@gmail.com>
Signed-off-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
parent e934acca

drivers/char/tpm/tpm.c

+15 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ void tpm_get_timeouts(struct tpm_chip *chip) 
		chip->vendor.duration[TPM_SHORT] = HZ;

		chip->vendor.duration[TPM_MEDIUM] *= 1000;

		chip->vendor.duration[TPM_LONG] *= 1000;

		chip->vendor.duration_adjusted = true;

		dev_info(chip->dev, "Adjusting TPM timeout parameters.");

	}

}
@@ -944,6 +945,20 @@ ssize_t tpm_show_caps_1_2(struct device * dev, 
}

EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);



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

			  char *buf)

{

	struct tpm_chip *chip = dev_get_drvdata(dev);



	return sprintf(buf, "%d %d %d [%s]\n",

		       jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),

		       jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),

		       jiffies_to_usecs(chip->vendor.duration[TPM_LONG]),

		       chip->vendor.duration_adjusted

		       ? "adjusted" : "original");

}

EXPORT_SYMBOL_GPL(tpm_show_durations);



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

			const char *buf, size_t count)

{

drivers/char/tpm/tpm.h

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ extern ssize_t tpm_show_owned(struct device *, struct device_attribute *attr, 
				char *);

extern ssize_t tpm_show_temp_deactivated(struct device *,

					 struct device_attribute *attr, char *);

extern ssize_t tpm_show_durations(struct device *,

				  struct device_attribute *attr, char *);



struct tpm_chip;
@@ -82,6 +84,7 @@ struct tpm_vendor_specific { 
	int locality;

	unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */

	unsigned long duration[3]; /* jiffies */

	bool duration_adjusted;



	wait_queue_head_t read_queue;

	wait_queue_head_t int_queue;

drivers/char/tpm/tpm_tis.c

+3 −1
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ 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(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);

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



static struct attribute *tis_attrs[] = {

	&dev_attr_pubek.attr,
@@ -385,7 +386,8 @@ static struct attribute *tis_attrs[] = { 
	&dev_attr_owned.attr,

	&dev_attr_temp_deactivated.attr,

	&dev_attr_caps.attr,

	&dev_attr_cancel.attr, NULL,

	&dev_attr_cancel.attr,

	&dev_attr_durations.attr, NULL,

};



static struct attribute_group tis_attr_grp = {