Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-09-01 Thread Sascha Hauer 
On Tue, Aug 26, 2014 at 04:28:13PM +0200, Alexander Aring wrote:
 Hi,
 
 On Sat, Aug 23, 2014 at 05:19:22PM -0300, Ezequiel Garcia wrote:
  This commit adds NAND support for the controller present in Kirkwood SoCs.
  
 
 cool! I will test it on my DNS-325 platform, if I find some free time.
 
 Thanks for doing this.
 
  Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
  ---
   drivers/mtd/nand/Kconfig  |   7 ++
   drivers/mtd/nand/Makefile |   1 +
   drivers/mtd/nand/nand_orion.c | 162 
  ++
   3 files changed, 170 insertions(+)
   create mode 100644 drivers/mtd/nand/nand_orion.c
  
  diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
  index 04fe3c8..ccf1f9c 100644
  --- a/drivers/mtd/nand/Kconfig
  +++ b/drivers/mtd/nand/Kconfig
  @@ -90,6 +90,13 @@ config NAND_OMAP_GPMC
Support for NAND flash using GPMC. GPMC is a common memory
interface found on Texas Instrument's OMAP platforms
   
  +config NAND_ORION
  +   bool
  +   prompt Orion NAND driver
  +   depends on ARCH_MVEBU
  +   help
  + Support for the Orion NAND controller, present in Kirkwood SoCs.
  +
   config NAND_ATMEL
  bool
  prompt Atmel (AT91SAM9xxx) NAND driver
 ...
  +
  +static int orion_nand_probe(struct device_d *dev)
  +{
  +   struct device_node *dev_node = dev-device_node;
  +   struct orion_nand *priv;
  +   struct mtd_info *mtd;
  +   struct nand_chip *chip;
  +   struct clk *clk;
  +   void __iomem *io_base;
  +   int width, ret;
  +   u32 val = 0;
  +
  +   priv = xzalloc(sizeof(struct orion_nand));
  +   if (!priv) {
  +   ret = -ENOMEM;
  +   goto no_res;
  +   }
 
 checking on null with xzalloc isn't needed, if fails we run into panic.

removed the check while applying.

 
  +   mtd = priv-mtd;
  +   chip = priv-chip;
  +
  +   io_base = dev_request_mem_region(dev, 0);
  +
 
 here we should check the return value. I don't know what's now the
 behaviour on dev_request_mem_region if fail returns NULL or ERR_PTR.
 There was some discussion on the list.

It still returns NULL. I have a series converting it to return ERR_PTR,
but this isn't mainlined yet. I'll have to rebase it on current master.

Sascha


-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-08-26 Thread Sebastian Hesselbarth 

On 08/23/2014 10:19 PM, Ezequiel Garcia wrote:

This commit adds NAND support for the controller present in Kirkwood SoCs.


Ezequiel,

I just did a quick check through all public MVEBU datasheets. It looks
like Kirkwood is really the only SoC with this specific IP while Dove,
Armada 370, and XP have a different one.


Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
---
  drivers/mtd/nand/Kconfig  |   7 ++
  drivers/mtd/nand/Makefile |   1 +
  drivers/mtd/nand/nand_orion.c | 162 ++
  3 files changed, 170 insertions(+)
  create mode 100644 drivers/mtd/nand/nand_orion.c

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 04fe3c8..ccf1f9c 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -90,6 +90,13 @@ config NAND_OMAP_GPMC
  Support for NAND flash using GPMC. GPMC is a common memory
  interface found on Texas Instrument's OMAP platforms

+config NAND_ORION
+   bool
+   prompt Orion NAND driver
+   depends on ARCH_MVEBU


Therefore, we should limit this to ARCH_KIRKWOOD. Also, we could choose
to call the driver nand_kirkwood.c. OTOH, I am fine with Orion as long
as we find another good name for the other IP. Remember that Dove is
still kind-of-Orion.

FWIW,

Acked-by: Sebastian Hesselbarth sebastian.hesselba...@gmail.com

I'll give it a try on Guruplug later, too.


+   help
+ Support for the Orion NAND controller, present in Kirkwood SoCs.
+
  config NAND_ATMEL
bool
prompt Atmel (AT91SAM9xxx) NAND driver
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index a1414e1..02dacde 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_MTD_NAND_NOMADIK)+= 
nomadik_nand.o
  obj-$(CONFIG_NAND_IMX)+= nand_imx.o
  obj-$(CONFIG_NAND_IMX_BBM)+= nand_imx_bbm.o
  obj-$(CONFIG_NAND_OMAP_GPMC)  += nand_omap_gpmc.o 
