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

Commit 1fbad302 authored by Winkler, Tomas's avatar Winkler, Tomas Committed by Jarkko Sakkinen
Browse files

tpm: tpm_crb: relinquish locality on error path. 



In crb_map_io() function, __crb_request_locality() is called prior
to crb_cmd_ready(), but if one of the consecutive function fails
the flow bails out instead of trying to relinquish locality.
This patch adds goto jump to __crb_relinquish_locality() on the error path.

Fixes: 888d867d (tpm: cmd_ready command can be issued only after granting locality)
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent c922ff8e

drivers/char/tpm/tpm_crb.c

+7 −3
Original line number Diff line number Diff line
@@ -511,8 +511,10 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, 


	priv->regs_t = crb_map_res(dev, priv, &io_res, buf->control_address,

				   sizeof(struct crb_regs_tail));

	if (IS_ERR(priv->regs_t))

		return PTR_ERR(priv->regs_t);

	if (IS_ERR(priv->regs_t)) {

		ret = PTR_ERR(priv->regs_t);

		goto out_relinquish_locality;

	}



	/*

	 * PTT HW bug w/a: wake up the device to access
@@ -520,7 +522,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, 
	 */

	ret = crb_cmd_ready(dev, priv);

	if (ret)

		return ret;

		goto out_relinquish_locality;



	pa_high = ioread32(&priv->regs_t->ctrl_cmd_pa_high);

	pa_low  = ioread32(&priv->regs_t->ctrl_cmd_pa_low);
@@ -565,6 +567,8 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, 


	crb_go_idle(dev, priv);



out_relinquish_locality:



	__crb_relinquish_locality(dev, priv, 0);



	return ret;