From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Sakkinen Subject: Re: [PATCH v3 6/7] tpm_crb: Drop le32_to_cpu(ioread32(..)) Date: Sun, 3 Jan 2016 19:28:01 +0200 Message-ID: <20160103172801.GE4155@intel.com> References: <1450376600-6970-1-git-send-email-jgunthorpe@obsidianresearch.com> <1450376600-6970-7-git-send-email-jgunthorpe@obsidianresearch.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1450376600-6970-7-git-send-email-jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Jason Gunthorpe Cc: Martin Wilck , tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= List-Id: tpmdd-devel@lists.sourceforge.net On Thu, Dec 17, 2015 at 11:23:19AM -0700, Jason Gunthorpe wrote: > 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). Reviewed-by: Jarkko Sakkinen /Jarkko > Signed-off-by: Jason Gunthorpe > Tested-by: Jarkko Sakkinen > --- > 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 > ------------------------------------------------------------------------------ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbcACR2H (ORCPT ); Sun, 3 Jan 2016 12:28:07 -0500 Received: from mga11.intel.com ([192.55.52.93]:19521 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbcACR2D (ORCPT ); Sun, 3 Jan 2016 12:28:03 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,516,1444719600"; d="scan'208";a="885497832" Date: Sun, 3 Jan 2016 19:28:01 +0200 From: Jarkko Sakkinen To: Jason Gunthorpe Cc: tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Martin Wilck , Peter Huewe , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Subject: Re: [PATCH v3 6/7] tpm_crb: Drop le32_to_cpu(ioread32(..)) Message-ID: <20160103172801.GE4155@intel.com> References: <1450376600-6970-1-git-send-email-jgunthorpe@obsidianresearch.com> <1450376600-6970-7-git-send-email-jgunthorpe@obsidianresearch.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1450376600-6970-7-git-send-email-jgunthorpe@obsidianresearch.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 17, 2015 at 11:23:19AM -0700, Jason Gunthorpe wrote: > 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). Reviewed-by: Jarkko Sakkinen /Jarkko > Signed-off-by: Jason Gunthorpe > Tested-by: Jarkko Sakkinen > --- > 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 >