nand_omap_bch_decoder.o
+obj-$(CONFIG_NAND_ORION)   += nand_orion.o
  obj-$(CONFIG_NAND_ATMEL)  += atmel_nand.o
  obj-$(CONFIG_NAND_S3C24XX)+= nand_s3c24xx.o
  pbl-$(CONFIG_NAND_S3C24XX)+= nand_s3c24xx.o
diff --git a/drivers/mtd/nand/nand_orion.c b/drivers/mtd/nand/nand_orion.c
new file mode 100644
index 000..9bdd3b4
--- /dev/null
+++ b/drivers/mtd/nand/nand_orion.c
@@ -0,0 +1,162 @@
+/*
+ * (C) Copyright 2014, Ezequiel Garcia ezequiel.gar...@free-electrons.com
+ *
+ * Based on Orion NAND driver from Linux (drivers/mtd/nand/orion_nand.c):
+ * Author: Tzachi Perelstein tza...@marvell.com
+ *
+ * This file is licensed under  the terms of the GNU General Public
+ * License version 2. This program is licensed as is without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include common.h
+#include driver.h
+#include malloc.h
+#include init.h
+#include io.h
+#include of_mtd.h
+#include errno.h
+#include linux/mtd/mtd.h
+#include linux/mtd/nand.h
+#include linux/clk.h
+
+struct orion_nand {
+   struct mtd_info mtd;
+   struct nand_chip chip;
+
+   u8 ale; /* address line number connected to ALE */
+   u8 cle; /* address line number connected to CLE */
+};
+
+static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int 
ctrl)
+{
+   struct nand_chip *chip = mtd-priv;
+   struct orion_nand *priv = chip-priv;
+   u32 offs;
+
+   if (cmd == NAND_CMD_NONE)
+   return;
+
+   if (ctrl  NAND_CLE)
+   offs = (1  priv-cle);
+   else if (ctrl  NAND_ALE)
+   offs = (1  priv-ale);
+   else
+   return;
+
+   if (chip-options  NAND_BUSWIDTH_16)
+   offs = 1;
+
+   writeb(cmd, chip-IO_ADDR_W + offs);
+}
+
+static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
+{
+   struct nand_chip *chip = mtd-priv;
+   void __iomem *io_base = chip-IO_ADDR_R;
+   uint64_t *buf64;
+   int i = 0;
+
+   while (len  (unsigned long)buf  7) {
+   *buf++ = readb(io_base);
+   len--;
+   }
+   buf64 = (uint64_t *)buf;
+   while (i  len/8) {
+   /*
+* Since GCC has no proper constraint (PR 43518)
+* force x variable to r2/r3 registers as ldrd instruction
+* requires first register to be even.
+*/
+   register uint64_t x asm (r2);
+
+   asm volatile (ldrd\t%0, [%1] : =r (x) : r (io_base));
+   buf64[i++] = x;
+   }
+   i *= 8;
+   while (i  len)
+   buf[i++] = readb(io_base);
+}
+
+static int orion_nand_probe(struct device_d *dev)
+{
+   struct device_node *dev_node = dev-device_node;
+   struct orion_nand *priv;
+   struct mtd_info *mtd;
+   struct nand_chip *chip;
+   struct clk *clk;
+   void __iomem *io_base;
+   int width,

Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-08-26 Thread Alexander Aring 
Hi,

On Sat, Aug 23, 2014 at 05:19:22PM -0300, Ezequiel Garcia wrote:
 This commit adds NAND support for the controller present in Kirkwood SoCs.
 

cool! I will test it on my DNS-325 platform, if I find some free time.

Thanks for doing this.

 Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
 ---
  drivers/mtd/nand/Kconfig  |   7 ++
  drivers/mtd/nand/Makefile |   1 +
  drivers/mtd/nand/nand_orion.c | 162 
 ++
  3 files changed, 170 insertions(+)
  create mode 100644 drivers/mtd/nand/nand_orion.c
 
 diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
 index 04fe3c8..ccf1f9c 100644
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
 @@ -90,6 +90,13 @@ config NAND_OMAP_GPMC
 Support for NAND flash using GPMC. GPMC is a common memory
 interface found on Texas Instrument's OMAP platforms
  
 +config NAND_ORION
 + bool
 + prompt Orion NAND driver
 + depends on ARCH_MVEBU
 + help
 +   Support for the Orion NAND controller, present in Kirkwood SoCs.
 +
  config NAND_ATMEL
   bool
   prompt Atmel (AT91SAM9xxx) NAND driver
...
 +
 +static int orion_nand_probe(struct device_d *dev)
 +{
 + struct device_node *dev_node = dev-device_node;
 + struct orion_nand *priv;
 + struct mtd_info *mtd;
 + struct nand_chip *chip;
 + struct clk *clk;
 + void __iomem *io_base;
 + int width, ret;
 + u32 val = 0;
 +
 + priv = xzalloc(sizeof(struct orion_nand));
 + if (!priv) {
 + ret = -ENOMEM;
 + goto no_res;
 + }

checking on null with xzalloc isn't needed, if fails we run into panic.

 + mtd = priv-mtd;
 + chip = priv-chip;
 +
 + io_base = dev_request_mem_region(dev, 0);
 +

here we should check the return value. I don't know what's now the
behaviour on dev_request_mem_region if fail returns NULL or ERR_PTR.
There was some discussion on the list.

- Alex

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-08-26 Thread Ezequiel Garcia 
On 26 Aug 04:28 PM, Alexander Aring wrote:
 Hi,
 
 On Sat, Aug 23, 2014 at 05:19:22PM -0300, Ezequiel Garcia wrote:
  This commit adds NAND support for the controller present in Kirkwood SoCs.
  
 
 cool! I will test it on my DNS-325 platform, if I find some free time.
 
 Thanks for doing this.
 
  Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
  ---
   drivers/mtd/nand/Kconfig  |   7 ++
   drivers/mtd/nand/Makefile |   1 +
   drivers/mtd/nand/nand_orion.c | 162 
  ++
   3 files changed, 170 insertions(+)
   create mode 100644 drivers/mtd/nand/nand_orion.c
  
  diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
  index 04fe3c8..ccf1f9c 100644
  --- a/drivers/mtd/nand/Kconfig
  +++ b/drivers/mtd/nand/Kconfig
  @@ -90,6 +90,13 @@ config NAND_OMAP_GPMC
Support for NAND flash using GPMC. GPMC is a common memory
interface found on Texas Instrument's OMAP platforms
   
  +config NAND_ORION
  +   bool
  +   prompt Orion NAND driver
  +   depends on ARCH_MVEBU
  +   help
  + Support for the Orion NAND controller, present in Kirkwood SoCs.
  +
   config NAND_ATMEL
  bool
  prompt Atmel (AT91SAM9xxx) NAND driver
 ...
  +
  +static int orion_nand_probe(struct device_d *dev)
  +{
  +   struct device_node *dev_node = dev-device_node;
  +   struct orion_nand *priv;
  +   struct mtd_info *mtd;
  +   struct nand_chip *chip;
  +   struct clk *clk;
  +   void __iomem *io_base;
  +   int width, ret;
  +   u32 val = 0;
  +
  +   priv = xzalloc(sizeof(struct orion_nand));
  +   if (!priv) {
  +   ret = -ENOMEM;
  +   goto no_res;
  +   }
 
 checking on null with xzalloc isn't needed, if fails we run into panic.
 

Ah, OK.

  +   mtd = priv-mtd;
  +   chip = priv-chip;
  +
  +   io_base = dev_request_mem_region(dev, 0);
  +
 
 here we should check the return value. I don't know what's now the
 behaviour on dev_request_mem_region if fail returns NULL or ERR_PTR.
 There was some discussion on the list.
 

OK, I'll take a look.

-- 
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-08-26 Thread Ezequiel Garcia 
On 26 Aug 04:09 PM, Sebastian Hesselbarth wrote:
 On 08/23/2014 10:19 PM, Ezequiel Garcia wrote:
 This commit adds NAND support for the controller present in Kirkwood SoCs.
 
 Ezequiel,
 
 I just did a quick check through all public MVEBU datasheets. It looks
 like Kirkwood is really the only SoC with this specific IP while Dove,
 Armada 370, and XP have a different one.
 

Indeed. Dove's NAND controller seems to be NFC (aka NFC v1), which is
probably similar to the one in PXA3xx. Armada 370/375/380/XP documents
it as NFC v2. Both versions are similar enough to use the same pxa3xx-nand
driver.

I plan to push support for NFCv2 only in Barebox.

Regarding the so-called Orion driver, grepping Linux it seems the IP is
used in Kirkwood and Orion5x.

 Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
 ---
   drivers/mtd/nand/Kconfig  |   7 ++
   drivers/mtd/nand/Makefile |   1 +
   drivers/mtd/nand/nand_orion.c | 162 
  ++
   3 files changed, 170 insertions(+)
   create mode 100644 drivers/mtd/nand/nand_orion.c
 
 diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
 index 04fe3c8..ccf1f9c 100644
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
 @@ -90,6 +90,13 @@ config NAND_OMAP_GPMC
Support for NAND flash using GPMC. GPMC is a common memory
interface found on Texas Instrument's OMAP platforms
 
 +config NAND_ORION
 +bool
 +prompt Orion NAND driver
 +depends on ARCH_MVEBU
 
 Therefore, we should limit this to ARCH_KIRKWOOD. Also, we could choose
 to call the driver nand_kirkwood.c. OTOH, I am fine with Orion as long
 as we find another good name for the other IP. Remember that Dove is
 still kind-of-Orion.
 

Sure, I'm fine with naming this nand-kirkwood.c and limit it to ARCH_KIRKWOOD
to avoid confusion.

 FWIW,
 
 Acked-by: Sebastian Hesselbarth sebastian.hesselba...@gmail.com
 
 I'll give it a try on Guruplug later, too.
 

Good. Any test is very well-received (although this one is almost a
copy-paste from Linux, given it's really simple).

-- 
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-08-26 Thread Sebastian Hesselbarth 
On 08/26/2014 06:15 PM, Ezequiel Garcia wrote:
 On 26 Aug 04:09 PM, Sebastian Hesselbarth wrote:
 On 08/23/2014 10:19 PM, Ezequiel Garcia wrote:
 This commit adds NAND support for the controller present in Kirkwood SoCs.

 I just did a quick check through all public MVEBU datasheets. It looks
 like Kirkwood is really the only SoC with this specific IP while Dove,
 Armada 370, and XP have a different one.

 
 Indeed. Dove's NAND controller seems to be NFC (aka NFC v1), which is
 probably similar to the one in PXA3xx. Armada 370/375/380/XP documents
 it as NFC v2. Both versions are similar enough to use the same pxa3xx-nand
 driver.
 
 I plan to push support for NFCv2 only in Barebox.

Ok, I'll add NFCv1 differences when I find a way to easily boot barebox
on d{2,3}plug. AFAIKT, both lack UART boot mode switches like Cubox has.

 Regarding the so-called Orion driver, grepping Linux it seems the IP is
 used in Kirkwood and Orion5x.

Ach, silly me, I didn't check Orion5x FS because it is not available
on marvell.com. If it is the same IP, nand_orion.c of course *is* the
correct name. Sorry for the noise.

 Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
 ---
  drivers/mtd/nand/Kconfig  |   7 ++
  drivers/mtd/nand/Makefile |   1 +
  drivers/mtd/nand/nand_orion.c | 162 
 ++
  3 files changed, 170 insertions(+)
  create mode 100644 drivers/mtd/nand/nand_orion.c

 diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
 index 04fe3c8..ccf1f9c 100644
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
 @@ -90,6 +90,13 @@ config NAND_OMAP_GPMC
   Support for NAND flash using GPMC. GPMC is a common memory
   interface found on Texas Instrument's OMAP platforms

 +config NAND_ORION
 +   bool
 +   prompt Orion NAND driver
 +   depends on ARCH_MVEBU

 Therefore, we should limit this to ARCH_KIRKWOOD. Also, we could choose
 to call the driver nand_kirkwood.c. OTOH, I am fine with Orion as long
 as we find another good name for the other IP. Remember that Dove is
 still kind-of-Orion.

 
 Sure, I'm fine with naming this nand-kirkwood.c and limit it to ARCH_KIRKWOOD
 to avoid confusion.

nand_orion.c is ok, but still we should limit it to ARCH_KIRKWOOD.

 FWIW,

 Acked-by: Sebastian Hesselbarth sebastian.hesselba...@gmail.com

 I'll give it a try on Guruplug later, too.

 
 Good. Any test is very well-received (although this one is almost a
 copy-paste from Linux, given it's really simple).
 

Yeah, probably.

Sebastian

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] nand: Add Marvell Orion NAND driver

2014-08-26 Thread Sebastian Hesselbarth 
On 08/26/2014 06:15 PM, Ezequiel Garcia wrote:
 On 26 Aug 04:09 PM, Sebastian Hesselbarth wrote:
 On 08/23/2014 10:19 PM, Ezequiel Garcia wrote:
 This commit adds NAND support for the controller present in Kirkwood SoCs.
[...]
 FWIW,

 Acked-by: Sebastian Hesselbarth sebastian.hesselba...@gmail.com

 I'll give it a try on Guruplug later, too.

 
 Good. Any test is very well-received (although this one is almost a
 copy-paste from Linux, given it's really simple).

And

Tested-by: Sebastian Hesselbarth sebastian.hesselba...@gmail.com

on Guruplug.


___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox