* [PATCH] mtd: nand: pxa3xx: fix build on ARM64
@ 2015-02-03 23:06 Rob Herring
2015-02-06 0:51 ` Brian Norris
2015-02-06 18:32 ` Ezequiel Garcia
0 siblings, 2 replies; 5+ messages in thread
From: Rob Herring @ 2015-02-03 23:06 UTC (permalink / raw)
To: Ezequiel Garcia, David Woodhouse, Brian Norris; +Cc: Rob Herring, linux-mtd
In preparation to enable ARCH_MMP on ARM64, a couple of fixes are needed
to build the pxa3xx_nand driver:
Legacy DMA will only used on ARM, so also make it condtional on
CONFIG_ARM.
__raw_{read,write}sl are not available on ARM64 or generically, so use
the readsl/writesl variants instead.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: linux-mtd@lists.infradead.org
---
drivers/mtd/nand/pxa3xx_nand.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 96b0b1d..404d390 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -28,7 +28,7 @@
#include <linux/of_device.h>
#include <linux/of_mtd.h>
-#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
+#if defined(CONFIG_ARM) && (defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP))
#define ARCH_HAS_DMA
#endif
@@ -486,24 +486,24 @@ static void handle_data_pio(struct pxa3xx_nand_info *info)
switch (info->state) {
case STATE_PIO_WRITING:
- __raw_writesl(info->mmio_base + NDDB,
- info->data_buff + info->data_buff_pos,
- DIV_ROUND_UP(do_bytes, 4));
+ writesl(info->mmio_base + NDDB,
+ info->data_buff + info->data_buff_pos,
+ DIV_ROUND_UP(do_bytes, 4));
if (info->oob_size > 0)
- __raw_writesl(info->mmio_base + NDDB,
- info->oob_buff + info->oob_buff_pos,
- DIV_ROUND_UP(info->oob_size, 4));
+ writesl(info->mmio_base + NDDB,
+ info->oob_buff + info->oob_buff_pos,
+ DIV_ROUND_UP(info->oob_size, 4));
break;
case STATE_PIO_READING:
- __raw_readsl(info->mmio_base + NDDB,
- info->data_buff + info->data_buff_pos,
- DIV_ROUND_UP(do_bytes, 4));
+ readsl(info->mmio_base + NDDB,
+ info->data_buff + info->data_buff_pos,
+ DIV_ROUND_UP(do_bytes, 4));
if (info->oob_size > 0)
- __raw_readsl(info->mmio_base + NDDB,
- info->oob_buff + info->oob_buff_pos,
- DIV_ROUND_UP(info->oob_size, 4));
+ readsl(info->mmio_base + NDDB,
+ info->oob_buff + info->oob_buff_pos,
+ DIV_ROUND_UP(info->oob_size, 4));
break;
default:
dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,
@@ -1580,7 +1580,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
info->pdev = pdev;
info->variant = pxa3xx_nand_get_variant(pdev);
for (cs = 0; cs < pdata->num_cs; cs++) {
- mtd = (struct mtd_info *)((unsigned int)&info[1] +
+ mtd = (struct mtd_info *)((void *)&info[1] +
(sizeof(*mtd) + sizeof(*host)) * cs);
chip = (struct nand_chip *)(&mtd[1]);
host = (struct pxa3xx_nand_host *)chip;
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: nand: pxa3xx: fix build on ARM64
2015-02-03 23:06 [PATCH] mtd: nand: pxa3xx: fix build on ARM64 Rob Herring
@ 2015-02-06 0:51 ` Brian Norris
2015-02-06 18:32 ` Ezequiel Garcia
1 sibling, 0 replies; 5+ messages in thread
From: Brian Norris @ 2015-02-06 0:51 UTC (permalink / raw)
To: Rob Herring; +Cc: Thomas Petazzoni, linux-mtd, David Woodhouse, Ezequiel Garcia
On Tue, Feb 03, 2015 at 05:06:16PM -0600, Rob Herring wrote:
> In preparation to enable ARCH_MMP on ARM64, a couple of fixes are needed
> to build the pxa3xx_nand driver:
>
> Legacy DMA will only used on ARM, so also make it condtional on
> CONFIG_ARM.
> __raw_{read,write}sl are not available on ARM64 or generically, so use
> the readsl/writesl variants instead.
Hmm, why the non __raw naming? I seems a little misleading that all the
other (non-raw) {read,write}{w,l}() helpers have endian swapping and
barriers, but this helper has neither.
Anyway, I think the patch looks good. Thomas or Ezequiel, can I get an
ack?
> Signed-off-by: Rob Herring <robh@kernel.org>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Brian Norris <computersforpeace@gmail.com>
> Cc: linux-mtd@lists.infradead.org
> ---
> drivers/mtd/nand/pxa3xx_nand.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
> index 96b0b1d..404d390 100644
> --- a/drivers/mtd/nand/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/pxa3xx_nand.c
> @@ -28,7 +28,7 @@
> #include <linux/of_device.h>
> #include <linux/of_mtd.h>
>
> -#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
> +#if defined(CONFIG_ARM) && (defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP))
> #define ARCH_HAS_DMA
> #endif
>
> @@ -486,24 +486,24 @@ static void handle_data_pio(struct pxa3xx_nand_info *info)
>
> switch (info->state) {
> case STATE_PIO_WRITING:
> - __raw_writesl(info->mmio_base + NDDB,
> - info->data_buff + info->data_buff_pos,
> - DIV_ROUND_UP(do_bytes, 4));
> + writesl(info->mmio_base + NDDB,
> + info->data_buff + info->data_buff_pos,
> + DIV_ROUND_UP(do_bytes, 4));
>
> if (info->oob_size > 0)
> - __raw_writesl(info->mmio_base + NDDB,
> - info->oob_buff + info->oob_buff_pos,
> - DIV_ROUND_UP(info->oob_size, 4));
> + writesl(info->mmio_base + NDDB,
> + info->oob_buff + info->oob_buff_pos,
> + DIV_ROUND_UP(info->oob_size, 4));
> break;
> case STATE_PIO_READING:
> - __raw_readsl(info->mmio_base + NDDB,
> - info->data_buff + info->data_buff_pos,
> - DIV_ROUND_UP(do_bytes, 4));
> + readsl(info->mmio_base + NDDB,
> + info->data_buff + info->data_buff_pos,
> + DIV_ROUND_UP(do_bytes, 4));
>
> if (info->oob_size > 0)
> - __raw_readsl(info->mmio_base + NDDB,
> - info->oob_buff + info->oob_buff_pos,
> - DIV_ROUND_UP(info->oob_size, 4));
> + readsl(info->mmio_base + NDDB,
> + info->oob_buff + info->oob_buff_pos,
> + DIV_ROUND_UP(info->oob_size, 4));
> break;
> default:
> dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,
> @@ -1580,7 +1580,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
> info->pdev = pdev;
> info->variant = pxa3xx_nand_get_variant(pdev);
> for (cs = 0; cs < pdata->num_cs; cs++) {
> - mtd = (struct mtd_info *)((unsigned int)&info[1] +
> + mtd = (struct mtd_info *)((void *)&info[1] +
> (sizeof(*mtd) + sizeof(*host)) * cs);
> chip = (struct nand_chip *)(&mtd[1]);
> host = (struct pxa3xx_nand_host *)chip;
Brian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: nand: pxa3xx: fix build on ARM64
2015-02-03 23:06 [PATCH] mtd: nand: pxa3xx: fix build on ARM64 Rob Herring
2015-02-06 0:51 ` Brian Norris
@ 2015-02-06 18:32 ` Ezequiel Garcia
2015-02-06 18:43 ` Brian Norris
1 sibling, 1 reply; 5+ messages in thread
From: Ezequiel Garcia @ 2015-02-06 18:32 UTC (permalink / raw)
To: Rob Herring, David Woodhouse, Brian Norris; +Cc: linux-mtd
On 02/03/2015 08:06 PM, Rob Herring wrote:
[..]
> @@ -1580,7 +1580,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
> info->pdev = pdev;
> info->variant = pxa3xx_nand_get_variant(pdev);
> for (cs = 0; cs < pdata->num_cs; cs++) {
> - mtd = (struct mtd_info *)((unsigned int)&info[1] +
> + mtd = (struct mtd_info *)((void *)&info[1] +
> (sizeof(*mtd) + sizeof(*host)) * cs);
> chip = (struct nand_chip *)(&mtd[1]);
> host = (struct pxa3xx_nand_host *)chip;
>
Those casts are an eyesore to me. Is this change related to the patch?
--
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: nand: pxa3xx: fix build on ARM64
2015-02-06 18:32 ` Ezequiel Garcia
@ 2015-02-06 18:43 ` Brian Norris
2015-02-06 18:57 ` Ezequiel Garcia
0 siblings, 1 reply; 5+ messages in thread
From: Brian Norris @ 2015-02-06 18:43 UTC (permalink / raw)
To: Ezequiel Garcia; +Cc: Rob Herring, David Woodhouse, linux-mtd
On Fri, Feb 06, 2015 at 03:32:26PM -0300, Ezequiel Garcia wrote:
> On 02/03/2015 08:06 PM, Rob Herring wrote:
> [..]
> > @@ -1580,7 +1580,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
> > info->pdev = pdev;
> > info->variant = pxa3xx_nand_get_variant(pdev);
> > for (cs = 0; cs < pdata->num_cs; cs++) {
> > - mtd = (struct mtd_info *)((unsigned int)&info[1] +
> > + mtd = (struct mtd_info *)((void *)&info[1] +
> > (sizeof(*mtd) + sizeof(*host)) * cs);
> > chip = (struct nand_chip *)(&mtd[1]);
> > host = (struct pxa3xx_nand_host *)chip;
> >
>
> Those casts are an eyesore to me.
I suppose the (struct mtd_info *) cast is unecessary now, since the
(void *) will be implicitly casted just fine. But I'm not sure if it's
worth dropping it.
> Is this change related to the patch?
I believe the (void *) cast is a necessary change because
sizeof(pointer) != sizeof(unsigned int) on a 64-bit arch, so the
(unsigned int) cast would (rightly) generate a warning about the unsafe
cast. You're losing the top 32 bits.
Brian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: nand: pxa3xx: fix build on ARM64
2015-02-06 18:43 ` Brian Norris
@ 2015-02-06 18:57 ` Ezequiel Garcia
0 siblings, 0 replies; 5+ messages in thread
From: Ezequiel Garcia @ 2015-02-06 18:57 UTC (permalink / raw)
To: Brian Norris; +Cc: Rob Herring, David Woodhouse, linux-mtd
On 02/06/2015 03:43 PM, Brian Norris wrote:
> On Fri, Feb 06, 2015 at 03:32:26PM -0300, Ezequiel Garcia wrote:
>> On 02/03/2015 08:06 PM, Rob Herring wrote:
>> [..]
>>> @@ -1580,7 +1580,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
>>> info->pdev = pdev;
>>> info->variant = pxa3xx_nand_get_variant(pdev);
>>> for (cs = 0; cs < pdata->num_cs; cs++) {
>>> - mtd = (struct mtd_info *)((unsigned int)&info[1] +
>>> + mtd = (struct mtd_info *)((void *)&info[1] +
>>> (sizeof(*mtd) + sizeof(*host)) * cs);
>>> chip = (struct nand_chip *)(&mtd[1]);
>>> host = (struct pxa3xx_nand_host *)chip;
>>>
>>
>> Those casts are an eyesore to me.
>
> I suppose the (struct mtd_info *) cast is unecessary now, since the
> (void *) will be implicitly casted just fine. But I'm not sure if it's
> worth dropping it.
>
>> Is this change related to the patch?
>
> I believe the (void *) cast is a necessary change because
> sizeof(pointer) != sizeof(unsigned int) on a 64-bit arch, so the
> (unsigned int) cast would (rightly) generate a warning about the unsafe
> cast. You're losing the top 32 bits.
>
Right, that makes sense. Thanks for the clarification.
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
--
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-06 18:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-03 23:06 [PATCH] mtd: nand: pxa3xx: fix build on ARM64 Rob Herring
2015-02-06 0:51 ` Brian Norris
2015-02-06 18:32 ` Ezequiel Garcia
2015-02-06 18:43 ` Brian Norris
2015-02-06 18:57 ` Ezequiel Garcia
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).