Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1224355

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

Show all headers | View raw

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.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
 drivers/char/tpm/tpm_crb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index b4564b6..12bb41c 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -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;
@@ -264,7 +265,9 @@ static int crb_acpi_add(struct acpi_device *device)
 	}
 
 	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) {
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] tpm, tpm_crb: fix unaligned read of the command buffer address Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2015-09-14 19:20 +0200
  Re: [PATCH] tpm, tpm_crb: fix unaligned read of the command buffer  address Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2015-09-14 19:40 +0200
    Re: [PATCH] tpm, tpm_crb: fix unaligned read of the command buffer  address Jarkko Sakkinen <jarkko.sakkinen@intel.com> - 2015-09-15 12:20 +0200
      Re: [PATCH] tpm, tpm_crb: fix unaligned read of the command buffer  address Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2015-09-15 18:40 +0200
        Re: [PATCH] tpm, tpm_crb: fix unaligned read of the command buffer  address Jarkko Sakkinen <jarkko.sakkinen@intel.com> - 2015-09-15 18:50 +0200

csiph-web