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

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

tpm_tis: Add timeouts sysfs entry 



Display the TPM's interface timeouts in a 'timeouts' 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>
Signed-off-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
parent e3e1a1e1

drivers/char/tpm/tpm.c

+16 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ void tpm_get_timeouts(struct tpm_chip *chip) 
	if (timeout && timeout < 1000) {

		/* timeouts in msec rather usec */

		scale = 1000;

		chip->vendor.timeout_adjusted = true;

	}

	if (timeout)

		chip->vendor.timeout_a = usecs_to_jiffies(timeout * scale);
@@ -965,6 +966,21 @@ ssize_t tpm_show_durations(struct device *dev, struct device_attribute *attr, 
}

EXPORT_SYMBOL_GPL(tpm_show_durations);



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

			  char *buf)

{

	struct tpm_chip *chip = dev_get_drvdata(dev);



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

		       jiffies_to_usecs(chip->vendor.timeout_a),

		       jiffies_to_usecs(chip->vendor.timeout_b),

		       jiffies_to_usecs(chip->vendor.timeout_c),

		       jiffies_to_usecs(chip->vendor.timeout_d),

		       chip->vendor.timeout_adjusted

		       ? "adjusted" : "original");

}

EXPORT_SYMBOL_GPL(tpm_show_timeouts);



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
@@ -58,6 +58,8 @@ 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 *);

extern ssize_t tpm_show_timeouts(struct device *,

				 struct device_attribute *attr, char *);



struct tpm_chip;
@@ -83,6 +85,7 @@ struct tpm_vendor_specific { 
	struct list_head list;

	int locality;

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

	bool timeout_adjusted;

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

	bool duration_adjusted;

drivers/char/tpm/tpm_tis.c

+3 −1
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, 
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 DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);



static struct attribute *tis_attrs[] = {

	&dev_attr_pubek.attr,
@@ -387,7 +388,8 @@ static struct attribute *tis_attrs[] = { 
	&dev_attr_temp_deactivated.attr,

	&dev_attr_caps.attr,

	&dev_attr_cancel.attr,

	&dev_attr_durations.attr, NULL,

	&dev_attr_durations.attr,

	&dev_attr_timeouts.attr, NULL,

};



static struct attribute_group tis_attr_grp = {