From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Cc: "Martin Wilck" <Martin.Wilck@ts.fujitsu.com>,
"Peter Huewe" <peterhuewe@gmx.de>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: [PATCH v3 6/7] tpm_crb: Drop le32_to_cpu(ioread32(..))
Date: Thu, 17 Dec 2015 11:23:19 -0700 [thread overview]
Message-ID: <1450376600-6970-7-git-send-email-jgunthorpe@obsidianresearch.com> (raw)
In-Reply-To: <1450376600-6970-1-git-send-email-jgunthorpe@obsidianresearch.com>
ioread32 and readl are defined to read from PCI style memory, ie little
endian and return the result in host order. On platforms where a
swap is required ioread32/readl do the swap internally (eg see ppc).
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm_crb.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 8dd70696ebe8..0237006dc4d8 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -89,7 +89,7 @@ static u8 crb_status(struct tpm_chip *chip)
struct crb_priv *priv = chip->vendor.priv;
u8 sts = 0;
- if ((le32_to_cpu(ioread32(&priv->cca->start)) & CRB_START_INVOKE) !=
+ if ((ioread32(&priv->cca->start) & CRB_START_INVOKE) !=
CRB_START_INVOKE)
sts |= CRB_STS_COMPLETE;
@@ -105,7 +105,7 @@ static int crb_recv(struct tpm_chip *chip, u8 *buf, size_t count)
if (count < 6)
return -EIO;
- if (le32_to_cpu(ioread32(&priv->cca->sts)) & CRB_CA_STS_ERROR)
+ if (ioread32(&priv->cca->sts) & CRB_CA_STS_ERROR)
return -EIO;
memcpy_fromio(buf, priv->rsp, 6);
@@ -141,11 +141,11 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
struct crb_priv *priv = chip->vendor.priv;
int rc = 0;
- if (len > le32_to_cpu(ioread32(&priv->cca->cmd_size))) {
+ if (len > ioread32(&priv->cca->cmd_size)) {
dev_err(&chip->dev,
"invalid command count value %x %zx\n",
(unsigned int) len,
- (size_t) le32_to_cpu(ioread32(&priv->cca->cmd_size)));
+ (size_t) ioread32(&priv->cca->cmd_size));
return -E2BIG;
}
@@ -181,7 +181,7 @@ static void crb_cancel(struct tpm_chip *chip)
static bool crb_req_canceled(struct tpm_chip *chip, u8 status)
{
struct crb_priv *priv = chip->vendor.priv;
- u32 cancel = le32_to_cpu(ioread32(&priv->cca->cancel));
+ u32 cancel = ioread32(&priv->cca->cancel);
return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE;
}
@@ -251,10 +251,10 @@ static int crb_acpi_add(struct acpi_device *device)
return -ENOMEM;
}
- 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));
+ pa = ((u64)ioread32(&priv->cca->cmd_pa_high) << 32) |
+ (u64)ioread32(&priv->cca->cmd_pa_low);
+ priv->cmd =
+ devm_ioremap_nocache(dev, pa, ioread32(&priv->cca->cmd_size));
if (!priv->cmd) {
dev_err(dev, "ioremap of the command buffer failed\n");
return -ENOMEM;
@@ -262,8 +262,8 @@ static int crb_acpi_add(struct acpi_device *device)
memcpy_fromio(&pa, &priv->cca->rsp_pa, 8);
pa = le64_to_cpu(pa);
- priv->rsp = devm_ioremap_nocache(dev, pa,
- ioread32(&priv->cca->rsp_size));
+ priv->rsp =
+ devm_ioremap_nocache(dev, pa, ioread32(&priv->cca->rsp_size));
if (!priv->rsp) {
dev_err(dev, "ioremap of the response buffer failed\n");
return -ENOMEM;
--
2.1.4
next prev parent reply other threads:[~2015-12-17 18:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 18:23 [PATCH v3 0/7] tpm_tis: Clean up force module parameter Jason Gunthorpe
2015-12-17 18:23 ` [PATCH v3 1/7] tpm_crb: Use the common ACPI definition of struct acpi_tpm2 Jason Gunthorpe
2016-01-03 17:09 ` Jarkko Sakkinen
2016-01-04 18:23 ` Jason Gunthorpe
2016-01-04 18:49 ` Jarkko Sakkinen
2015-12-17 18:23 ` [PATCH v3 2/7] tpm_tis: Disable interrupt auto probing on a per-device basis Jason Gunthorpe
2016-01-03 17:20 ` Jarkko Sakkinen
2016-01-04 18:24 ` Jason Gunthorpe
2016-01-04 18:32 ` Jarkko Sakkinen
2015-12-17 18:23 ` [PATCH v3 3/7] tpm_tis: Do not fall back to a hardcoded address for TPM2 Jason Gunthorpe
2015-12-18 9:34 ` Jarkko Sakkinen
2015-12-18 16:51 ` Jason Gunthorpe
2015-12-20 12:34 ` Jarkko Sakkinen
2015-12-17 18:23 ` [PATCH v3 4/7] tpm_tis: Use devm_ioremap_resource Jason Gunthorpe
2016-01-03 17:23 ` Jarkko Sakkinen
2015-12-17 18:23 ` [PATCH v3 5/7] tpm_tis: Clean up the force=1 module parameter Jason Gunthorpe
2016-01-03 17:26 ` Jarkko Sakkinen
2016-01-04 18:27 ` Jason Gunthorpe
2015-12-17 18:23 ` Jason Gunthorpe [this message]
2016-01-03 17:28 ` [PATCH v3 6/7] tpm_crb: Drop le32_to_cpu(ioread32(..)) Jarkko Sakkinen
2015-12-17 18:23 ` [PATCH v3 7/7] tpm_crb: Use devm_ioremap_resource Jason Gunthorpe
2016-01-03 17:32 ` Jarkko Sakkinen
2016-01-04 18:30 ` Jason Gunthorpe
2016-01-04 19:43 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450376600-6970-7-git-send-email-jgunthorpe@obsidianresearch.com \
--to=jgunthorpe@obsidianresearch.com \
--cc=Martin.Wilck@ts.fujitsu.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).