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

Groups > linux.kernel > #1249059 > unrolled thread

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

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 01/10] tpm, tpm_crb: fix unaligned read of the command buffer address Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2015-10-16 20:50 +0200
    Re: [PATCH 01/10] tpm, tpm_crb: fix unaligned read of the command buffer address Peter Hüwe <PeterHuewe@gmx.de> - 2015-10-18 05:00 +0200
      Re: [PATCH 01/10] tpm, tpm_crb: fix unaligned read of the command  buffer address Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2015-10-18 13:20 +0200

#1249059 — [PATCH 01/10] 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.

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

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 1267322..623fc0a 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -74,7 +74,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;
@@ -273,8 +274,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) {
-- 
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/

[toc] | [next] | [standalone]

#1249672

Am Freitag, 16. Oktober 2015, 20:40:20 schrieb Jarkko Sakkinen:
> +       pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) +
> +               (u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));

The canonical form would be 
> +       pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) |
> +               (u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));
?
Or am I missing something?
Shall I fix-up?

Thanks,
Peter
--
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/

[toc] | [prev] | [next] | [standalone]

#1250112 — Re: [PATCH 01/10] tpm, tpm_crb: fix unaligned read of the command buffer address

On Sun, Oct 18, 2015 at 05:02:55AM +0200, Peter Hüwe wrote:
> Am Freitag, 16. Oktober 2015, 20:40:20 schrieb Jarkko Sakkinen:
> > +       pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) +
> > +               (u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));
> 
> The canonical form would be 
> > +       pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) |
> > +               (u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));
> ?
> Or am I missing something?
> Shall I fix-up?

Please do. Current works but definitely your form is correct.

> Thanks,
> Peter

/Jarkko
--
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web