Commit 9550f210 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: Revert "tpm_tis: reserve chip for duration of tpm_tis_core_init" 

Revert a commit, which was included in Linux v5.5-rc3 because it did not
properly fix the issues it was supposed to fix.

Fixes: 21df4a8b ("tpm_tis: reserve chip for duration of tpm_tis_core_init")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=205935


Cc: stable@vger.kernel.org
Cc: Jerry Snitselaar <jsnitsel@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Tested-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarXiaoping Zhou <xiaoping.zhou@intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent c79f46a2

drivers/char/tpm/tpm_tis_core.c

+17 −18
Original line number Diff line number Diff line
@@ -978,13 +978,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 


	if (wait_startup(chip, 0) != 0) {

		rc = -ENODEV;

		goto err_start;

		goto out_err;

	}



	/* Take control of the TPM's interrupt hardware and shut it off */

	rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);

	if (rc < 0)

		goto err_start;

		goto out_err;



	intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT |

		   TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT;
@@ -993,21 +993,21 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 


	rc = tpm_chip_start(chip);

	if (rc)

		goto err_start;



		goto out_err;

	rc = tpm2_probe(chip);

	tpm_chip_stop(chip);

	if (rc)

		goto err_probe;

		goto out_err;



	rc = tpm_tis_read32(priv, TPM_DID_VID(0), &vendor);

	if (rc < 0)

		goto err_probe;

		goto out_err;



	priv->manufacturer_id = vendor;



	rc = tpm_tis_read8(priv, TPM_RID(0), &rid);

	if (rc < 0)

		goto err_probe;

		goto out_err;



	dev_info(dev, "%s TPM (device-id 0x%X, rev-id %d)\n",

		 (chip->flags & TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2",
@@ -1016,13 +1016,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 
	probe = probe_itpm(chip);

	if (probe < 0) {

		rc = -ENODEV;

		goto err_probe;

		goto out_err;

	}



	/* Figure out the capabilities */

	rc = tpm_tis_read32(priv, TPM_INTF_CAPS(priv->locality), &intfcaps);

	if (rc < 0)

		goto err_probe;

		goto out_err;



	dev_dbg(dev, "TPM interface capabilities (0x%x):\n",

		intfcaps);
@@ -1056,9 +1056,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 
		if (tpm_get_timeouts(chip)) {

			dev_err(dev, "Could not get TPM timeouts and durations\n");

			rc = -ENODEV;

			goto err_probe;

			goto out_err;

		}



		tpm_chip_start(chip);

		chip->flags |= TPM_CHIP_FLAG_IRQ;

		if (irq) {

			tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
@@ -1069,20 +1070,18 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 
		} else {

			tpm_tis_probe_irq(chip, intmask);

		}

	}



		tpm_chip_stop(chip);

	}



	rc = tpm_chip_register(chip);

	if (rc)

		goto err_start;



	return 0;

		goto out_err;



err_probe:

	tpm_chip_stop(chip);

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

		chip->ops->clk_enable(chip, false);



err_start:

	return 0;

out_err:

	if ((chip->ops != NULL) && (chip->ops->clk_enable != NULL))

		chip->ops->clk_enable(chip, false);

CRA Git | Maintained and supported by SUSTech CRA and CCSE