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

Commit 28eba2fd authored Jul 08, 2019 by Jarkko Sakkinen

tpm: Remove a deprecated comments about implicit sysfs locking



Remove all comments about implicit locking tpm-sysfs.c as the file was
updated in Linux v5.1 to use explicit locking.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

parent 1ea32c83

drivers/char/tpm/tpm-chip.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -287,12 +287,9 @@ static void tpm_devs_release(struct device *dev)
		* @dev: device to which the chip is associated.
		*
		* Issues a TPM2_Shutdown command prior to loss of power, as required by the
		* TPM 2.0 spec.
		* Then, calls bus- and device- specific shutdown code.
		* TPM 2.0 spec. Then, calls bus- and device- specific shutdown code.
		*
		* XXX: This codepath relies on the fact that sysfs is not enabled for
		* TPM2: sysfs uses an implicit lock on chip->ops, so this could race if TPM2
		* has sysfs support enabled before TPM sysfs's implicit locking is fixed.
		* Return: always 0 (i.e. success)
		*/
		static int tpm_class_shutdown(struct device *dev)
		{

drivers/char/tpm/tpm-sysfs.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -329,16 +329,9 @@ static const struct attribute_group tpm_dev_group = {

		void tpm_sysfs_add_device(struct tpm_chip *chip)
		{
		/* XXX: If you wish to remove this restriction, you must first update
		* tpm_sysfs to explicitly lock chip->ops.
		*/
		if (chip->flags & TPM_CHIP_FLAG_TPM2)
		return;

		/* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
		* is called before ops is null'd and the sysfs core synchronizes this
		* removal so that no callbacks are running or can run again
		*/
		WARN_ON(chip->groups_cnt != 0);
		chip->groups[chip->groups_cnt++] = &tpm_dev_group;
		}