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

Commit af782f33 authored by Christophe Ricard's avatar Christophe Ricard Committed by Jarkko Sakkinen
Browse files

tpm: Move tpm_vendor_specific data related with PTP specification to tpm_chip 



Move tpm_vendor_specific data related to TCG PTP specification to tpm_chip.

Move all fields directly linked with well known TCG concepts and used in
TPM drivers (tpm_i2c_atmel, tpm_i2c_infineon, tpm_i2c_nuvoton, tpm_tis
and xen-tpmfront) as well as in TPM core files (tpm-sysfs, tpm-interface
and tpm2-cmd) in tpm_chip.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 56671c89

drivers/char/tpm/st33zp24/st33zp24.c

+9 −9
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int request_locality(struct tpm_chip *chip) 
	if (ret < 0)

		return ret;



	stop = jiffies + chip->vendor.timeout_a;

	stop = jiffies + chip->timeout_a;



	/* Request locality is usually effective after the request */

	do {
@@ -205,7 +205,7 @@ static int get_burstcount(struct tpm_chip *chip) 


	tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);



	stop = jiffies + chip->vendor.timeout_d;

	stop = jiffies + chip->timeout_d;

	do {

		status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS + 1,

					    &temp, 1);
@@ -337,7 +337,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) 
	while (size < count &&

	       wait_for_stat(chip,

			     TPM_STS_DATA_AVAIL | TPM_STS_VALID,

			     chip->vendor.timeout_c,

			     chip->timeout_c,

			     &tpm_dev->read_queue, true) == 0) {

		burstcnt = get_burstcount(chip);

		if (burstcnt < 0)
@@ -406,7 +406,7 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf, 
	if ((status & TPM_STS_COMMAND_READY) == 0) {

		st33zp24_cancel(chip);

		if (wait_for_stat

		    (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b,

		    (chip, TPM_STS_COMMAND_READY, chip->timeout_b,

		     &tpm_dev->read_queue, false) < 0) {

			ret = -ETIME;

			goto out_err;
@@ -561,10 +561,10 @@ int st33zp24_probe(void *phy_id, const struct st33zp24_phy_ops *ops, 
	tpm_dev->phy_id = phy_id;

	tpm_dev->ops = ops;



	chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);

	chip->vendor.timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->vendor.timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);

	chip->timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT);



	tpm_dev->locality = LOCALITY0;
@@ -673,7 +673,7 @@ int st33zp24_pm_resume(struct device *dev) 
	if (gpio_is_valid(tpm_dev->io_lpcpd)) {

		gpio_set_value(tpm_dev->io_lpcpd, 1);

		ret = wait_for_stat(chip,

				TPM_STS_VALID, chip->vendor.timeout_b,

				TPM_STS_VALID, chip->timeout_b,

				&tpm_dev->read_queue, false);

	} else {

		ret = tpm_pm_resume(dev);

drivers/char/tpm/tpm-interface.c

+24 −24
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, 
		duration_idx = tpm_ordinal_duration[ordinal];



	if (duration_idx != TPM_UNDEFINED)

		duration = chip->vendor.duration[duration_idx];

		duration = chip->duration[duration_idx];

	if (duration <= 0)

		return 2 * 60 * HZ;

	else
@@ -505,15 +505,15 @@ int tpm_get_timeouts(struct tpm_chip *chip) 


	if (chip->flags & TPM_CHIP_FLAG_TPM2) {

		/* Fixed timeouts for TPM2 */

		chip->vendor.timeout_a = msecs_to_jiffies(TPM2_TIMEOUT_A);

		chip->vendor.timeout_b = msecs_to_jiffies(TPM2_TIMEOUT_B);

		chip->vendor.timeout_c = msecs_to_jiffies(TPM2_TIMEOUT_C);

		chip->vendor.timeout_d = msecs_to_jiffies(TPM2_TIMEOUT_D);

		chip->vendor.duration[TPM_SHORT] =

		chip->timeout_a = msecs_to_jiffies(TPM2_TIMEOUT_A);

		chip->timeout_b = msecs_to_jiffies(TPM2_TIMEOUT_B);

		chip->timeout_c = msecs_to_jiffies(TPM2_TIMEOUT_C);

		chip->timeout_d = msecs_to_jiffies(TPM2_TIMEOUT_D);

		chip->duration[TPM_SHORT] =

		    msecs_to_jiffies(TPM2_DURATION_SHORT);

		chip->vendor.duration[TPM_MEDIUM] =

		chip->duration[TPM_MEDIUM] =

		    msecs_to_jiffies(TPM2_DURATION_MEDIUM);

		chip->vendor.duration[TPM_LONG] =

		chip->duration[TPM_LONG] =

		    msecs_to_jiffies(TPM2_DURATION_LONG);

		return 0;

	}
@@ -561,10 +561,10 @@ int tpm_get_timeouts(struct tpm_chip *chip) 
	 * of misreporting.

	 */

	if (chip->ops->update_timeouts != NULL)

		chip->vendor.timeout_adjusted =

		chip->timeout_adjusted =

			chip->ops->update_timeouts(chip, new_timeout);



	if (!chip->vendor.timeout_adjusted) {

	if (!chip->timeout_adjusted) {

		/* Don't overwrite default if value is 0 */

		if (new_timeout[0] != 0 && new_timeout[0] < 1000) {

			int i;
@@ -572,12 +572,12 @@ int tpm_get_timeouts(struct tpm_chip *chip) 
			/* timeouts in msec rather usec */

			for (i = 0; i != ARRAY_SIZE(new_timeout); i++)

				new_timeout[i] *= 1000;

			chip->vendor.timeout_adjusted = true;

			chip->timeout_adjusted = true;

		}

	}



	/* Report adjusted timeouts */

	if (chip->vendor.timeout_adjusted) {

	if (chip->timeout_adjusted) {

		dev_info(&chip->dev,

			 HW_ERR "Adjusting reported timeouts: A %lu->%luus B %lu->%luus C %lu->%luus D %lu->%luus\n",

			 old_timeout[0], new_timeout[0],
@@ -586,10 +586,10 @@ int tpm_get_timeouts(struct tpm_chip *chip) 
			 old_timeout[3], new_timeout[3]);

	}



	chip->vendor.timeout_a = usecs_to_jiffies(new_timeout[0]);

	chip->vendor.timeout_b = usecs_to_jiffies(new_timeout[1]);

	chip->vendor.timeout_c = usecs_to_jiffies(new_timeout[2]);

	chip->vendor.timeout_d = usecs_to_jiffies(new_timeout[3]);

	chip->timeout_a = usecs_to_jiffies(new_timeout[0]);

	chip->timeout_b = usecs_to_jiffies(new_timeout[1]);

	chip->timeout_c = usecs_to_jiffies(new_timeout[2]);

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



duration:

	tpm_cmd.header.in = tpm_getcap_header;
@@ -608,11 +608,11 @@ int tpm_get_timeouts(struct tpm_chip *chip) 
		return -EINVAL;



	duration_cap = &tpm_cmd.params.getcap_out.cap.duration;

	chip->vendor.duration[TPM_SHORT] =

	chip->duration[TPM_SHORT] =

	    usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_short));

	chip->vendor.duration[TPM_MEDIUM] =

	chip->duration[TPM_MEDIUM] =

	    usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_medium));

	chip->vendor.duration[TPM_LONG] =

	chip->duration[TPM_LONG] =

	    usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_long));



	/* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above
@@ -620,11 +620,11 @@ int tpm_get_timeouts(struct tpm_chip *chip) 
	 * fix up the resulting too-small TPM_SHORT value to make things work.

	 * We also scale the TPM_MEDIUM and -_LONG values by 1000.

	 */

	if (chip->vendor.duration[TPM_SHORT] < (HZ / 100)) {

		chip->vendor.duration[TPM_SHORT] = HZ;

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

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

		chip->vendor.duration_adjusted = true;

	if (chip->duration[TPM_SHORT] < (HZ / 100)) {

		chip->duration[TPM_SHORT] = HZ;

		chip->duration[TPM_MEDIUM] *= 1000;

		chip->duration[TPM_LONG] *= 1000;

		chip->duration_adjusted = true;

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

	}

	return 0;

drivers/char/tpm/tpm-sysfs.c

+10 −10
Original line number Diff line number Diff line
@@ -236,14 +236,14 @@ static ssize_t durations_show(struct device *dev, struct device_attribute *attr, 
{

	struct tpm_chip *chip = dev_get_drvdata(dev);



	if (chip->vendor.duration[TPM_LONG] == 0)

	if (chip->duration[TPM_LONG] == 0)

		return 0;



	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

		       jiffies_to_usecs(chip->duration[TPM_SHORT]),

		       jiffies_to_usecs(chip->duration[TPM_MEDIUM]),

		       jiffies_to_usecs(chip->duration[TPM_LONG]),

		       chip->duration_adjusted

		       ? "adjusted" : "original");

}

static DEVICE_ATTR_RO(durations);
@@ -254,11 +254,11 @@ static ssize_t timeouts_show(struct device *dev, struct device_attribute *attr, 
	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

		       jiffies_to_usecs(chip->timeout_a),

		       jiffies_to_usecs(chip->timeout_b),

		       jiffies_to_usecs(chip->timeout_c),

		       jiffies_to_usecs(chip->timeout_d),

		       chip->timeout_adjusted

		       ? "adjusted" : "original");

}

static DEVICE_ATTR_RO(timeouts);

drivers/char/tpm/tpm.h

+7 −4
Original line number Diff line number Diff line
@@ -131,10 +131,6 @@ enum tpm2_startup_types { 
struct tpm_chip;



struct tpm_vendor_specific {

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

	bool timeout_adjusted;

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

	bool duration_adjusted;

	void *priv;

};
@@ -171,6 +167,13 @@ struct tpm_chip { 
	struct mutex tpm_mutex;	/* tpm is processing */



	struct tpm_vendor_specific vendor;

	unsigned long timeout_a; /* jiffies */

	unsigned long timeout_b; /* jiffies */

	unsigned long timeout_c; /* jiffies */

	unsigned long timeout_d; /* jiffies */

	bool timeout_adjusted;

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

	bool duration_adjusted;



	struct dentry **bios_dir;

drivers/char/tpm/tpm2-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) 
		index = tpm2_ordinal_duration[ordinal - TPM2_CC_FIRST];



	if (index != TPM_UNDEFINED)

		duration = chip->vendor.duration[index];

		duration = chip->duration[index];



	if (duration <= 0)

		duration = 2 * 60 * HZ;