Skip to contentSkip to conversation

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

PATCH Superseded Jarkko Sakkinen 1 participant 1 message Sep 15, 2015 TPM device driver

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tpm, tpm_crb: fix unaligned read of the command buffer address

The command buffer address is necessarily not naturally aligned. The hardware drops the entire read on some platforms and fills the address with 1's. This patch fixes the issue by splitting the read into two 32 bit reads.

---
 drivers/char/tpm/tpm_crb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/char/tpm/tpm_crb.c +4 -3
index b4564b6..c09b370 100644
@@ -68,7 +68,8 @@ struct crb_control_area {
 	u32 int_enable;
 	u32 int_sts;
 	u32 cmd_size;
-	u64 cmd_pa;
+	u32 cmd_pa_low;
+	u32 cmd_pa_high;
 	u32 rsp_size;
 	u64 rsp_pa;
 } __packed;
@@ -263,8 +264,8 @@ static int crb_acpi_add(struct acpi_device *device)
 		return -ENOMEM;
 	}
 
-	memcpy_fromio(&pa, &priv->cca->cmd_pa, 8);
-	pa = le64_to_cpu(pa);
+	pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) +
+		(u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));
 	priv->cmd = devm_ioremap_nocache(dev, pa,
 					 ioread32(&priv->cca->cmd_size));
 	if (!priv->cmd) {
Signature · 1 line
2.5.0