* [PATCH] atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy
@ 2014-10-22 9:35 Josh Wu
2014-11-05 23:03 ` Brian Norris
0 siblings, 1 reply; 2+ messages in thread
From: Josh Wu @ 2014-10-22 9:35 UTC (permalink / raw)
To: linux-mtd
Cc: vinod.koul, nicolas.ferre, herve.codina, Josh Wu, voice.shen,
computersforpeace
There is no need to use memcpy32_toio/memcpy32_fromio to transfer data
between memory and NFC sram. As the NFC sram is a also a memery space
not a io space.
So just use memcpy is enough.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
drivers/mtd/nand/atmel_nand.c | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 5c1423a..28d452e 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -105,7 +105,7 @@ struct atmel_nfc {
struct completion comp_xfer_done;
/* Point to the sram bank which include readed data via NFC */
- void __iomem *data_in_sram;
+ void *data_in_sram;
bool will_write_sram;
};
static struct atmel_nfc nand_nfc;
@@ -257,26 +257,6 @@ static int atmel_nand_set_enable_ready_pins(struct mtd_info *mtd)
return res;
}
-static void memcpy32_fromio(void *trg, const void __iomem *src, size_t size)
-{
- int i;
- u32 *t = trg;
- const __iomem u32 *s = src;
-
- for (i = 0; i < (size >> 2); i++)
- *t++ = readl_relaxed(s++);
-}
-
-static void memcpy32_toio(void __iomem *trg, const void *src, int size)
-{
- int i;
- u32 __iomem *t = trg;
- const u32 *s = src;
-
- for (i = 0; i < (size >> 2); i++)
- writel_relaxed(*s++, t++);
-}
-
/*
* Minimal-overhead PIO for data access.
*/
@@ -286,7 +266,7 @@ static void atmel_read_buf8(struct mtd_info *mtd, u8 *buf, int len)
struct atmel_nand_host *host = nand_chip->priv;
if (host->nfc && host->nfc->use_nfc_sram && host->nfc->data_in_sram) {
- memcpy32_fromio(buf, host->nfc->data_in_sram, len);
+ memcpy(buf, host->nfc->data_in_sram, len);
host->nfc->data_in_sram += len;
} else {
__raw_readsb(nand_chip->IO_ADDR_R, buf, len);
@@ -299,7 +279,7 @@ static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len)
struct atmel_nand_host *host = nand_chip->priv;
if (host->nfc && host->nfc->use_nfc_sram && host->nfc->data_in_sram) {
- memcpy32_fromio(buf, host->nfc->data_in_sram, len);
+ memcpy(buf, host->nfc->data_in_sram, len);
host->nfc->data_in_sram += len;
} else {
__raw_readsw(nand_chip->IO_ADDR_R, buf, len / 2);
@@ -1983,14 +1963,14 @@ static int nfc_sram_write_page(struct mtd_info *mtd, struct nand_chip *chip,
if (use_dma) {
if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) != 0)
/* Fall back to use cpu copy */
- memcpy32_toio(sram, buf, len);
+ memcpy(sram, buf, len);
} else {
- memcpy32_toio(sram, buf, len);
+ memcpy(sram, buf, len);
}
cfg = nfc_readl(host->nfc->hsmc_regs, CFG);
if (unlikely(raw) && oob_required) {
- memcpy32_toio(sram + len, chip->oob_poi, mtd->oobsize);
+ memcpy(sram + len, chip->oob_poi, mtd->oobsize);
len += mtd->oobsize;
nfc_writel(host->nfc->hsmc_regs, CFG, cfg | NFC_CFG_WSPARE);
} else {
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy
2014-10-22 9:35 [PATCH] atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy Josh Wu
@ 2014-11-05 23:03 ` Brian Norris
0 siblings, 0 replies; 2+ messages in thread
From: Brian Norris @ 2014-11-05 23:03 UTC (permalink / raw)
To: Josh Wu; +Cc: vinod.koul, nicolas.ferre, linux-mtd, voice.shen, herve.codina
On Wed, Oct 22, 2014 at 05:35:24PM +0800, Josh Wu wrote:
> There is no need to use memcpy32_toio/memcpy32_fromio to transfer data
> between memory and NFC sram. As the NFC sram is a also a memery space
> not a io space.
> So just use memcpy is enough.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
> drivers/mtd/nand/atmel_nand.c | 32 ++++++--------------------------
> 1 file changed, 6 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index 5c1423a..28d452e 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -105,7 +105,7 @@ struct atmel_nfc {
> struct completion comp_xfer_done;
>
> /* Point to the sram bank which include readed data via NFC */
> - void __iomem *data_in_sram;
> + void *data_in_sram;
If you're going to do this, you should also modify sram_bank0 and drop
the __iomem annotation on 'sram' in nfc_sram_write_page().
Also, checkpatch complains here:
WARNING:SPACE_BEFORE_TAB: please, no space before tabs
#26: FILE: drivers/mtd/nand/atmel_nand.c:108:
+^Ivoid ^I^I^I*data_in_sram;$
With those fixed:
Reviewed-by: Brian Norris <computersforpeace@gmail.com>
> bool will_write_sram;
> };
> static struct atmel_nfc nand_nfc;
> @@ -257,26 +257,6 @@ static int atmel_nand_set_enable_ready_pins(struct mtd_info *mtd)
> return res;
> }
>
> -static void memcpy32_fromio(void *trg, const void __iomem *src, size_t size)
> -{
> - int i;
> - u32 *t = trg;
> - const __iomem u32 *s = src;
> -
> - for (i = 0; i < (size >> 2); i++)
> - *t++ = readl_relaxed(s++);
> -}
> -
> -static void memcpy32_toio(void __iomem *trg, const void *src, int size)
> -{
> - int i;
> - u32 __iomem *t = trg;
> - const u32 *s = src;
> -
> - for (i = 0; i < (size >> 2); i++)
> - writel_relaxed(*s++, t++);
> -}
> -
> /*
> * Minimal-overhead PIO for data access.
> */
> @@ -286,7 +266,7 @@ static void atmel_read_buf8(struct mtd_info *mtd, u8 *buf, int len)
> struct atmel_nand_host *host = nand_chip->priv;
>
> if (host->nfc && host->nfc->use_nfc_sram && host->nfc->data_in_sram) {
> - memcpy32_fromio(buf, host->nfc->data_in_sram, len);
> + memcpy(buf, host->nfc->data_in_sram, len);
> host->nfc->data_in_sram += len;
> } else {
> __raw_readsb(nand_chip->IO_ADDR_R, buf, len);
> @@ -299,7 +279,7 @@ static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len)
> struct atmel_nand_host *host = nand_chip->priv;
>
> if (host->nfc && host->nfc->use_nfc_sram && host->nfc->data_in_sram) {
> - memcpy32_fromio(buf, host->nfc->data_in_sram, len);
> + memcpy(buf, host->nfc->data_in_sram, len);
> host->nfc->data_in_sram += len;
> } else {
> __raw_readsw(nand_chip->IO_ADDR_R, buf, len / 2);
> @@ -1983,14 +1963,14 @@ static int nfc_sram_write_page(struct mtd_info *mtd, struct nand_chip *chip,
> if (use_dma) {
> if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) != 0)
> /* Fall back to use cpu copy */
> - memcpy32_toio(sram, buf, len);
> + memcpy(sram, buf, len);
> } else {
> - memcpy32_toio(sram, buf, len);
> + memcpy(sram, buf, len);
> }
>
> cfg = nfc_readl(host->nfc->hsmc_regs, CFG);
> if (unlikely(raw) && oob_required) {
> - memcpy32_toio(sram + len, chip->oob_poi, mtd->oobsize);
> + memcpy(sram + len, chip->oob_poi, mtd->oobsize);
> len += mtd->oobsize;
> nfc_writel(host->nfc->hsmc_regs, CFG, cfg | NFC_CFG_WSPARE);
> } else {
Brian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-05 23:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-22 9:35 [PATCH] atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy Josh Wu
2014-11-05 23:03 ` Brian Norris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox