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

Commit 149789ce authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by Peter Huewe
Browse files

tpm, tpm_crb: fix unaligned read of the command buffer address 



The command buffer address must be read with exactly two 32-bit reads.
Otherwise, on some HW platforms, it seems that HW will abort the read
operation, which causes CPU to fill the read bytes with 1's. Therefore,
we cannot rely on memcpy_fromio() but must call ioread32() two times
instead.

Also, this matches the PC Client Platform TPM Profile specification,
which defines command buffer address with two 32-bit fields.

Cc: stable@kernel.org
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent 60ecd86c

drivers/char/tpm/tpm_crb.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -74,7 +74,8 @@ struct crb_control_area { 
	u32 int_enable;

	u32 int_enable;

	u32 int_sts;

	u32 int_sts;

	u32 cmd_size;

	u32 cmd_size;

	u64 cmd_pa;

	u32 cmd_pa_low;

	u32 cmd_pa_high;

	u32 rsp_size;

	u32 rsp_size;

	u64 rsp_pa;

	u64 rsp_pa;

} __packed;

} __packed;
@@ -273,8 +274,8 @@ static int crb_acpi_add(struct acpi_device *device) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	memcpy_fromio(&pa, &priv->cca->cmd_pa, 8);

	pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) |

	pa = le64_to_cpu(pa);

		(u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));

	priv->cmd = devm_ioremap_nocache(dev, pa,

	priv->cmd = devm_ioremap_nocache(dev, pa,

					 ioread32(&priv->cca->cmd_size));

					 ioread32(&priv->cca->cmd_size));

	if (!priv->cmd) {

	if (!priv->cmd) {