All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] mtd: add altera quadspi driver
@ 2015-11-03 13:22 Thomas Chou
  2015-11-03 17:44 ` Marek Vasut
                   ` (3 more replies)
  0 siblings, 4 replies; 34+ messages in thread
From: Thomas Chou @ 2015-11-03 13:22 UTC (permalink / raw)
  To: u-boot

Add Altera Generic Quad SPI Controller support. The controller
converts SPI NOR flash to parallel flash interface. So it is
not like other SPI flash, but rather like CFI flash.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
 doc/device-tree-bindings/mtd/altera_qspi.txt |  35 +++
 drivers/mtd/Kconfig                          |   9 +
 drivers/mtd/Makefile                         |   1 +
 drivers/mtd/altera_qspi.c                    | 312 +++++++++++++++++++++++++++
 4 files changed, 357 insertions(+)
 create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
 create mode 100644 drivers/mtd/altera_qspi.c

diff --git a/doc/device-tree-bindings/mtd/altera_qspi.txt b/doc/device-tree-bindings/mtd/altera_qspi.txt
new file mode 100644
index 0000000..3361ac9
--- /dev/null
+++ b/doc/device-tree-bindings/mtd/altera_qspi.txt
@@ -0,0 +1,35 @@
+Altera QUADSPI driver
+
+Required properties:
+- compatible: Should be "altr,quadspi-1.0"
+- reg: Address and length of the register set  for the device. It contains
+  the information of registers in the same order as described by reg-names
+- reg-names: Should contain the reg names
+  "avl_csr": Should contain the register configuration base address
+  "avl_mem": Should contain the data base address
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.
+- flash device tree subnode, there must be a node with the following fields:
+	- compatible: Should contain the flash name:
+	  1. EPCS:   epcs16, epcs64, epcs128
+	  2. EPCQ:   epcq16, epcq32, epcq64, epcq128, epcq256, epcq512, epcq1024
+	  3. EPCQ-L: epcql256, epcql512, epcql1024
+	- #address-cells: please refer to /mtd/partition.txt
+	- #size-cells: please refer to /mtd/partition.txt
+	For partitions inside each flash, please refer to /mtd/partition.txt
+
+Example:
+
+	quadspi_controller_0: quadspi at 0x180014a0 {
+		compatible = "altr,quadspi-1.0";
+		reg = <0x180014a0 0x00000020>,
+		      <0x14000000 0x04000000>;
+		reg-names = "avl_csr", "avl_mem";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		flash0: epcq512 at 0 {
+			compatible = "altr,epcq512";
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+	};
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 367c4fe..c16b1d0 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -19,6 +19,15 @@ config CFI_FLASH
 	  option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
 	  for more information on CFI.
 
+config ALTERA_QSPI
+	bool "Altera Generic Quad SPI Controller"
+	depends on MTD
+	help
+	  This enables access to Altera EPCQ/EPCS flash chips using the
+	  Altera Generic Quad SPI Controller. The controller converts SPI
+	  NOR flash to parallel flash interface. Please find details on the
+	  "Embedded Peripherals IP User Guide" of Altera.
+
 endmenu
 
 source "drivers/mtd/nand/Kconfig"
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index c23c0c1..7f018a4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -11,6 +11,7 @@ endif
 obj-$(CONFIG_MTD) += mtd-uclass.o
 obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
 obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
+obj-$(CONFIG_ALTERA_QSPI) += altera_qspi.o
 obj-$(CONFIG_HAS_DATAFLASH) += at45.o
 obj-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
 obj-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
new file mode 100644
index 0000000..06bc53e
--- /dev/null
+++ b/drivers/mtd/altera_qspi.c
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <fdt_support.h>
+#include <flash.h>
+#include <mtd.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * The QUADSPI_MEM_OP register is used to do memory protect and erase operations
+ */
+#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
+#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
+#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
+
+/*
+ * The QUADSPI_ISR register is used to determine whether an invalid write or
+ * erase operation trigerred an interrupt
+ */
+#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
+#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
+
+struct altera_qspi_regs {
+	u32	rd_status;
+	u32	rd_sid;
+	u32	rd_rdid;
+	u32	mem_op;
+	u32	isr;
+	u32	imr;
+	u32	chip_select;
+};
+
+struct altera_qspi_platdata {
+	struct altera_qspi_regs *regs;
+	void *base;
+	unsigned long size;
+};
+
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips info */
+
+void flash_print_info(flash_info_t *info)
+{
+	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
+	       info->size >> 20, info->sector_count);
+}
+
+int flash_erase(flash_info_t *info, int s_first, int s_last)
+{
+	struct mtd_info *mtd = info->mtd;
+	struct erase_info instr;
+	int ret;
+
+	memset(&instr, 0, sizeof(instr));
+	instr.addr = mtd->erasesize * s_first;
+	instr.len = mtd->erasesize * (s_last + 1 - s_first);
+	ret = mtd_erase(mtd, &instr);
+	if (ret)
+		return ERR_NOT_ERASED;
+
+	return 0;
+}
+
+int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
+{
+	struct mtd_info *mtd = info->mtd;
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	ulong base = (ulong)pdata->base;
+	loff_t to = addr - base;
+	size_t retlen;
+	int ret;
+
+	ret = mtd_write(mtd, to, cnt, &retlen, src);
+	if (ret)
+		return ERR_NOT_ERASED;
+
+	return 0;
+}
+
+unsigned long flash_init(void)
+{
+	struct udevice *dev;
+
+	/* probe every MTD device */
+	for (uclass_first_device(UCLASS_MTD, &dev);
+	     dev;
+	     uclass_next_device(&dev)) {
+	}
+
+	return flash_info[0].size;
+}
+
+static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	size_t addr = instr->addr;
+	size_t len = instr->len;
+	size_t end = addr + len;
+	u32 sect;
+	u32 stat;
+
+	instr->state = MTD_ERASING;
+	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
+	while (addr < end) {
+		sect = addr / mtd->erasesize;
+		sect <<= 8;
+		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
+		debug("erase %08x\n", sect);
+		writel(sect, &regs->mem_op);
+		stat = readl(&regs->isr);
+		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
+			/* erase failed, sector might be protected */
+			debug("erase %08x fail %x\n", sect, stat);
+			writel(stat, &regs->isr); /* clear isr */
+			instr->state = MTD_ERASE_FAILED;
+			return -EIO;
+		}
+		addr += mtd->erasesize;
+	}
+	instr->state = MTD_ERASE_DONE;
+	mtd_erase_callback(instr);
+
+	return 0;
+}
+
+static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len,
+			    size_t *retlen, u_char *buf)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+
+	memcpy(buf, pdata->base + from, len);
+	*retlen = len;
+
+	return 0;
+}
+
+static inline u32 add_byte(u32 data, u8 byte, int shift)
+{
+	data &= ~(0xff << shift);
+	data |= byte << shift;
+	return data;
+}
+
+static int altera_qspi_write_word(struct mtd_info *mtd, loff_t to,
+				  u32 data)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	u32 pos = (u32)to;
+	u32 stat;
+
+	/* write to flash 32 bits at a time */
+	writel(data, pdata->base + pos);
+	/* check whether write triggered a illegal write interrupt */
+	stat = readl(&regs->isr);
+	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
+		/* write failed, sector might be protected */
+		debug("write %08x fail %x\n", pos, stat);
+		writel(stat, &regs->isr); /* clear isr */
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len,
+			     size_t *retlen, const u_char *buf)
+{
+	const u_char *end = buf + len;
+	unsigned shift;
+	u32 data;
+	int ret;
+
+	shift = (to & (sizeof(u32) - 1)) * 8; /* first shift to add byte */
+	to &= ~(sizeof(u32) - 1); /* get lower aligned address */
+	while (buf < end) {
+		data = 0xffffffff; /* pad data */
+		while (buf < end && shift < 32) {
+			/* add byte from buf */
+			data = add_byte(data, *buf++, shift);
+			shift += 8;
+		}
+		ret = altera_qspi_write_word(mtd, to, data);
+		if (ret)
+			return ret;
+		to += sizeof(u32);
+		shift = 0;
+	}
+	*retlen = len;
+
+	return 0;
+}
+
+static void altera_qspi_sync(struct mtd_info *mtd)
+{
+}
+
+static int altera_qspi_probe(struct udevice *dev)
+{
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	unsigned long base = (unsigned long)pdata->base;
+	struct mtd_info *mtd;
+	flash_info_t *flash = &flash_info[0];
+	u32 rdid;
+	int i;
+
+	rdid = readl(&regs->rd_rdid);
+	debug("rdid %x\n", rdid);
+
+	mtd = calloc(1, sizeof(struct mtd_info));
+	if (!mtd)
+		return -ENOMEM;
+	dev->uclass_priv = mtd;
+	mtd->dev = dev;
+	mtd->name		= "nor0";
+	mtd->type		= MTD_NORFLASH;
+	mtd->flags		= MTD_CAP_NORFLASH;
+	mtd->size		= 1 << ((rdid & 0xff) - 6);
+	mtd->writesize		= 1;
+	mtd->writebufsize	= mtd->writesize;
+	mtd->_erase		= altera_qspi_erase;
+	mtd->_read		= altera_qspi_read;
+	mtd->_write		= altera_qspi_write;
+	mtd->_sync		= altera_qspi_sync;
+	mtd->numeraseregions = 0;
+	mtd->erasesize = 0x10000;
+	if (add_mtd_device(mtd))
+		return -ENOMEM;
+
+	flash->mtd = mtd;
+	flash->size = mtd->size;
+	flash->sector_count = mtd->size / mtd->erasesize;
+	flash->flash_id = rdid;
+	flash->start[0] = base;
+	for (i = 1; i < flash->sector_count; i++)
+		flash->start[i] = flash->start[i - 1] + mtd->erasesize;
+	gd->bd->bi_flashstart = base;
+
+	return 0;
+}
+
+static int altera_qspi_ofdata_to_platdata(struct udevice *dev)
+{
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	void *blob = (void *)gd->fdt_blob;
+	int node = dev->of_offset;
+	const char *list, *end;
+	const fdt32_t *cell;
+	void *base;
+	unsigned long addr, size;
+	int parent, addrc, sizec;
+	int len, idx;
+
+	/*
+	 * decode regs. there are multiple reg tuples, and they need to
+	 * match with reg-names.
+	 */
+	parent = fdt_parent_offset(blob, node);
+	of_bus_default_count_cells(blob, parent, &addrc, &sizec);
+	list = fdt_getprop(blob, node, "reg-names", &len);
+	if (!list)
+		return -ENOENT;
+	end = list + len;
+	cell = fdt_getprop(blob, node, "reg", &len);
+	if (!cell)
+		return -ENOENT;
+	idx = 0;
+	while (list < end) {
+		addr = fdt_translate_address((void *)blob,
+					     node, cell + idx);
+		size = fdt_addr_to_cpu(cell[idx + addrc]);
+		base = ioremap(addr, size);
+		len = strlen(list);
+		if (strcmp(list, "avl_csr") == 0) {
+			pdata->regs = base;
+		} else if (strcmp(list, "avl_mem") == 0) {
+			pdata->base = base;
+			pdata->size = size;
+		}
+		idx += addrc + sizec;
+		list += (len + 1);
+	}
+
+	return 0;
+}
+
+static const struct udevice_id altera_qspi_ids[] = {
+	{ .compatible = "altr,quadspi-1.0" },
+	{}
+};
+
+U_BOOT_DRIVER(altera_qspi) = {
+	.name	= "altera_qspi",
+	.id	= UCLASS_MTD,
+	.of_match = altera_qspi_ids,
+	.ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata),
+	.probe	= altera_qspi_probe,
+};
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 13:22 [U-Boot] [PATCH] mtd: add altera quadspi driver Thomas Chou
@ 2015-11-03 17:44 ` Marek Vasut
  2015-11-03 17:49   ` Jagan Teki
  2015-11-04  2:36   ` Thomas Chou
  2015-11-04 15:56 ` Chin Liang See
                   ` (2 subsequent siblings)
  3 siblings, 2 replies; 34+ messages in thread
From: Marek Vasut @ 2015-11-03 17:44 UTC (permalink / raw)
  To: u-boot

On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
> Add Altera Generic Quad SPI Controller support. The controller
> converts SPI NOR flash to parallel flash interface. So it is
> not like other SPI flash, but rather like CFI flash.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---

You might want to look at https://lwn.net/Articles/636882/ , it is the
driver for the same hardware, but for Linux. But keep in mind that the
driver had some difficulties getting in, you might want to check the
discussions in linux-mtd .

[...]

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 17:44 ` Marek Vasut
@ 2015-11-03 17:49   ` Jagan Teki
  2015-11-03 17:52     ` Marek Vasut
  2015-11-04  2:36   ` Thomas Chou
  1 sibling, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-03 17:49 UTC (permalink / raw)
  To: u-boot

On 3 November 2015 at 23:14, Marek Vasut <marex@denx.de> wrote:
> On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
>> Add Altera Generic Quad SPI Controller support. The controller
>> converts SPI NOR flash to parallel flash interface. So it is
>> not like other SPI flash, but rather like CFI flash.

This should be part of drivers/mtd/spi-nor which I'm working
currently, might take couple of days to push the patches to ML.

>>
>> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
>> ---
>
> You might want to look at https://lwn.net/Articles/636882/ , it is the
> driver for the same hardware, but for Linux. But keep in mind that the
> driver had some difficulties getting in, you might want to check the
> discussions in linux-mtd .
>

thanks!
-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 17:49   ` Jagan Teki
@ 2015-11-03 17:52     ` Marek Vasut
  2015-11-03 17:56       ` Jagan Teki
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2015-11-03 17:52 UTC (permalink / raw)
  To: u-boot

On Tuesday, November 03, 2015 at 06:49:44 PM, Jagan Teki wrote:
> On 3 November 2015 at 23:14, Marek Vasut <marex@denx.de> wrote:
> > On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
> >> Add Altera Generic Quad SPI Controller support. The controller
> >> converts SPI NOR flash to parallel flash interface. So it is
> >> not like other SPI flash, but rather like CFI flash.
> 
> This should be part of drivers/mtd/spi-nor which I'm working
> currently, might take couple of days to push the patches to ML.

I think your patches are still far away from inclusion, so I'm
fine with the current way of doing things ;-)

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 17:52     ` Marek Vasut
@ 2015-11-03 17:56       ` Jagan Teki
  2015-11-03 18:11         ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-03 17:56 UTC (permalink / raw)
  To: u-boot

On 3 November 2015 at 23:22, Marek Vasut <marex@denx.de> wrote:
> On Tuesday, November 03, 2015 at 06:49:44 PM, Jagan Teki wrote:
>> On 3 November 2015 at 23:14, Marek Vasut <marex@denx.de> wrote:
>> > On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
>> >> Add Altera Generic Quad SPI Controller support. The controller
>> >> converts SPI NOR flash to parallel flash interface. So it is
>> >> not like other SPI flash, but rather like CFI flash.
>>
>> This should be part of drivers/mtd/spi-nor which I'm working
>> currently, might take couple of days to push the patches to ML.
>
> I think your patches are still far away from inclusion, so I'm
> fine with the current way of doing things ;-)

I think it's better to wait for main things to be done first, and if
possible I'm open for anyone to help me to move forward.

thanks!
-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 17:56       ` Jagan Teki
@ 2015-11-03 18:11         ` Marek Vasut
  0 siblings, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2015-11-03 18:11 UTC (permalink / raw)
  To: u-boot

On Tuesday, November 03, 2015 at 06:56:26 PM, Jagan Teki wrote:
> On 3 November 2015 at 23:22, Marek Vasut <marex@denx.de> wrote:
> > On Tuesday, November 03, 2015 at 06:49:44 PM, Jagan Teki wrote:
> >> On 3 November 2015 at 23:14, Marek Vasut <marex@denx.de> wrote:
> >> > On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
> >> >> Add Altera Generic Quad SPI Controller support. The controller
> >> >> converts SPI NOR flash to parallel flash interface. So it is
> >> >> not like other SPI flash, but rather like CFI flash.
> >> 
> >> This should be part of drivers/mtd/spi-nor which I'm working
> >> currently, might take couple of days to push the patches to ML.
> > 
> > I think your patches are still far away from inclusion, so I'm
> > fine with the current way of doing things ;-)
> 
> I think it's better to wait for main things to be done first, and if
> possible I'm open for anyone to help me to move forward.

That's fine all right, but you cannot block other patches only because
there are some other unfinished ones which might land in mainline who
knows when.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 17:44 ` Marek Vasut
  2015-11-03 17:49   ` Jagan Teki
@ 2015-11-04  2:36   ` Thomas Chou
  2015-11-04  3:45     ` Marek Vasut
  1 sibling, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-04  2:36 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On 2015?11?04? 01:44, Marek Vasut wrote:
> On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
>> Add Altera Generic Quad SPI Controller support. The controller
>> converts SPI NOR flash to parallel flash interface. So it is
>> not like other SPI flash, but rather like CFI flash.
>>
>> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
>> ---
>
> You might want to look at https://lwn.net/Articles/636882/ , it is the
> driver for the same hardware, but for Linux. But keep in mind that the
> driver had some difficulties getting in, you might want to check the
> discussions in linux-mtd .
>

I did check and follow the threads for a while since you pointed me 
about it in earlier communication. It is v5 last month. But the author 
decided to wait for hardware fix on rdid.

Yet I have a different point as I stated in the patch message. It is NOT 
a spi-nor since the hardware converted it to parallel interface. It 
should be treated more like cfi flash. I think it might be a mistake to 
take it as spi-nor. And this might be the hidden cause to prevent the 
linux driver getting in.  So I wrote it my way.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04  2:36   ` Thomas Chou
@ 2015-11-04  3:45     ` Marek Vasut
  2015-11-04  4:45       ` Thomas Chou
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2015-11-04  3:45 UTC (permalink / raw)
  To: u-boot

On Wednesday, November 04, 2015 at 03:36:08 AM, Thomas Chou wrote:
> Hi Marek,

Hi!

> On 2015?11?04? 01:44, Marek Vasut wrote:
> > On Tuesday, November 03, 2015 at 02:22:12 PM, Thomas Chou wrote:
> >> Add Altera Generic Quad SPI Controller support. The controller
> >> converts SPI NOR flash to parallel flash interface. So it is
> >> not like other SPI flash, but rather like CFI flash.
> >> 
> >> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> >> ---
> > 
> > You might want to look at https://lwn.net/Articles/636882/ , it is the
> > driver for the same hardware, but for Linux. But keep in mind that the
> > driver had some difficulties getting in, you might want to check the
> > discussions in linux-mtd .
> 
> I did check and follow the threads for a while since you pointed me
> about it in earlier communication. It is v5 last month. But the author
> decided to wait for hardware fix on rdid.

I think I had a stake there as well ;-)

> Yet I have a different point as I stated in the patch message. It is NOT
> a spi-nor since the hardware converted it to parallel interface. It
> should be treated more like cfi flash. I think it might be a mistake to
> take it as spi-nor. And this might be the hidden cause to prevent the
> linux driver getting in.  So I wrote it my way.

Let me just put an idea here, it might be wrong -- but doesn't this seem
like some sort of NVMEM device? See for example:

https://lkml.org/lkml/2015/5/21/643

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04  3:45     ` Marek Vasut
@ 2015-11-04  4:45       ` Thomas Chou
  2015-11-04  5:15         ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-04  4:45 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On 2015?11?04? 11:45, Marek Vasut wrote:
> Let me just put an idea here, it might be wrong -- but doesn't this seem
> like some sort of NVMEM device? See for example:
>
> https://lkml.org/lkml/2015/5/21/643

Thanks for the pointer. However, it needs erasing before writing.

Regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04  4:45       ` Thomas Chou
@ 2015-11-04  5:15         ` Marek Vasut
  2015-11-04  5:33           ` Thomas Chou
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2015-11-04  5:15 UTC (permalink / raw)
  To: u-boot

On Wednesday, November 04, 2015 at 05:45:24 AM, Thomas Chou wrote:
> Hi Marek,

Hi,

> On 2015?11?04? 11:45, Marek Vasut wrote:
> > Let me just put an idea here, it might be wrong -- but doesn't this seem
> > like some sort of NVMEM device? See for example:
> > 
> > https://lkml.org/lkml/2015/5/21/643
> 
> Thanks for the pointer. However, it needs erasing before writing.

But does it operate in some sort of memory-mapped fashion or is this more
of a SPI controller ? I think it's the former, right ?

But now that you mention the erasing, I see why you'd opt for the CFI
framework, yeah.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04  5:15         ` Marek Vasut
@ 2015-11-04  5:33           ` Thomas Chou
  2015-11-04 14:02             ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-04  5:33 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On 2015?11?04? 13:15, Marek Vasut wrote:
> On Wednesday, November 04, 2015 at 05:45:24 AM, Thomas Chou wrote:
>> Hi Marek,
>
> Hi,
>
>> On 2015?11?04? 11:45, Marek Vasut wrote:
>>> Let me just put an idea here, it might be wrong -- but doesn't this seem
>>> like some sort of NVMEM device? See for example:
>>>
>>> https://lkml.org/lkml/2015/5/21/643
>>
>> Thanks for the pointer. However, it needs erasing before writing.
>
> But does it operate in some sort of memory-mapped fashion or is this more
> of a SPI controller ? I think it's the former, right ?

Right. The former.

>
> But now that you mention the erasing, I see why you'd opt for the CFI
> framework, yeah.

Yes.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04  5:33           ` Thomas Chou
@ 2015-11-04 14:02             ` Marek Vasut
  0 siblings, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2015-11-04 14:02 UTC (permalink / raw)
  To: u-boot

On Wednesday, November 04, 2015 at 06:33:00 AM, Thomas Chou wrote:
> Hi Marek,

Hi,

> On 2015?11?04? 13:15, Marek Vasut wrote:
> > On Wednesday, November 04, 2015 at 05:45:24 AM, Thomas Chou wrote:
> >> Hi Marek,
> > 
> > Hi,
> > 
> >> On 2015?11?04? 11:45, Marek Vasut wrote:
> >>> Let me just put an idea here, it might be wrong -- but doesn't this
> >>> seem like some sort of NVMEM device? See for example:
> >>> 
> >>> https://lkml.org/lkml/2015/5/21/643
> >> 
> >> Thanks for the pointer. However, it needs erasing before writing.
> > 
> > But does it operate in some sort of memory-mapped fashion or is this more
> > of a SPI controller ? I think it's the former, right ?
> 
> Right. The former.
> 
> > But now that you mention the erasing, I see why you'd opt for the CFI
> > framework, yeah.
> 
> Yes.

OK, got it. The CFI approach might be the most sensible one then.

Thanks for your patience :)

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-03 13:22 [U-Boot] [PATCH] mtd: add altera quadspi driver Thomas Chou
  2015-11-03 17:44 ` Marek Vasut
@ 2015-11-04 15:56 ` Chin Liang See
  2015-11-04 16:18   ` Marek Vasut
  2015-11-05  8:47 ` [U-Boot] [PATCH v2 1/2] nios2: add memcpy_fromio and memcpy_toio Thomas Chou
  2015-11-07  8:07 ` [U-Boot] [PATCH v3] " Thomas Chou
  3 siblings, 1 reply; 34+ messages in thread
From: Chin Liang See @ 2015-11-04 15:56 UTC (permalink / raw)
  To: u-boot

On Tue, 2015-11-03 at 21:22 +0800, thomas at wytron.com.tw wrote:
> Add Altera Generic Quad SPI Controller support. The controller
> converts SPI NOR flash to parallel flash interface. So it is
> not like other SPI flash, but rather like CFI flash.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
>  doc/device-tree-bindings/mtd/altera_qspi.txt |  35 +++
>  drivers/mtd/Kconfig                          |   9 +
>  drivers/mtd/Makefile                         |   1 +
>  drivers/mtd/altera_qspi.c                    | 312 +++++++++++++++++++++++++++
>  4 files changed, 357 insertions(+)
>  create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
>  create mode 100644 drivers/mtd/altera_qspi.c
>  ...
>  
> diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
> new file mode 100644
> index 0000000..06bc53e
> --- /dev/null
> +++ b/drivers/mtd/altera_qspi.c
> @@ -0,0 +1,312 @@
> +/*
> + * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <dm.h>
> +#include <errno.h>
> +#include <fdt_support.h>
> +#include <flash.h>
> +#include <mtd.h>
> +#include <asm/io.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/*
> + * The QUADSPI_MEM_OP register is used to do memory protect and erase operations
> + */
> +#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
> +#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
> +#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
> +
> +/*
> + * The QUADSPI_ISR register is used to determine whether an invalid write or
> + * erase operation trigerred an interrupt
> + */
> +#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
> +#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
> +
> +struct altera_qspi_regs {
> +	u32	rd_status;
> +	u32	rd_sid;
> +	u32	rd_rdid;
> +	u32	mem_op;
> +	u32	isr;
> +	u32	imr;
> +	u32	chip_select;
> +};
> +
> +struct altera_qspi_platdata {
> +	struct altera_qspi_regs *regs;
> +	void *base;
> +	unsigned long size;
> +};
> +
> +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips info */
> +
> +void flash_print_info(flash_info_t *info)
> +{
> +	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
> +	       info->size >> 20, info->sector_count);
> +}
> +
> +int flash_erase(flash_info_t *info, int s_first, int s_last)
> +{
> +	struct mtd_info *mtd = info->mtd;
> +	struct erase_info instr;
> +	int ret;
> +
> +	memset(&instr, 0, sizeof(instr));
> +	instr.addr = mtd->erasesize * s_first;
> +	instr.len = mtd->erasesize * (s_last + 1 - s_first);
> +	ret = mtd_erase(mtd, &instr);
> +	if (ret)
> +		return ERR_NOT_ERASED;
> +
> +	return 0;
> +}
> +
> +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
> +{
> +	struct mtd_info *mtd = info->mtd;
> +	struct udevice *dev = mtd->dev;
> +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +	ulong base = (ulong)pdata->base;
> +	loff_t to = addr - base;
> +	size_t retlen;
> +	int ret;
> +
> +	ret = mtd_write(mtd, to, cnt, &retlen, src);
> +	if (ret)
> +		return ERR_NOT_ERASED;
> +
> +	return 0;
> +}
> +
> +unsigned long flash_init(void)
> +{
> +	struct udevice *dev;
> +
> +	/* probe every MTD device */
> +	for (uclass_first_device(UCLASS_MTD, &dev);
> +	     dev;
> +	     uclass_next_device(&dev)) {
> +	}
> +
> +	return flash_info[0].size;
> +}
> +
> +static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr)
> +{
> +	struct udevice *dev = mtd->dev;
> +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +	struct altera_qspi_regs *regs = pdata->regs;
> +	size_t addr = instr->addr;
> +	size_t len = instr->len;
> +	size_t end = addr + len;
> +	u32 sect;
> +	u32 stat;
> +
> +	instr->state = MTD_ERASING;
> +	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
> +	while (addr < end) {
> +		sect = addr / mtd->erasesize;
> +		sect <<= 8;
> +		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
> +		debug("erase %08x\n", sect);
> +		writel(sect, &regs->mem_op);
> +		stat = readl(&regs->isr);
> +		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
> +			/* erase failed, sector might be protected */
> +			debug("erase %08x fail %x\n", sect, stat);
> +			writel(stat, &regs->isr); /* clear isr */
> +			instr->state = MTD_ERASE_FAILED;
> +			return -EIO;
> +		}
> +		addr += mtd->erasesize;
> +	}
> +	instr->state = MTD_ERASE_DONE;
> +	mtd_erase_callback(instr);
> +
> +	return 0;
> +}
> +
> +static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len,
> +			    size_t *retlen, u_char *buf)
> +{
> +	struct udevice *dev = mtd->dev;
> +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +
> +	memcpy(buf, pdata->base + from, len);
> +	*retlen = len;
> +
> +	return 0;
> +}
> +
> +static inline u32 add_byte(u32 data, u8 byte, int shift)
> +{
> +	data &= ~(0xff << shift);
> +	data |= byte << shift;
> +	return data;
> +}
> +
> +static int altera_qspi_write_word(struct mtd_info *mtd, loff_t to,
> +				  u32 data)
> +{
> +	struct udevice *dev = mtd->dev;
> +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +	struct altera_qspi_regs *regs = pdata->regs;
> +	u32 pos = (u32)to;
> +	u32 stat;
> +
> +	/* write to flash 32 bits at a time */
> +	writel(data, pdata->base + pos);
> +	/* check whether write triggered a illegal write interrupt */
> +	stat = readl(&regs->isr);
> +	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
> +		/* write failed, sector might be protected */
> +		debug("write %08x fail %x\n", pos, stat);
> +		writel(stat, &regs->isr); /* clear isr */
> +		return -EIO;
> +	}
> +
> +	return 0;
> +}
> +
> +static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len,
> +			     size_t *retlen, const u_char *buf)
> +{
> +	const u_char *end = buf + len;
> +	unsigned shift;
> +	u32 data;
> +	int ret;
> +
> +	shift = (to & (sizeof(u32) - 1)) * 8; /* first shift to add byte */
> +	to &= ~(sizeof(u32) - 1); /* get lower aligned address */
> +	while (buf < end) {
> +		data = 0xffffffff; /* pad data */
> +		while (buf < end && shift < 32) {
> +			/* add byte from buf */
> +			data = add_byte(data, *buf++, shift);
> +			shift += 8;
> +		}
> +		ret = altera_qspi_write_word(mtd, to, data);
> +		if (ret)
> +			return ret;
> +		to += sizeof(u32);
> +		shift = 0;
> +	}
> +	*retlen = len;
> +
> +	return 0;
> +}
> +

Hi Thomas,

Thanks for the patch.

I notice you are writing in word style which might have concern in
performance. As the burst count can go up to 64, we can write larger
data through memcpy. This will avoid redundancy of data header (opcode +
address + dummy).

Thanks
Chin Liang

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04 15:56 ` Chin Liang See
@ 2015-11-04 16:18   ` Marek Vasut
  2015-11-05  2:49     ` Chin Liang See
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2015-11-04 16:18 UTC (permalink / raw)
  To: u-boot

On Wednesday, November 04, 2015 at 04:56:10 PM, Chin Liang See wrote:
> On Tue, 2015-11-03 at 21:22 +0800, thomas at wytron.com.tw wrote:
> > Add Altera Generic Quad SPI Controller support. The controller
> > converts SPI NOR flash to parallel flash interface. So it is
> > not like other SPI flash, but rather like CFI flash.
> > 
> > Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> > ---
> > 
> >  doc/device-tree-bindings/mtd/altera_qspi.txt |  35 +++
> >  drivers/mtd/Kconfig                          |   9 +
> >  drivers/mtd/Makefile                         |   1 +
> >  drivers/mtd/altera_qspi.c                    | 312
> >  +++++++++++++++++++++++++++ 4 files changed, 357 insertions(+)
> >  create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
> >  create mode 100644 drivers/mtd/altera_qspi.c
> >  ...
> > 
> > diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
> > new file mode 100644
> > index 0000000..06bc53e
> > --- /dev/null
> > +++ b/drivers/mtd/altera_qspi.c
> > @@ -0,0 +1,312 @@
> > +/*
> > + * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
> > + *
> > + * SPDX-License-Identifier:	GPL-2.0+
> > + */
> > +
> > +#include <common.h>
> > +#include <dm.h>
> > +#include <errno.h>
> > +#include <fdt_support.h>
> > +#include <flash.h>
> > +#include <mtd.h>
> > +#include <asm/io.h>
> > +
> > +DECLARE_GLOBAL_DATA_PTR;
> > +
> > +/*
> > + * The QUADSPI_MEM_OP register is used to do memory protect and erase
> > operations + */
> > +#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
> > +#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
> > +#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
> > +
> > +/*
> > + * The QUADSPI_ISR register is used to determine whether an invalid
> > write or + * erase operation trigerred an interrupt
> > + */
> > +#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
> > +#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
> > +
> > +struct altera_qspi_regs {
> > +	u32	rd_status;
> > +	u32	rd_sid;
> > +	u32	rd_rdid;
> > +	u32	mem_op;
> > +	u32	isr;
> > +	u32	imr;
> > +	u32	chip_select;
> > +};
> > +
> > +struct altera_qspi_platdata {
> > +	struct altera_qspi_regs *regs;
> > +	void *base;
> > +	unsigned long size;
> > +};
> > +
> > +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips 
info
> > */ +
> > +void flash_print_info(flash_info_t *info)
> > +{
> > +	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
> > +	       info->size >> 20, info->sector_count);
> > +}
> > +
> > +int flash_erase(flash_info_t *info, int s_first, int s_last)
> > +{
> > +	struct mtd_info *mtd = info->mtd;
> > +	struct erase_info instr;
> > +	int ret;
> > +
> > +	memset(&instr, 0, sizeof(instr));
> > +	instr.addr = mtd->erasesize * s_first;
> > +	instr.len = mtd->erasesize * (s_last + 1 - s_first);
> > +	ret = mtd_erase(mtd, &instr);
> > +	if (ret)
> > +		return ERR_NOT_ERASED;
> > +
> > +	return 0;
> > +}
> > +
> > +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
> > +{
> > +	struct mtd_info *mtd = info->mtd;
> > +	struct udevice *dev = mtd->dev;
> > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > +	ulong base = (ulong)pdata->base;
> > +	loff_t to = addr - base;
> > +	size_t retlen;
> > +	int ret;
> > +
> > +	ret = mtd_write(mtd, to, cnt, &retlen, src);
> > +	if (ret)
> > +		return ERR_NOT_ERASED;
> > +
> > +	return 0;
> > +}
> > +
> > +unsigned long flash_init(void)
> > +{
> > +	struct udevice *dev;
> > +
> > +	/* probe every MTD device */
> > +	for (uclass_first_device(UCLASS_MTD, &dev);
> > +	     dev;
> > +	     uclass_next_device(&dev)) {
> > +	}
> > +
> > +	return flash_info[0].size;
> > +}
> > +
> > +static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info
> > *instr) +{
> > +	struct udevice *dev = mtd->dev;
> > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > +	struct altera_qspi_regs *regs = pdata->regs;
> > +	size_t addr = instr->addr;
> > +	size_t len = instr->len;
> > +	size_t end = addr + len;
> > +	u32 sect;
> > +	u32 stat;
> > +
> > +	instr->state = MTD_ERASING;
> > +	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
> > +	while (addr < end) {
> > +		sect = addr / mtd->erasesize;
> > +		sect <<= 8;
> > +		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
> > +		debug("erase %08x\n", sect);
> > +		writel(sect, &regs->mem_op);
> > +		stat = readl(&regs->isr);
> > +		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
> > +			/* erase failed, sector might be protected */
> > +			debug("erase %08x fail %x\n", sect, stat);
> > +			writel(stat, &regs->isr); /* clear isr */
> > +			instr->state = MTD_ERASE_FAILED;
> > +			return -EIO;
> > +		}
> > +		addr += mtd->erasesize;
> > +	}
> > +	instr->state = MTD_ERASE_DONE;
> > +	mtd_erase_callback(instr);
> > +
> > +	return 0;
> > +}
> > +
> > +static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t
> > len, +			    size_t *retlen, u_char *buf)
> > +{
> > +	struct udevice *dev = mtd->dev;
> > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > +
> > +	memcpy(buf, pdata->base + from, len);
> > +	*retlen = len;
> > +
> > +	return 0;
> > +}
> > +
> > +static inline u32 add_byte(u32 data, u8 byte, int shift)
> > +{
> > +	data &= ~(0xff << shift);
> > +	data |= byte << shift;
> > +	return data;
> > +}
> > +
> > +static int altera_qspi_write_word(struct mtd_info *mtd, loff_t to,
> > +				  u32 data)
> > +{
> > +	struct udevice *dev = mtd->dev;
> > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > +	struct altera_qspi_regs *regs = pdata->regs;
> > +	u32 pos = (u32)to;
> > +	u32 stat;
> > +
> > +	/* write to flash 32 bits at a time */
> > +	writel(data, pdata->base + pos);
> > +	/* check whether write triggered a illegal write interrupt */
> > +	stat = readl(&regs->isr);
> > +	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
> > +		/* write failed, sector might be protected */
> > +		debug("write %08x fail %x\n", pos, stat);
> > +		writel(stat, &regs->isr); /* clear isr */
> > +		return -EIO;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t
> > len, +			     size_t *retlen, const u_char *buf)
> > +{
> > +	const u_char *end = buf + len;
> > +	unsigned shift;
> > +	u32 data;
> > +	int ret;
> > +
> > +	shift = (to & (sizeof(u32) - 1)) * 8; /* first shift to add byte */
> > +	to &= ~(sizeof(u32) - 1); /* get lower aligned address */
> > +	while (buf < end) {
> > +		data = 0xffffffff; /* pad data */
> > +		while (buf < end && shift < 32) {
> > +			/* add byte from buf */
> > +			data = add_byte(data, *buf++, shift);
> > +			shift += 8;
> > +		}
> > +		ret = altera_qspi_write_word(mtd, to, data);
> > +		if (ret)
> > +			return ret;
> > +		to += sizeof(u32);
> > +		shift = 0;
> > +	}
> > +	*retlen = len;
> > +
> > +	return 0;
> > +}
> > +
> 
> Hi Thomas,
> 
> Thanks for the patch.
> 
> I notice you are writing in word style which might have concern in
> performance. As the burst count can go up to 64, we can write larger
> data through memcpy. This will avoid redundancy of data header (opcode +
> address + dummy).

You cannot do that, memcpy works on memory while write*() operators work
on I/O. You should use readsl() and friends then.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-04 16:18   ` Marek Vasut
@ 2015-11-05  2:49     ` Chin Liang See
  2015-11-05  2:53       ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Chin Liang See @ 2015-11-05  2:49 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On Wed, 2015-11-04 at 10:18 +0000, marex at denx.de wrote:
> On Wednesday, November 04, 2015 at 04:56:10 PM, Chin Liang See wrote:
> > On Tue, 2015-11-03 at 21:22 +0800, thomas at wytron.com.tw wrote:
> > > Add Altera Generic Quad SPI Controller support. The controller
> > > converts SPI NOR flash to parallel flash interface. So it is
> > > not like other SPI flash, but rather like CFI flash.
> > > 
> > > Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> > > ---
> > > 
> > >  doc/device-tree-bindings/mtd/altera_qspi.txt |  35 +++
> > >  drivers/mtd/Kconfig                          |   9 +
> > >  drivers/mtd/Makefile                         |   1 +
> > >  drivers/mtd/altera_qspi.c                    | 312
> > >  +++++++++++++++++++++++++++ 4 files changed, 357 insertions(+)
> > >  create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
> > >  create mode 100644 drivers/mtd/altera_qspi.c
> > >  ...
> > > 
> > > diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
> > > new file mode 100644
> > > index 0000000..06bc53e
> > > --- /dev/null
> > > +++ b/drivers/mtd/altera_qspi.c
> > > @@ -0,0 +1,312 @@
> > > +/*
> > > + * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
> > > + *
> > > + * SPDX-License-Identifier:	GPL-2.0+
> > > + */
> > > +
> > > +#include <common.h>
> > > +#include <dm.h>
> > > +#include <errno.h>
> > > +#include <fdt_support.h>
> > > +#include <flash.h>
> > > +#include <mtd.h>
> > > +#include <asm/io.h>
> > > +
> > > +DECLARE_GLOBAL_DATA_PTR;
> > > +
> > > +/*
> > > + * The QUADSPI_MEM_OP register is used to do memory protect and erase
> > > operations + */
> > > +#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
> > > +#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
> > > +#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
> > > +
> > > +/*
> > > + * The QUADSPI_ISR register is used to determine whether an invalid
> > > write or + * erase operation trigerred an interrupt
> > > + */
> > > +#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
> > > +#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
> > > +
> > > +struct altera_qspi_regs {
> > > +	u32	rd_status;
> > > +	u32	rd_sid;
> > > +	u32	rd_rdid;
> > > +	u32	mem_op;
> > > +	u32	isr;
> > > +	u32	imr;
> > > +	u32	chip_select;
> > > +};
> > > +
> > > +struct altera_qspi_platdata {
> > > +	struct altera_qspi_regs *regs;
> > > +	void *base;
> > > +	unsigned long size;
> > > +};
> > > +
> > > +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips 
> info
> > > */ +
> > > +void flash_print_info(flash_info_t *info)
> > > +{
> > > +	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
> > > +	       info->size >> 20, info->sector_count);
> > > +}
> > > +
> > > +int flash_erase(flash_info_t *info, int s_first, int s_last)
> > > +{
> > > +	struct mtd_info *mtd = info->mtd;
> > > +	struct erase_info instr;
> > > +	int ret;
> > > +
> > > +	memset(&instr, 0, sizeof(instr));
> > > +	instr.addr = mtd->erasesize * s_first;
> > > +	instr.len = mtd->erasesize * (s_last + 1 - s_first);
> > > +	ret = mtd_erase(mtd, &instr);
> > > +	if (ret)
> > > +		return ERR_NOT_ERASED;
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
> > > +{
> > > +	struct mtd_info *mtd = info->mtd;
> > > +	struct udevice *dev = mtd->dev;
> > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > +	ulong base = (ulong)pdata->base;
> > > +	loff_t to = addr - base;
> > > +	size_t retlen;
> > > +	int ret;
> > > +
> > > +	ret = mtd_write(mtd, to, cnt, &retlen, src);
> > > +	if (ret)
> > > +		return ERR_NOT_ERASED;
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +unsigned long flash_init(void)
> > > +{
> > > +	struct udevice *dev;
> > > +
> > > +	/* probe every MTD device */
> > > +	for (uclass_first_device(UCLASS_MTD, &dev);
> > > +	     dev;
> > > +	     uclass_next_device(&dev)) {
> > > +	}
> > > +
> > > +	return flash_info[0].size;
> > > +}
> > > +
> > > +static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info
> > > *instr) +{
> > > +	struct udevice *dev = mtd->dev;
> > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > +	struct altera_qspi_regs *regs = pdata->regs;
> > > +	size_t addr = instr->addr;
> > > +	size_t len = instr->len;
> > > +	size_t end = addr + len;
> > > +	u32 sect;
> > > +	u32 stat;
> > > +
> > > +	instr->state = MTD_ERASING;
> > > +	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
> > > +	while (addr < end) {
> > > +		sect = addr / mtd->erasesize;
> > > +		sect <<= 8;
> > > +		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
> > > +		debug("erase %08x\n", sect);
> > > +		writel(sect, &regs->mem_op);
> > > +		stat = readl(&regs->isr);
> > > +		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
> > > +			/* erase failed, sector might be protected */
> > > +			debug("erase %08x fail %x\n", sect, stat);
> > > +			writel(stat, &regs->isr); /* clear isr */
> > > +			instr->state = MTD_ERASE_FAILED;
> > > +			return -EIO;
> > > +		}
> > > +		addr += mtd->erasesize;
> > > +	}
> > > +	instr->state = MTD_ERASE_DONE;
> > > +	mtd_erase_callback(instr);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t
> > > len, +			    size_t *retlen, u_char *buf)
> > > +{
> > > +	struct udevice *dev = mtd->dev;
> > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > +
> > > +	memcpy(buf, pdata->base + from, len);
> > > +	*retlen = len;
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static inline u32 add_byte(u32 data, u8 byte, int shift)
> > > +{
> > > +	data &= ~(0xff << shift);
> > > +	data |= byte << shift;
> > > +	return data;
> > > +}
> > > +
> > > +static int altera_qspi_write_word(struct mtd_info *mtd, loff_t to,
> > > +				  u32 data)
> > > +{
> > > +	struct udevice *dev = mtd->dev;
> > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > +	struct altera_qspi_regs *regs = pdata->regs;
> > > +	u32 pos = (u32)to;
> > > +	u32 stat;
> > > +
> > > +	/* write to flash 32 bits at a time */
> > > +	writel(data, pdata->base + pos);
> > > +	/* check whether write triggered a illegal write interrupt */
> > > +	stat = readl(&regs->isr);
> > > +	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
> > > +		/* write failed, sector might be protected */
> > > +		debug("write %08x fail %x\n", pos, stat);
> > > +		writel(stat, &regs->isr); /* clear isr */
> > > +		return -EIO;
> > > +	}
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t
> > > len, +			     size_t *retlen, const u_char *buf)
> > > +{
> > > +	const u_char *end = buf + len;
> > > +	unsigned shift;
> > > +	u32 data;
> > > +	int ret;
> > > +
> > > +	shift = (to & (sizeof(u32) - 1)) * 8; /* first shift to add byte */
> > > +	to &= ~(sizeof(u32) - 1); /* get lower aligned address */
> > > +	while (buf < end) {
> > > +		data = 0xffffffff; /* pad data */
> > > +		while (buf < end && shift < 32) {
> > > +			/* add byte from buf */
> > > +			data = add_byte(data, *buf++, shift);
> > > +			shift += 8;
> > > +		}
> > > +		ret = altera_qspi_write_word(mtd, to, data);
> > > +		if (ret)
> > > +			return ret;
> > > +		to += sizeof(u32);
> > > +		shift = 0;
> > > +	}
> > > +	*retlen = len;
> > > +
> > > +	return 0;
> > > +}
> > > +
> > 
> > Hi Thomas,
> > 
> > Thanks for the patch.
> > 
> > I notice you are writing in word style which might have concern in
> > performance. As the burst count can go up to 64, we can write larger
> > data through memcpy. This will avoid redundancy of data header (opcode +
> > address + dummy).
> 
> You cannot do that, memcpy works on memory while write*() operators work
> on I/O. You should use readsl() and friends then.

Actually I am thinking to take advantage the cache fill and dump. But
after rethinking, this might limit some of the use case as we want the
driver to support NIOS II without cache. With that, just ignore this
comment for now.

But your comment lead to the fact that the read part is now using
memcpy. Thomas needs to fix that to use the readl :)

Thanks
Chin Liang

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-05  2:49     ` Chin Liang See
@ 2015-11-05  2:53       ` Marek Vasut
  2015-11-05  3:05         ` Chin Liang See
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2015-11-05  2:53 UTC (permalink / raw)
  To: u-boot

On Thursday, November 05, 2015 at 03:49:18 AM, Chin Liang See wrote:
> Hi Marek,
> 
> On Wed, 2015-11-04 at 10:18 +0000, marex at denx.de wrote:
> > On Wednesday, November 04, 2015 at 04:56:10 PM, Chin Liang See wrote:
> > > On Tue, 2015-11-03 at 21:22 +0800, thomas at wytron.com.tw wrote:
> > > > Add Altera Generic Quad SPI Controller support. The controller
> > > > converts SPI NOR flash to parallel flash interface. So it is
> > > > not like other SPI flash, but rather like CFI flash.
> > > > 
> > > > Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> > > > ---
> > > > 
> > > >  doc/device-tree-bindings/mtd/altera_qspi.txt |  35 +++
> > > >  drivers/mtd/Kconfig                          |   9 +
> > > >  drivers/mtd/Makefile                         |   1 +
> > > >  drivers/mtd/altera_qspi.c                    | 312
> > > >  +++++++++++++++++++++++++++ 4 files changed, 357 insertions(+)
> > > >  create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
> > > >  create mode 100644 drivers/mtd/altera_qspi.c
> > > >  ...
> > > > 
> > > > diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
> > > > new file mode 100644
> > > > index 0000000..06bc53e
> > > > --- /dev/null
> > > > +++ b/drivers/mtd/altera_qspi.c
> > > > @@ -0,0 +1,312 @@
> > > > +/*
> > > > + * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
> > > > + *
> > > > + * SPDX-License-Identifier:	GPL-2.0+
> > > > + */
> > > > +
> > > > +#include <common.h>
> > > > +#include <dm.h>
> > > > +#include <errno.h>
> > > > +#include <fdt_support.h>
> > > > +#include <flash.h>
> > > > +#include <mtd.h>
> > > > +#include <asm/io.h>
> > > > +
> > > > +DECLARE_GLOBAL_DATA_PTR;
> > > > +
> > > > +/*
> > > > + * The QUADSPI_MEM_OP register is used to do memory protect and
> > > > erase operations + */
> > > > +#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
> > > > +#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
> > > > +#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
> > > > +
> > > > +/*
> > > > + * The QUADSPI_ISR register is used to determine whether an invalid
> > > > write or + * erase operation trigerred an interrupt
> > > > + */
> > > > +#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
> > > > +#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
> > > > +
> > > > +struct altera_qspi_regs {
> > > > +	u32	rd_status;
> > > > +	u32	rd_sid;
> > > > +	u32	rd_rdid;
> > > > +	u32	mem_op;
> > > > +	u32	isr;
> > > > +	u32	imr;
> > > > +	u32	chip_select;
> > > > +};
> > > > +
> > > > +struct altera_qspi_platdata {
> > > > +	struct altera_qspi_regs *regs;
> > > > +	void *base;
> > > > +	unsigned long size;
> > > > +};
> > > > +
> > > > +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips
> > 
> > info
> > 
> > > > */ +
> > > > +void flash_print_info(flash_info_t *info)
> > > > +{
> > > > +	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
> > > > +	       info->size >> 20, info->sector_count);
> > > > +}
> > > > +
> > > > +int flash_erase(flash_info_t *info, int s_first, int s_last)
> > > > +{
> > > > +	struct mtd_info *mtd = info->mtd;
> > > > +	struct erase_info instr;
> > > > +	int ret;
> > > > +
> > > > +	memset(&instr, 0, sizeof(instr));
> > > > +	instr.addr = mtd->erasesize * s_first;
> > > > +	instr.len = mtd->erasesize * (s_last + 1 - s_first);
> > > > +	ret = mtd_erase(mtd, &instr);
> > > > +	if (ret)
> > > > +		return ERR_NOT_ERASED;
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong
> > > > cnt) +{
> > > > +	struct mtd_info *mtd = info->mtd;
> > > > +	struct udevice *dev = mtd->dev;
> > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > +	ulong base = (ulong)pdata->base;
> > > > +	loff_t to = addr - base;
> > > > +	size_t retlen;
> > > > +	int ret;
> > > > +
> > > > +	ret = mtd_write(mtd, to, cnt, &retlen, src);
> > > > +	if (ret)
> > > > +		return ERR_NOT_ERASED;
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +unsigned long flash_init(void)
> > > > +{
> > > > +	struct udevice *dev;
> > > > +
> > > > +	/* probe every MTD device */
> > > > +	for (uclass_first_device(UCLASS_MTD, &dev);
> > > > +	     dev;
> > > > +	     uclass_next_device(&dev)) {
> > > > +	}
> > > > +
> > > > +	return flash_info[0].size;
> > > > +}
> > > > +
> > > > +static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info
> > > > *instr) +{
> > > > +	struct udevice *dev = mtd->dev;
> > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > +	struct altera_qspi_regs *regs = pdata->regs;
> > > > +	size_t addr = instr->addr;
> > > > +	size_t len = instr->len;
> > > > +	size_t end = addr + len;
> > > > +	u32 sect;
> > > > +	u32 stat;
> > > > +
> > > > +	instr->state = MTD_ERASING;
> > > > +	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
> > > > +	while (addr < end) {
> > > > +		sect = addr / mtd->erasesize;
> > > > +		sect <<= 8;
> > > > +		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
> > > > +		debug("erase %08x\n", sect);
> > > > +		writel(sect, &regs->mem_op);
> > > > +		stat = readl(&regs->isr);
> > > > +		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
> > > > +			/* erase failed, sector might be protected */
> > > > +			debug("erase %08x fail %x\n", sect, stat);
> > > > +			writel(stat, &regs->isr); /* clear isr */
> > > > +			instr->state = MTD_ERASE_FAILED;
> > > > +			return -EIO;
> > > > +		}
> > > > +		addr += mtd->erasesize;
> > > > +	}
> > > > +	instr->state = MTD_ERASE_DONE;
> > > > +	mtd_erase_callback(instr);
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +static int altera_qspi_read(struct mtd_info *mtd, loff_t from,
> > > > size_t len, +			    size_t *retlen, u_char *buf)
> > > > +{
> > > > +	struct udevice *dev = mtd->dev;
> > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > +
> > > > +	memcpy(buf, pdata->base + from, len);
> > > > +	*retlen = len;
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +static inline u32 add_byte(u32 data, u8 byte, int shift)
> > > > +{
> > > > +	data &= ~(0xff << shift);
> > > > +	data |= byte << shift;
> > > > +	return data;
> > > > +}
> > > > +
> > > > +static int altera_qspi_write_word(struct mtd_info *mtd, loff_t to,
> > > > +				  u32 data)
> > > > +{
> > > > +	struct udevice *dev = mtd->dev;
> > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > +	struct altera_qspi_regs *regs = pdata->regs;
> > > > +	u32 pos = (u32)to;
> > > > +	u32 stat;
> > > > +
> > > > +	/* write to flash 32 bits at a time */
> > > > +	writel(data, pdata->base + pos);
> > > > +	/* check whether write triggered a illegal write interrupt */
> > > > +	stat = readl(&regs->isr);
> > > > +	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
> > > > +		/* write failed, sector might be protected */
> > > > +		debug("write %08x fail %x\n", pos, stat);
> > > > +		writel(stat, &regs->isr); /* clear isr */
> > > > +		return -EIO;
> > > > +	}
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t
> > > > len, +			     size_t *retlen, const u_char *buf)
> > > > +{
> > > > +	const u_char *end = buf + len;
> > > > +	unsigned shift;
> > > > +	u32 data;
> > > > +	int ret;
> > > > +
> > > > +	shift = (to & (sizeof(u32) - 1)) * 8; /* first shift to add byte 
*/
> > > > +	to &= ~(sizeof(u32) - 1); /* get lower aligned address */
> > > > +	while (buf < end) {
> > > > +		data = 0xffffffff; /* pad data */
> > > > +		while (buf < end && shift < 32) {
> > > > +			/* add byte from buf */
> > > > +			data = add_byte(data, *buf++, shift);
> > > > +			shift += 8;
> > > > +		}
> > > > +		ret = altera_qspi_write_word(mtd, to, data);
> > > > +		if (ret)
> > > > +			return ret;
> > > > +		to += sizeof(u32);
> > > > +		shift = 0;
> > > > +	}
> > > > +	*retlen = len;
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > 
> > > Hi Thomas,
> > > 
> > > Thanks for the patch.
> > > 
> > > I notice you are writing in word style which might have concern in
> > > performance. As the burst count can go up to 64, we can write larger
> > > data through memcpy. This will avoid redundancy of data header (opcode
> > > + address + dummy).
> > 
> > You cannot do that, memcpy works on memory while write*() operators work
> > on I/O. You should use readsl() and friends then.
> 
> Actually I am thinking to take advantage the cache fill and dump. But
> after rethinking, this might limit some of the use case as we want the
> driver to support NIOS II without cache. With that, just ignore this
> comment for now.

I'm not sure I want to ask for details here. I think we're reading data from
some sort of IO device, so we should just use readl() or readsl() to read
them out (and write*() for the other direction). I don't think cache operations
can be involved in any way. Correct me if I'm wrong please.

> But your comment lead to the fact that the read part is now using
> memcpy. Thomas needs to fix that to use the readl :)

Uhm, I don't think I understand this remark, sorry. I never suggested to use
memcpy() in this entire thread, did I ?

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-05  2:53       ` Marek Vasut
@ 2015-11-05  3:05         ` Chin Liang See
  2015-11-05  4:26           ` Thomas Chou
  0 siblings, 1 reply; 34+ messages in thread
From: Chin Liang See @ 2015-11-05  3:05 UTC (permalink / raw)
  To: u-boot

On Thu, 2015-11-05 at 03:53 +0100, marex at denx.de wrote:
> On Thursday, November 05, 2015 at 03:49:18 AM, Chin Liang See wrote:
> > Hi Marek,
> > 
> > On Wed, 2015-11-04 at 10:18 +0000, marex at denx.de wrote:
> > > On Wednesday, November 04, 2015 at 04:56:10 PM, Chin Liang See wrote:
> > > > On Tue, 2015-11-03 at 21:22 +0800, thomas at wytron.com.tw wrote:
> > > > > Add Altera Generic Quad SPI Controller support. The controller
> > > > > converts SPI NOR flash to parallel flash interface. So it is
> > > > > not like other SPI flash, but rather like CFI flash.
> > > > > 
> > > > > Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> > > > > ---
> > > > > 
> > > > >  doc/device-tree-bindings/mtd/altera_qspi.txt |  35 +++
> > > > >  drivers/mtd/Kconfig                          |   9 +
> > > > >  drivers/mtd/Makefile                         |   1 +
> > > > >  drivers/mtd/altera_qspi.c                    | 312
> > > > >  +++++++++++++++++++++++++++ 4 files changed, 357 insertions(+)
> > > > >  create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
> > > > >  create mode 100644 drivers/mtd/altera_qspi.c
> > > > >  ...
> > > > > 
> > > > > diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
> > > > > new file mode 100644
> > > > > index 0000000..06bc53e
> > > > > --- /dev/null
> > > > > +++ b/drivers/mtd/altera_qspi.c
> > > > > @@ -0,0 +1,312 @@
> > > > > +/*
> > > > > + * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
> > > > > + *
> > > > > + * SPDX-License-Identifier:	GPL-2.0+
> > > > > + */
> > > > > +
> > > > > +#include <common.h>
> > > > > +#include <dm.h>
> > > > > +#include <errno.h>
> > > > > +#include <fdt_support.h>
> > > > > +#include <flash.h>
> > > > > +#include <mtd.h>
> > > > > +#include <asm/io.h>
> > > > > +
> > > > > +DECLARE_GLOBAL_DATA_PTR;
> > > > > +
> > > > > +/*
> > > > > + * The QUADSPI_MEM_OP register is used to do memory protect and
> > > > > erase operations + */
> > > > > +#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
> > > > > +#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
> > > > > +#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
> > > > > +
> > > > > +/*
> > > > > + * The QUADSPI_ISR register is used to determine whether an invalid
> > > > > write or + * erase operation trigerred an interrupt
> > > > > + */
> > > > > +#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
> > > > > +#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
> > > > > +
> > > > > +struct altera_qspi_regs {
> > > > > +	u32	rd_status;
> > > > > +	u32	rd_sid;
> > > > > +	u32	rd_rdid;
> > > > > +	u32	mem_op;
> > > > > +	u32	isr;
> > > > > +	u32	imr;
> > > > > +	u32	chip_select;
> > > > > +};
> > > > > +
> > > > > +struct altera_qspi_platdata {
> > > > > +	struct altera_qspi_regs *regs;
> > > > > +	void *base;
> > > > > +	unsigned long size;
> > > > > +};
> > > > > +
> > > > > +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips
> > > 
> > > info
> > > 
> > > > > */ +
> > > > > +void flash_print_info(flash_info_t *info)
> > > > > +{
> > > > > +	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
> > > > > +	       info->size >> 20, info->sector_count);
> > > > > +}
> > > > > +
> > > > > +int flash_erase(flash_info_t *info, int s_first, int s_last)
> > > > > +{
> > > > > +	struct mtd_info *mtd = info->mtd;
> > > > > +	struct erase_info instr;
> > > > > +	int ret;
> > > > > +
> > > > > +	memset(&instr, 0, sizeof(instr));
> > > > > +	instr.addr = mtd->erasesize * s_first;
> > > > > +	instr.len = mtd->erasesize * (s_last + 1 - s_first);
> > > > > +	ret = mtd_erase(mtd, &instr);
> > > > > +	if (ret)
> > > > > +		return ERR_NOT_ERASED;
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > > +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong
> > > > > cnt) +{
> > > > > +	struct mtd_info *mtd = info->mtd;
> > > > > +	struct udevice *dev = mtd->dev;
> > > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > > +	ulong base = (ulong)pdata->base;
> > > > > +	loff_t to = addr - base;
> > > > > +	size_t retlen;
> > > > > +	int ret;
> > > > > +
> > > > > +	ret = mtd_write(mtd, to, cnt, &retlen, src);
> > > > > +	if (ret)
> > > > > +		return ERR_NOT_ERASED;
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > > +unsigned long flash_init(void)
> > > > > +{
> > > > > +	struct udevice *dev;
> > > > > +
> > > > > +	/* probe every MTD device */
> > > > > +	for (uclass_first_device(UCLASS_MTD, &dev);
> > > > > +	     dev;
> > > > > +	     uclass_next_device(&dev)) {
> > > > > +	}
> > > > > +
> > > > > +	return flash_info[0].size;
> > > > > +}
> > > > > +
> > > > > +static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info
> > > > > *instr) +{
> > > > > +	struct udevice *dev = mtd->dev;
> > > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > > +	struct altera_qspi_regs *regs = pdata->regs;
> > > > > +	size_t addr = instr->addr;
> > > > > +	size_t len = instr->len;
> > > > > +	size_t end = addr + len;
> > > > > +	u32 sect;
> > > > > +	u32 stat;
> > > > > +
> > > > > +	instr->state = MTD_ERASING;
> > > > > +	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
> > > > > +	while (addr < end) {
> > > > > +		sect = addr / mtd->erasesize;
> > > > > +		sect <<= 8;
> > > > > +		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
> > > > > +		debug("erase %08x\n", sect);
> > > > > +		writel(sect, &regs->mem_op);
> > > > > +		stat = readl(&regs->isr);
> > > > > +		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
> > > > > +			/* erase failed, sector might be protected */
> > > > > +			debug("erase %08x fail %x\n", sect, stat);
> > > > > +			writel(stat, &regs->isr); /* clear isr */
> > > > > +			instr->state = MTD_ERASE_FAILED;
> > > > > +			return -EIO;
> > > > > +		}
> > > > > +		addr += mtd->erasesize;
> > > > > +	}
> > > > > +	instr->state = MTD_ERASE_DONE;
> > > > > +	mtd_erase_callback(instr);
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > > +static int altera_qspi_read(struct mtd_info *mtd, loff_t from,
> > > > > size_t len, +			    size_t *retlen, u_char *buf)
> > > > > +{
> > > > > +	struct udevice *dev = mtd->dev;
> > > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > > +
> > > > > +	memcpy(buf, pdata->base + from, len);
> > > > > +	*retlen = len;
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > > +static inline u32 add_byte(u32 data, u8 byte, int shift)
> > > > > +{
> > > > > +	data &= ~(0xff << shift);
> > > > > +	data |= byte << shift;
> > > > > +	return data;
> > > > > +}
> > > > > +
> > > > > +static int altera_qspi_write_word(struct mtd_info *mtd, loff_t to,
> > > > > +				  u32 data)
> > > > > +{
> > > > > +	struct udevice *dev = mtd->dev;
> > > > > +	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> > > > > +	struct altera_qspi_regs *regs = pdata->regs;
> > > > > +	u32 pos = (u32)to;
> > > > > +	u32 stat;
> > > > > +
> > > > > +	/* write to flash 32 bits at a time */
> > > > > +	writel(data, pdata->base + pos);
> > > > > +	/* check whether write triggered a illegal write interrupt */
> > > > > +	stat = readl(&regs->isr);
> > > > > +	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
> > > > > +		/* write failed, sector might be protected */
> > > > > +		debug("write %08x fail %x\n", pos, stat);
> > > > > +		writel(stat, &regs->isr); /* clear isr */
> > > > > +		return -EIO;
> > > > > +	}
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > > +static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t
> > > > > len, +			     size_t *retlen, const u_char *buf)
> > > > > +{
> > > > > +	const u_char *end = buf + len;
> > > > > +	unsigned shift;
> > > > > +	u32 data;
> > > > > +	int ret;
> > > > > +
> > > > > +	shift = (to & (sizeof(u32) - 1)) * 8; /* first shift to add byte 
> */
> > > > > +	to &= ~(sizeof(u32) - 1); /* get lower aligned address */
> > > > > +	while (buf < end) {
> > > > > +		data = 0xffffffff; /* pad data */
> > > > > +		while (buf < end && shift < 32) {
> > > > > +			/* add byte from buf */
> > > > > +			data = add_byte(data, *buf++, shift);
> > > > > +			shift += 8;
> > > > > +		}
> > > > > +		ret = altera_qspi_write_word(mtd, to, data);
> > > > > +		if (ret)
> > > > > +			return ret;
> > > > > +		to += sizeof(u32);
> > > > > +		shift = 0;
> > > > > +	}
> > > > > +	*retlen = len;
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > 
> > > > Hi Thomas,
> > > > 
> > > > Thanks for the patch.
> > > > 
> > > > I notice you are writing in word style which might have concern in
> > > > performance. As the burst count can go up to 64, we can write larger
> > > > data through memcpy. This will avoid redundancy of data header (opcode
> > > > + address + dummy).
> > > 
> > > You cannot do that, memcpy works on memory while write*() operators work
> > > on I/O. You should use readsl() and friends then.
> > 
> > Actually I am thinking to take advantage the cache fill and dump. But
> > after rethinking, this might limit some of the use case as we want the
> > driver to support NIOS II without cache. With that, just ignore this
> > comment for now.
> 
> I'm not sure I want to ask for details here. I think we're reading data from
> some sort of IO device, so we should just use readl() or readsl() to read
> them out (and write*() for the other direction). I don't think cache operations
> can be involved in any way. Correct me if I'm wrong please.
> 

Sure, I can share more. Since the read can support up to burst of 64
byte, we can use the a cache fill method which eventually trigger a read
of 32 byte (which is size of a cache line) to the Quad SPI controller.
To ensure we don't read from old data, we need to invalidate that cache
line (through address). By doing this, we can gain better performance as
we are reading 32 bytes of data instead 4 per transaction.

> > But your comment lead to the fact that the read part is now using
> > memcpy. Thomas needs to fix that to use the readl :)
> 
> Uhm, I don't think I understand this remark, sorry. I never suggested to use
> memcpy() in this entire thread, did I ?


Nope, but this trigger me that we need to do the same for read. The
memcpy might lead to the driver reading old data that stay on cache
instead from controller. Another way to get rid of this is invalidate
the cache.

Thanks
Chin Liang

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-05  3:05         ` Chin Liang See
@ 2015-11-05  4:26           ` Thomas Chou
  2015-11-05  4:36             ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-05  4:26 UTC (permalink / raw)
  To: u-boot

HI Chin Liang,

On 2015?11?05? 11:05, Chin Liang See wrote:
>>>>> I notice you are writing in word style which might have concern in
>>>>> performance. As the burst count can go up to 64, we can write larger
>>>>> data through memcpy. This will avoid redundancy of data header (opcode
>>>>> + address + dummy).
>>>>
>>>> You cannot do that, memcpy works on memory while write*() operators work
>>>> on I/O. You should use readsl() and friends then.
>>>
>>> Actually I am thinking to take advantage the cache fill and dump. But
>>> after rethinking, this might limit some of the use case as we want the
>>> driver to support NIOS II without cache. With that, just ignore this
>>> comment for now.
>>
>> I'm not sure I want to ask for details here. I think we're reading data from
>> some sort of IO device, so we should just use readl() or readsl() to read
>> them out (and write*() for the other direction). I don't think cache operations
>> can be involved in any way. Correct me if I'm wrong please.
>>
>
> Sure, I can share more. Since the read can support up to burst of 64
> byte, we can use the a cache fill method which eventually trigger a read
> of 32 byte (which is size of a cache line) to the Quad SPI controller.
> To ensure we don't read from old data, we need to invalidate that cache
> line (through address). By doing this, we can gain better performance as
> we are reading 32 bytes of data instead 4 per transaction.
>
>>> But your comment lead to the fact that the read part is now using
>>> memcpy. Thomas needs to fix that to use the readl :)
>>
>> Uhm, I don't think I understand this remark, sorry. I never suggested to use
>> memcpy() in this entire thread, did I ?
>
>
> Nope, but this trigger me that we need to do the same for read. The
> memcpy might lead to the driver reading old data that stay on cache
> instead from controller. Another way to get rid of this is invalidate
> the cache.

Thank for the reminding about the read part. I should not use memcpy() 
indeed.

Maybe we could pull the memcpy_fromio() and memcpy_toio() or the 
asm-generic/io.h from Linux kernel?

For i/o access, we bypass the cache for u-boot nios2 with ioremap() or 
map_physaddr(uncached). So no worries or advantage about cache.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH] mtd: add altera quadspi driver
  2015-11-05  4:26           ` Thomas Chou
@ 2015-11-05  4:36             ` Marek Vasut
  0 siblings, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2015-11-05  4:36 UTC (permalink / raw)
  To: u-boot

On Thursday, November 05, 2015 at 05:26:25 AM, Thomas Chou wrote:
> HI Chin Liang,
> 
> On 2015?11?05? 11:05, Chin Liang See wrote:
> >>>>> I notice you are writing in word style which might have concern in
> >>>>> performance. As the burst count can go up to 64, we can write larger
> >>>>> data through memcpy. This will avoid redundancy of data header
> >>>>> (opcode + address + dummy).
> >>>> 
> >>>> You cannot do that, memcpy works on memory while write*() operators
> >>>> work on I/O. You should use readsl() and friends then.
> >>> 
> >>> Actually I am thinking to take advantage the cache fill and dump. But
> >>> after rethinking, this might limit some of the use case as we want the
> >>> driver to support NIOS II without cache. With that, just ignore this
> >>> comment for now.
> >> 
> >> I'm not sure I want to ask for details here. I think we're reading data
> >> from some sort of IO device, so we should just use readl() or readsl()
> >> to read them out (and write*() for the other direction). I don't think
> >> cache operations can be involved in any way. Correct me if I'm wrong
> >> please.
> > 
> > Sure, I can share more. Since the read can support up to burst of 64
> > byte, we can use the a cache fill method which eventually trigger a read
> > of 32 byte (which is size of a cache line) to the Quad SPI controller.
> > To ensure we don't read from old data, we need to invalidate that cache
> > line (through address). By doing this, we can gain better performance as
> > we are reading 32 bytes of data instead 4 per transaction.
> > 
> >>> But your comment lead to the fact that the read part is now using
> >>> memcpy. Thomas needs to fix that to use the readl :)
> >> 
> >> Uhm, I don't think I understand this remark, sorry. I never suggested to
> >> use memcpy() in this entire thread, did I ?
> > 
> > Nope, but this trigger me that we need to do the same for read. The
> > memcpy might lead to the driver reading old data that stay on cache
> > instead from controller. Another way to get rid of this is invalidate
> > the cache.
> 
> Thank for the reminding about the read part. I should not use memcpy()
> indeed.
> 
> Maybe we could pull the memcpy_fromio() and memcpy_toio() or the
> asm-generic/io.h from Linux kernel?
> 
> For i/o access, we bypass the cache for u-boot nios2 with ioremap() or
> map_physaddr(uncached). So no worries or advantage about cache.

Oh, you need those memcpy_{from,to}io() for this hardware? In that case,
go ahead and either implement them or use them :) Now I understand why
you cannot use the reads*() function.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 1/2] nios2: add memcpy_fromio and memcpy_toio
  2015-11-03 13:22 [U-Boot] [PATCH] mtd: add altera quadspi driver Thomas Chou
  2015-11-03 17:44 ` Marek Vasut
  2015-11-04 15:56 ` Chin Liang See
@ 2015-11-05  8:47 ` Thomas Chou
  2015-11-05  8:47   ` [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver Thomas Chou
  2015-11-07  8:07 ` [U-Boot] [PATCH v3] " Thomas Chou
  3 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-05  8:47 UTC (permalink / raw)
  To: u-boot

Add memcpy_fromio() and memcpy_toio().

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
 arch/nios2/include/asm/io.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index 03a3418..95d8801 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -173,4 +173,8 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou
 #define setbits_8(addr, set) setbits(8, addr, set)
 #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
 
+#define memset_io(a, b, c)		memset((void *)(a), (b), (c))
+#define memcpy_fromio(a, b, c)		memcpy((a), (void *)(b), (c))
+#define memcpy_toio(a, b, c)		memcpy((void *)(a), (b), (c))
+
 #endif /* __ASM_NIOS2_IO_H_ */
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05  8:47 ` [U-Boot] [PATCH v2 1/2] nios2: add memcpy_fromio and memcpy_toio Thomas Chou
@ 2015-11-05  8:47   ` Thomas Chou
  2015-11-05 14:25     ` Jagan Teki
  0 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-05  8:47 UTC (permalink / raw)
  To: u-boot

Add Altera Generic Quad SPI Controller support. The controller
converts SPI NOR flash to parallel flash interface. So it is
not like other SPI flash, but rather like CFI flash.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
v2
  use memcpy_toio() for mtd_write() as suggested by Chin Liang
  and Marek.

 doc/device-tree-bindings/mtd/altera_qspi.txt |  35 ++++
 drivers/mtd/Kconfig                          |   9 +
 drivers/mtd/Makefile                         |   1 +
 drivers/mtd/altera_qspi.c                    | 276 +++++++++++++++++++++++++++
 4 files changed, 321 insertions(+)
 create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
 create mode 100644 drivers/mtd/altera_qspi.c

diff --git a/doc/device-tree-bindings/mtd/altera_qspi.txt b/doc/device-tree-bindings/mtd/altera_qspi.txt
new file mode 100644
index 0000000..3361ac9
--- /dev/null
+++ b/doc/device-tree-bindings/mtd/altera_qspi.txt
@@ -0,0 +1,35 @@
+Altera QUADSPI driver
+
+Required properties:
+- compatible: Should be "altr,quadspi-1.0"
+- reg: Address and length of the register set  for the device. It contains
+  the information of registers in the same order as described by reg-names
+- reg-names: Should contain the reg names
+  "avl_csr": Should contain the register configuration base address
+  "avl_mem": Should contain the data base address
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.
+- flash device tree subnode, there must be a node with the following fields:
+	- compatible: Should contain the flash name:
+	  1. EPCS:   epcs16, epcs64, epcs128
+	  2. EPCQ:   epcq16, epcq32, epcq64, epcq128, epcq256, epcq512, epcq1024
+	  3. EPCQ-L: epcql256, epcql512, epcql1024
+	- #address-cells: please refer to /mtd/partition.txt
+	- #size-cells: please refer to /mtd/partition.txt
+	For partitions inside each flash, please refer to /mtd/partition.txt
+
+Example:
+
+	quadspi_controller_0: quadspi at 0x180014a0 {
+		compatible = "altr,quadspi-1.0";
+		reg = <0x180014a0 0x00000020>,
+		      <0x14000000 0x04000000>;
+		reg-names = "avl_csr", "avl_mem";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		flash0: epcq512 at 0 {
+			compatible = "altr,epcq512";
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+	};
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 367c4fe..c16b1d0 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -19,6 +19,15 @@ config CFI_FLASH
 	  option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
 	  for more information on CFI.
 
+config ALTERA_QSPI
+	bool "Altera Generic Quad SPI Controller"
+	depends on MTD
+	help
+	  This enables access to Altera EPCQ/EPCS flash chips using the
+	  Altera Generic Quad SPI Controller. The controller converts SPI
+	  NOR flash to parallel flash interface. Please find details on the
+	  "Embedded Peripherals IP User Guide" of Altera.
+
 endmenu
 
 source "drivers/mtd/nand/Kconfig"
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index c23c0c1..7f018a4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -11,6 +11,7 @@ endif
 obj-$(CONFIG_MTD) += mtd-uclass.o
 obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
 obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
+obj-$(CONFIG_ALTERA_QSPI) += altera_qspi.o
 obj-$(CONFIG_HAS_DATAFLASH) += at45.o
 obj-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
 obj-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
new file mode 100644
index 0000000..c32b1d3
--- /dev/null
+++ b/drivers/mtd/altera_qspi.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <fdt_support.h>
+#include <flash.h>
+#include <mtd.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * The QUADSPI_MEM_OP register is used to do memory protect and erase operations
+ */
+#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
+#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
+#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
+
+/*
+ * The QUADSPI_ISR register is used to determine whether an invalid write or
+ * erase operation trigerred an interrupt
+ */
+#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
+#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
+
+struct altera_qspi_regs {
+	u32	rd_status;
+	u32	rd_sid;
+	u32	rd_rdid;
+	u32	mem_op;
+	u32	isr;
+	u32	imr;
+	u32	chip_select;
+};
+
+struct altera_qspi_platdata {
+	struct altera_qspi_regs *regs;
+	void *base;
+	unsigned long size;
+};
+
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips info */
+
+void flash_print_info(flash_info_t *info)
+{
+	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
+	       info->size >> 20, info->sector_count);
+}
+
+int flash_erase(flash_info_t *info, int s_first, int s_last)
+{
+	struct mtd_info *mtd = info->mtd;
+	struct erase_info instr;
+	int ret;
+
+	memset(&instr, 0, sizeof(instr));
+	instr.addr = mtd->erasesize * s_first;
+	instr.len = mtd->erasesize * (s_last + 1 - s_first);
+	ret = mtd_erase(mtd, &instr);
+	if (ret)
+		return ERR_NOT_ERASED;
+
+	return 0;
+}
+
+int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
+{
+	struct mtd_info *mtd = info->mtd;
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	ulong base = (ulong)pdata->base;
+	loff_t to = addr - base;
+	size_t retlen;
+	int ret;
+
+	ret = mtd_write(mtd, to, cnt, &retlen, src);
+	if (ret)
+		return ERR_NOT_ERASED;
+
+	return 0;
+}
+
+unsigned long flash_init(void)
+{
+	struct udevice *dev;
+
+	/* probe every MTD device */
+	for (uclass_first_device(UCLASS_MTD, &dev);
+	     dev;
+	     uclass_next_device(&dev)) {
+	}
+
+	return flash_info[0].size;
+}
+
+static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	size_t addr = instr->addr;
+	size_t len = instr->len;
+	size_t end = addr + len;
+	u32 sect;
+	u32 stat;
+
+	instr->state = MTD_ERASING;
+	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
+	while (addr < end) {
+		sect = addr / mtd->erasesize;
+		sect <<= 8;
+		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
+		debug("erase %08x\n", sect);
+		writel(sect, &regs->mem_op);
+		stat = readl(&regs->isr);
+		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
+			/* erase failed, sector might be protected */
+			debug("erase %08x fail %x\n", sect, stat);
+			writel(stat, &regs->isr); /* clear isr */
+			instr->state = MTD_ERASE_FAILED;
+			return -EIO;
+		}
+		addr += mtd->erasesize;
+	}
+	instr->state = MTD_ERASE_DONE;
+	mtd_erase_callback(instr);
+
+	return 0;
+}
+
+static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len,
+			    size_t *retlen, u_char *buf)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+
+	memcpy_fromio(buf, pdata->base + from, len);
+	*retlen = len;
+
+	return 0;
+}
+
+static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len,
+			     size_t *retlen, const u_char *buf)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	u32 stat;
+
+	memcpy_toio(pdata->base + to, buf, len);
+	/* check whether write triggered a illegal write interrupt */
+	stat = readl(&regs->isr);
+	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
+		/* write failed, sector might be protected */
+		debug("write fail %x\n", stat);
+		writel(stat, &regs->isr); /* clear isr */
+		return -EIO;
+	}
+	*retlen = len;
+
+	return 0;
+}
+
+static void altera_qspi_sync(struct mtd_info *mtd)
+{
+}
+
+static int altera_qspi_probe(struct udevice *dev)
+{
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	unsigned long base = (unsigned long)pdata->base;
+	struct mtd_info *mtd;
+	flash_info_t *flash = &flash_info[0];
+	u32 rdid;
+	int i;
+
+	rdid = readl(&regs->rd_rdid);
+	debug("rdid %x\n", rdid);
+
+	mtd = calloc(1, sizeof(struct mtd_info));
+	if (!mtd)
+		return -ENOMEM;
+	dev->uclass_priv = mtd;
+	mtd->dev = dev;
+	mtd->name		= "nor0";
+	mtd->type		= MTD_NORFLASH;
+	mtd->flags		= MTD_CAP_NORFLASH;
+	mtd->size		= 1 << ((rdid & 0xff) - 6);
+	mtd->writesize		= 1;
+	mtd->writebufsize	= mtd->writesize;
+	mtd->_erase		= altera_qspi_erase;
+	mtd->_read		= altera_qspi_read;
+	mtd->_write		= altera_qspi_write;
+	mtd->_sync		= altera_qspi_sync;
+	mtd->numeraseregions = 0;
+	mtd->erasesize = 0x10000;
+	if (add_mtd_device(mtd))
+		return -ENOMEM;
+
+	flash->mtd = mtd;
+	flash->size = mtd->size;
+	flash->sector_count = mtd->size / mtd->erasesize;
+	flash->flash_id = rdid;
+	flash->start[0] = base;
+	for (i = 1; i < flash->sector_count; i++)
+		flash->start[i] = flash->start[i - 1] + mtd->erasesize;
+	gd->bd->bi_flashstart = base;
+
+	return 0;
+}
+
+static int altera_qspi_ofdata_to_platdata(struct udevice *dev)
+{
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	void *blob = (void *)gd->fdt_blob;
+	int node = dev->of_offset;
+	const char *list, *end;
+	const fdt32_t *cell;
+	void *base;
+	unsigned long addr, size;
+	int parent, addrc, sizec;
+	int len, idx;
+
+	/*
+	 * decode regs. there are multiple reg tuples, and they need to
+	 * match with reg-names.
+	 */
+	parent = fdt_parent_offset(blob, node);
+	of_bus_default_count_cells(blob, parent, &addrc, &sizec);
+	list = fdt_getprop(blob, node, "reg-names", &len);
+	if (!list)
+		return -ENOENT;
+	end = list + len;
+	cell = fdt_getprop(blob, node, "reg", &len);
+	if (!cell)
+		return -ENOENT;
+	idx = 0;
+	while (list < end) {
+		addr = fdt_translate_address((void *)blob,
+					     node, cell + idx);
+		size = fdt_addr_to_cpu(cell[idx + addrc]);
+		base = ioremap(addr, size);
+		len = strlen(list);
+		if (strcmp(list, "avl_csr") == 0) {
+			pdata->regs = base;
+		} else if (strcmp(list, "avl_mem") == 0) {
+			pdata->base = base;
+			pdata->size = size;
+		}
+		idx += addrc + sizec;
+		list += (len + 1);
+	}
+
+	return 0;
+}
+
+static const struct udevice_id altera_qspi_ids[] = {
+	{ .compatible = "altr,quadspi-1.0" },
+	{}
+};
+
+U_BOOT_DRIVER(altera_qspi) = {
+	.name	= "altera_qspi",
+	.id	= UCLASS_MTD,
+	.of_match = altera_qspi_ids,
+	.ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata),
+	.probe	= altera_qspi_probe,
+};
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05  8:47   ` [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver Thomas Chou
@ 2015-11-05 14:25     ` Jagan Teki
  2015-11-05 14:45       ` Thomas Chou
  0 siblings, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-05 14:25 UTC (permalink / raw)
  To: u-boot

On 5 November 2015 at 14:17, Thomas Chou <thomas@wytron.com.tw> wrote:
> Add Altera Generic Quad SPI Controller support. The controller
> converts SPI NOR flash to parallel flash interface. So it is
> not like other SPI flash, but rather like CFI flash.

Can you wait till spi-nor ready? it doesn't make sense to have Serial
NOR to created as parallel NOR.

>
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
> v2
>   use memcpy_toio() for mtd_write() as suggested by Chin Liang
>   and Marek.
>
>  doc/device-tree-bindings/mtd/altera_qspi.txt |  35 ++++
>  drivers/mtd/Kconfig                          |   9 +
>  drivers/mtd/Makefile                         |   1 +
>  drivers/mtd/altera_qspi.c                    | 276 +++++++++++++++++++++++++++
>  4 files changed, 321 insertions(+)
>  create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
>  create mode 100644 drivers/mtd/altera_qspi.c
>
> diff --git a/doc/device-tree-bindings/mtd/altera_qspi.txt b/doc/device-tree-bindings/mtd/altera_qspi.txt
> new file mode 100644
> index 0000000..3361ac9
> --- /dev/null
> +++ b/doc/device-tree-bindings/mtd/altera_qspi.txt
> @@ -0,0 +1,35 @@
> +Altera QUADSPI driver
> +
> +Required properties:
> +- compatible: Should be "altr,quadspi-1.0"
> +- reg: Address and length of the register set  for the device. It contains
> +  the information of registers in the same order as described by reg-names
> +- reg-names: Should contain the reg names
> +  "avl_csr": Should contain the register configuration base address
> +  "avl_mem": Should contain the data base address
> +- #address-cells: Must be <1>.
> +- #size-cells: Must be <0>.
> +- flash device tree subnode, there must be a node with the following fields:
> +       - compatible: Should contain the flash name:
> +         1. EPCS:   epcs16, epcs64, epcs128
> +         2. EPCQ:   epcq16, epcq32, epcq64, epcq128, epcq256, epcq512, epcq1024
> +         3. EPCQ-L: epcql256, epcql512, epcql1024
> +       - #address-cells: please refer to /mtd/partition.txt
> +       - #size-cells: please refer to /mtd/partition.txt
> +       For partitions inside each flash, please refer to /mtd/partition.txt
> +
> +Example:
> +
> +       quadspi_controller_0: quadspi at 0x180014a0 {
> +               compatible = "altr,quadspi-1.0";
> +               reg = <0x180014a0 0x00000020>,
> +                     <0x14000000 0x04000000>;
> +               reg-names = "avl_csr", "avl_mem";
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +               flash0: epcq512 at 0 {
> +                       compatible = "altr,epcq512";
> +                       #address-cells = <1>;
> +                       #size-cells = <1>;
> +               };
> +       };
> diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
> index 367c4fe..c16b1d0 100644
> --- a/drivers/mtd/Kconfig
> +++ b/drivers/mtd/Kconfig
> @@ -19,6 +19,15 @@ config CFI_FLASH
>           option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
>           for more information on CFI.
>
> +config ALTERA_QSPI
> +       bool "Altera Generic Quad SPI Controller"
> +       depends on MTD
> +       help
> +         This enables access to Altera EPCQ/EPCS flash chips using the
> +         Altera Generic Quad SPI Controller. The controller converts SPI
> +         NOR flash to parallel flash interface. Please find details on the
> +         "Embedded Peripherals IP User Guide" of Altera.
> +
>  endmenu
>
>  source "drivers/mtd/nand/Kconfig"
> diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
> index c23c0c1..7f018a4 100644
> --- a/drivers/mtd/Makefile
> +++ b/drivers/mtd/Makefile
> @@ -11,6 +11,7 @@ endif
>  obj-$(CONFIG_MTD) += mtd-uclass.o
>  obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
>  obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
> +obj-$(CONFIG_ALTERA_QSPI) += altera_qspi.o
>  obj-$(CONFIG_HAS_DATAFLASH) += at45.o
>  obj-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
>  obj-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o
> diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
> new file mode 100644
> index 0000000..c32b1d3
> --- /dev/null
> +++ b/drivers/mtd/altera_qspi.c
> @@ -0,0 +1,276 @@
> +/*
> + * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <dm.h>
> +#include <errno.h>
> +#include <fdt_support.h>
> +#include <flash.h>
> +#include <mtd.h>
> +#include <asm/io.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/*
> + * The QUADSPI_MEM_OP register is used to do memory protect and erase operations
> + */
> +#define QUADSPI_MEM_OP_BULK_ERASE              0x00000001
> +#define QUADSPI_MEM_OP_SECTOR_ERASE            0x00000002
> +#define QUADSPI_MEM_OP_SECTOR_PROTECT          0x00000003
> +
> +/*
> + * The QUADSPI_ISR register is used to determine whether an invalid write or
> + * erase operation trigerred an interrupt
> + */
> +#define QUADSPI_ISR_ILLEGAL_ERASE              BIT(0)
> +#define QUADSPI_ISR_ILLEGAL_WRITE              BIT(1)
> +
> +struct altera_qspi_regs {
> +       u32     rd_status;
> +       u32     rd_sid;
> +       u32     rd_rdid;
> +       u32     mem_op;
> +       u32     isr;
> +       u32     imr;
> +       u32     chip_select;
> +};
> +
> +struct altera_qspi_platdata {
> +       struct altera_qspi_regs *regs;
> +       void *base;
> +       unsigned long size;
> +};
> +
> +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];   /* FLASH chips info */
> +
> +void flash_print_info(flash_info_t *info)
> +{
> +       printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
> +              info->size >> 20, info->sector_count);
> +}
> +
> +int flash_erase(flash_info_t *info, int s_first, int s_last)
> +{
> +       struct mtd_info *mtd = info->mtd;
> +       struct erase_info instr;
> +       int ret;
> +
> +       memset(&instr, 0, sizeof(instr));
> +       instr.addr = mtd->erasesize * s_first;
> +       instr.len = mtd->erasesize * (s_last + 1 - s_first);
> +       ret = mtd_erase(mtd, &instr);
> +       if (ret)
> +               return ERR_NOT_ERASED;
> +
> +       return 0;
> +}
> +
> +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
> +{
> +       struct mtd_info *mtd = info->mtd;
> +       struct udevice *dev = mtd->dev;
> +       struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +       ulong base = (ulong)pdata->base;
> +       loff_t to = addr - base;
> +       size_t retlen;
> +       int ret;
> +
> +       ret = mtd_write(mtd, to, cnt, &retlen, src);
> +       if (ret)
> +               return ERR_NOT_ERASED;
> +
> +       return 0;
> +}
> +
> +unsigned long flash_init(void)
> +{
> +       struct udevice *dev;
> +
> +       /* probe every MTD device */
> +       for (uclass_first_device(UCLASS_MTD, &dev);
> +            dev;
> +            uclass_next_device(&dev)) {
> +       }
> +
> +       return flash_info[0].size;
> +}
> +
> +static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr)
> +{
> +       struct udevice *dev = mtd->dev;
> +       struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +       struct altera_qspi_regs *regs = pdata->regs;
> +       size_t addr = instr->addr;
> +       size_t len = instr->len;
> +       size_t end = addr + len;
> +       u32 sect;
> +       u32 stat;
> +
> +       instr->state = MTD_ERASING;
> +       addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
> +       while (addr < end) {
> +               sect = addr / mtd->erasesize;
> +               sect <<= 8;
> +               sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
> +               debug("erase %08x\n", sect);
> +               writel(sect, &regs->mem_op);
> +               stat = readl(&regs->isr);
> +               if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
> +                       /* erase failed, sector might be protected */
> +                       debug("erase %08x fail %x\n", sect, stat);
> +                       writel(stat, &regs->isr); /* clear isr */
> +                       instr->state = MTD_ERASE_FAILED;
> +                       return -EIO;
> +               }
> +               addr += mtd->erasesize;
> +       }
> +       instr->state = MTD_ERASE_DONE;
> +       mtd_erase_callback(instr);
> +
> +       return 0;
> +}
> +
> +static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len,
> +                           size_t *retlen, u_char *buf)
> +{
> +       struct udevice *dev = mtd->dev;
> +       struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +
> +       memcpy_fromio(buf, pdata->base + from, len);
> +       *retlen = len;
> +
> +       return 0;
> +}
> +
> +static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len,
> +                            size_t *retlen, const u_char *buf)
> +{
> +       struct udevice *dev = mtd->dev;
> +       struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +       struct altera_qspi_regs *regs = pdata->regs;
> +       u32 stat;
> +
> +       memcpy_toio(pdata->base + to, buf, len);
> +       /* check whether write triggered a illegal write interrupt */
> +       stat = readl(&regs->isr);
> +       if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
> +               /* write failed, sector might be protected */
> +               debug("write fail %x\n", stat);
> +               writel(stat, &regs->isr); /* clear isr */
> +               return -EIO;
> +       }
> +       *retlen = len;
> +
> +       return 0;
> +}
> +
> +static void altera_qspi_sync(struct mtd_info *mtd)
> +{
> +}
> +
> +static int altera_qspi_probe(struct udevice *dev)
> +{
> +       struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +       struct altera_qspi_regs *regs = pdata->regs;
> +       unsigned long base = (unsigned long)pdata->base;
> +       struct mtd_info *mtd;
> +       flash_info_t *flash = &flash_info[0];
> +       u32 rdid;
> +       int i;
> +
> +       rdid = readl(&regs->rd_rdid);
> +       debug("rdid %x\n", rdid);
> +
> +       mtd = calloc(1, sizeof(struct mtd_info));
> +       if (!mtd)
> +               return -ENOMEM;
> +       dev->uclass_priv = mtd;
> +       mtd->dev = dev;
> +       mtd->name               = "nor0";
> +       mtd->type               = MTD_NORFLASH;
> +       mtd->flags              = MTD_CAP_NORFLASH;
> +       mtd->size               = 1 << ((rdid & 0xff) - 6);
> +       mtd->writesize          = 1;
> +       mtd->writebufsize       = mtd->writesize;
> +       mtd->_erase             = altera_qspi_erase;
> +       mtd->_read              = altera_qspi_read;
> +       mtd->_write             = altera_qspi_write;
> +       mtd->_sync              = altera_qspi_sync;
> +       mtd->numeraseregions = 0;
> +       mtd->erasesize = 0x10000;
> +       if (add_mtd_device(mtd))
> +               return -ENOMEM;
> +
> +       flash->mtd = mtd;
> +       flash->size = mtd->size;
> +       flash->sector_count = mtd->size / mtd->erasesize;
> +       flash->flash_id = rdid;
> +       flash->start[0] = base;
> +       for (i = 1; i < flash->sector_count; i++)
> +               flash->start[i] = flash->start[i - 1] + mtd->erasesize;
> +       gd->bd->bi_flashstart = base;
> +
> +       return 0;
> +}
> +
> +static int altera_qspi_ofdata_to_platdata(struct udevice *dev)
> +{
> +       struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
> +       void *blob = (void *)gd->fdt_blob;
> +       int node = dev->of_offset;
> +       const char *list, *end;
> +       const fdt32_t *cell;
> +       void *base;
> +       unsigned long addr, size;
> +       int parent, addrc, sizec;
> +       int len, idx;
> +
> +       /*
> +        * decode regs. there are multiple reg tuples, and they need to
> +        * match with reg-names.
> +        */
> +       parent = fdt_parent_offset(blob, node);
> +       of_bus_default_count_cells(blob, parent, &addrc, &sizec);
> +       list = fdt_getprop(blob, node, "reg-names", &len);
> +       if (!list)
> +               return -ENOENT;
> +       end = list + len;
> +       cell = fdt_getprop(blob, node, "reg", &len);
> +       if (!cell)
> +               return -ENOENT;
> +       idx = 0;
> +       while (list < end) {
> +               addr = fdt_translate_address((void *)blob,
> +                                            node, cell + idx);
> +               size = fdt_addr_to_cpu(cell[idx + addrc]);
> +               base = ioremap(addr, size);
> +               len = strlen(list);
> +               if (strcmp(list, "avl_csr") == 0) {
> +                       pdata->regs = base;
> +               } else if (strcmp(list, "avl_mem") == 0) {
> +                       pdata->base = base;
> +                       pdata->size = size;
> +               }
> +               idx += addrc + sizec;
> +               list += (len + 1);
> +       }
> +
> +       return 0;
> +}
> +
> +static const struct udevice_id altera_qspi_ids[] = {
> +       { .compatible = "altr,quadspi-1.0" },
> +       {}
> +};
> +
> +U_BOOT_DRIVER(altera_qspi) = {
> +       .name   = "altera_qspi",
> +       .id     = UCLASS_MTD,
> +       .of_match = altera_qspi_ids,
> +       .ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
> +       .platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata),
> +       .probe  = altera_qspi_probe,
> +};
> --
> 2.5.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot



-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05 14:25     ` Jagan Teki
@ 2015-11-05 14:45       ` Thomas Chou
  2015-11-05 14:57         ` Jagan Teki
  0 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-05 14:45 UTC (permalink / raw)
  To: u-boot

Hi Jagan,

On 2015?11?05? 22:25, Jagan Teki wrote:
> On 5 November 2015 at 14:17, Thomas Chou <thomas@wytron.com.tw> wrote:
>> Add Altera Generic Quad SPI Controller support. The controller
>> converts SPI NOR flash to parallel flash interface. So it is
>> not like other SPI flash, but rather like CFI flash.
>
> Can you wait till spi-nor ready? it doesn't make sense to have Serial
> NOR to created as parallel NOR.

The altera quad spi core is very special that the hardware handle the 
spi-nor protocol. The core is designed to replace the CFI flash 
interface. So there is nothing to do with SPI from the parallel flash 
interface. It is memory mapped. There is no SPI interface. There is 
nothing related to SPI programming. So please don't worry about the 
progress on spi-nor. The core should belong to parallel flash, but not 
serial flash.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05 14:45       ` Thomas Chou
@ 2015-11-05 14:57         ` Jagan Teki
  2015-11-05 15:51           ` Marek Vasut
  2015-11-06  0:18           ` Thomas Chou
  0 siblings, 2 replies; 34+ messages in thread
From: Jagan Teki @ 2015-11-05 14:57 UTC (permalink / raw)
  To: u-boot

Hi Thomas,

On 5 November 2015 at 20:15, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Jagan,
>
> On 2015?11?05? 22:25, Jagan Teki wrote:
>>
>> On 5 November 2015 at 14:17, Thomas Chou <thomas@wytron.com.tw> wrote:
>>>
>>> Add Altera Generic Quad SPI Controller support. The controller
>>> converts SPI NOR flash to parallel flash interface. So it is
>>> not like other SPI flash, but rather like CFI flash.
>>
>>
>> Can you wait till spi-nor ready? it doesn't make sense to have Serial
>> NOR to created as parallel NOR.
>
>
> The altera quad spi core is very special that the hardware handle the
> spi-nor protocol. The core is designed to replace the CFI flash interface.
> So there is nothing to do with SPI from the parallel flash interface. It is
> memory mapped. There is no SPI interface. There is nothing related to SPI
> programming. So please don't worry about the progress on spi-nor. The core
> should belong to parallel flash, but not serial flash.

Agreed that this is not doing any generic spi things, but it's a
spi-nor controller all spi-nor controller should be part of spi-nor
subsystem Linux agreed and have a framework for that.

drivers/mtd/spi-nor/fsl-quadspi.c
drivers/mtd/spi-nor/nxp-spifi.c

all these are spi-nor controller which doesn't do any generic spi
things but should be in spi-nor subsystem. Even Marek send altera_qspi
as spi-nor controller [1]

Since I'm working on similar spi-nor subsystem what Linux have +
driver model little worried about this because once we have spi-nor
again it should be a re-work.

[1] http://lists.infradead.org/pipermail/linux-mtd/2015-April/058650.html

-- 
Jagan | openedev

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05 14:57         ` Jagan Teki
@ 2015-11-05 15:51           ` Marek Vasut
  2015-11-06  8:11             ` Jagan Teki
  2015-11-06  0:18           ` Thomas Chou
  1 sibling, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2015-11-05 15:51 UTC (permalink / raw)
  To: u-boot

On Thursday, November 05, 2015 at 03:57:01 PM, Jagan Teki wrote:
> Hi Thomas,
> 
> On 5 November 2015 at 20:15, Thomas Chou <thomas@wytron.com.tw> wrote:
> > Hi Jagan,
> > 
> > On 2015?11?05? 22:25, Jagan Teki wrote:
> >> On 5 November 2015 at 14:17, Thomas Chou <thomas@wytron.com.tw> wrote:
> >>> Add Altera Generic Quad SPI Controller support. The controller
> >>> converts SPI NOR flash to parallel flash interface. So it is
> >>> not like other SPI flash, but rather like CFI flash.
> >> 
> >> Can you wait till spi-nor ready? it doesn't make sense to have Serial
> >> NOR to created as parallel NOR.
> > 
> > The altera quad spi core is very special that the hardware handle the
> > spi-nor protocol. The core is designed to replace the CFI flash
> > interface. So there is nothing to do with SPI from the parallel flash
> > interface. It is memory mapped. There is no SPI interface. There is
> > nothing related to SPI programming. So please don't worry about the
> > progress on spi-nor. The core should belong to parallel flash, but not
> > serial flash.
> 
> Agreed that this is not doing any generic spi things, but it's a
> spi-nor controller all spi-nor controller should be part of spi-nor
> subsystem Linux agreed and have a framework for that.

The underlying technology is not exposed to the programmer, so this argument
is moot. The behavior of this device is closer to CFI flash.

> drivers/mtd/spi-nor/fsl-quadspi.c
> drivers/mtd/spi-nor/nxp-spifi.c
> 
> all these are spi-nor controller which doesn't do any generic spi
> things but should be in spi-nor subsystem. Even Marek send altera_qspi
> as spi-nor controller [1]

This is because that thing communicates like a SPI controller.

> Since I'm working on similar spi-nor subsystem what Linux have +
> driver model little worried about this because once we have spi-nor
> again it should be a re-work.

Your work and this driver are orthogonal things.

> [1] http://lists.infradead.org/pipermail/linux-mtd/2015-April/058650.html

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05 14:57         ` Jagan Teki
  2015-11-05 15:51           ` Marek Vasut
@ 2015-11-06  0:18           ` Thomas Chou
  2015-11-06  8:07             ` Jagan Teki
  1 sibling, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-06  0:18 UTC (permalink / raw)
  To: u-boot

Hi Jagan,

On 2015?11?05? 22:57, Jagan Teki wrote:
> The altera quad spi core is very special that the hardware handle the
>> spi-nor protocol. The core is designed to replace the CFI flash interface.
>> So there is nothing to do with SPI from the parallel flash interface. It is
>> memory mapped. There is no SPI interface. There is nothing related to SPI
>> programming. So please don't worry about the progress on spi-nor. The core
>> should belong to parallel flash, but not serial flash.
>
> Agreed that this is not doing any generic spi things, but it's a
> spi-nor controller all spi-nor controller should be part of spi-nor
> subsystem Linux agreed and have a framework for that.
>
> drivers/mtd/spi-nor/fsl-quadspi.c
> drivers/mtd/spi-nor/nxp-spifi.c
>
> all these are spi-nor controller which doesn't do any generic spi
> things but should be in spi-nor subsystem. Even Marek send altera_qspi
> as spi-nor controller [1]
>
> Since I'm working on similar spi-nor subsystem what Linux have +
> driver model little worried about this because once we have spi-nor
> again it should be a re-work.
>
> [1] http://lists.infradead.org/pipermail/linux-mtd/2015-April/058650.html

I had been a hardware engineer. I designed chips and boards. I believe 
this should depend on the programming interface. Eg, there are SSDs of 
SATA interfaces which build with NAND or EMMC, and it dose not make 
sense to classify them as NAND or MMC. The altera quadspi core is a 
similar case, because the hardware converts the programming interface. 
There is no way to send spi-nor commands that the spi frame work does. 
It is ridiculous to insist it to use under the spi-nor framework.

The altera quadspi hides details about the underlying spi-nor. We may 
even choose to build interface that convert EMMC to like cfi flash. The 
users can run code directly on the flash or use memory command like 
"cp.b" of u-boot to program the flash. This can be a advantage over the 
"sf" command.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-06  0:18           ` Thomas Chou
@ 2015-11-06  8:07             ` Jagan Teki
  2015-11-06  9:28               ` Thomas Chou
  0 siblings, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-06  8:07 UTC (permalink / raw)
  To: u-boot

Hi Thomas,

On 6 November 2015 at 05:48, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Jagan,
>
> On 2015?11?05? 22:57, Jagan Teki wrote:
>>
>> The altera quad spi core is very special that the hardware handle the
>>>
>>> spi-nor protocol. The core is designed to replace the CFI flash
>>> interface.
>>> So there is nothing to do with SPI from the parallel flash interface. It
>>> is
>>> memory mapped. There is no SPI interface. There is nothing related to SPI
>>> programming. So please don't worry about the progress on spi-nor. The
>>> core
>>> should belong to parallel flash, but not serial flash.
>>
>>
>> Agreed that this is not doing any generic spi things, but it's a
>> spi-nor controller all spi-nor controller should be part of spi-nor
>> subsystem Linux agreed and have a framework for that.
>>
>> drivers/mtd/spi-nor/fsl-quadspi.c
>> drivers/mtd/spi-nor/nxp-spifi.c
>>
>> all these are spi-nor controller which doesn't do any generic spi
>> things but should be in spi-nor subsystem. Even Marek send altera_qspi
>> as spi-nor controller [1]
>>
>> Since I'm working on similar spi-nor subsystem what Linux have +
>> driver model little worried about this because once we have spi-nor
>> again it should be a re-work.
>>
>> [1] http://lists.infradead.org/pipermail/linux-mtd/2015-April/058650.html
>
>
> I had been a hardware engineer. I designed chips and boards. I believe this
> should depend on the programming interface. Eg, there are SSDs of SATA
> interfaces which build with NAND or EMMC, and it dose not make sense to
> classify them as NAND or MMC. The altera quadspi core is a similar case,
> because the hardware converts the programming interface. There is no way to
> send spi-nor commands that the spi frame work does. It is ridiculous to
> insist it to use under the spi-nor framework.

I appreciate your hardware expertise and am not questioning about that
as well. I do agree with the hw logic about altera qspi controller and
I don't have any questions with hw either.

But my main intention here was about the software support since Linux
discussed about this subject and finally moved to spi-nor controllers
(though they don't use spi bus at-all) to spi-nor framework and Marek
knows this topic very well.

I believe discussion about this topic much more clear if we send this
driver to Linux.

>
> The altera quadspi hides details about the underlying spi-nor. We may even
> choose to build interface that convert EMMC to like cfi flash. The users can
> run code directly on the flash or use memory command like "cp.b" of u-boot
> to program the flash. This can be a advantage over the "sf" command.

thanks!
-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-05 15:51           ` Marek Vasut
@ 2015-11-06  8:11             ` Jagan Teki
  2015-11-06 13:45               ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-06  8:11 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On 5 November 2015 at 21:21, Marek Vasut <marex@denx.de> wrote:
> On Thursday, November 05, 2015 at 03:57:01 PM, Jagan Teki wrote:
>> Hi Thomas,
>>
>> On 5 November 2015 at 20:15, Thomas Chou <thomas@wytron.com.tw> wrote:
>> > Hi Jagan,
>> >
>> > On 2015?11?05? 22:25, Jagan Teki wrote:
>> >> On 5 November 2015 at 14:17, Thomas Chou <thomas@wytron.com.tw> wrote:
>> >>> Add Altera Generic Quad SPI Controller support. The controller
>> >>> converts SPI NOR flash to parallel flash interface. So it is
>> >>> not like other SPI flash, but rather like CFI flash.
>> >>
>> >> Can you wait till spi-nor ready? it doesn't make sense to have Serial
>> >> NOR to created as parallel NOR.
>> >
>> > The altera quad spi core is very special that the hardware handle the
>> > spi-nor protocol. The core is designed to replace the CFI flash
>> > interface. So there is nothing to do with SPI from the parallel flash
>> > interface. It is memory mapped. There is no SPI interface. There is
>> > nothing related to SPI programming. So please don't worry about the
>> > progress on spi-nor. The core should belong to parallel flash, but not
>> > serial flash.
>>
>> Agreed that this is not doing any generic spi things, but it's a
>> spi-nor controller all spi-nor controller should be part of spi-nor
>> subsystem Linux agreed and have a framework for that.
>
> The underlying technology is not exposed to the programmer, so this argument
> is moot. The behavior of this device is closer to CFI flash.
>
>> drivers/mtd/spi-nor/fsl-quadspi.c
>> drivers/mtd/spi-nor/nxp-spifi.c
>>
>> all these are spi-nor controller which doesn't do any generic spi
>> things but should be in spi-nor subsystem. Even Marek send altera_qspi
>> as spi-nor controller [1]
>
> This is because that thing communicates like a SPI controller.

OK, the driver you sent to Linux is not same as this - means not same
controller?

>
>> Since I'm working on similar spi-nor subsystem what Linux have +
>> driver model little worried about this because once we have spi-nor
>> again it should be a re-work.
>
> Your work and this driver are orthogonal things.

OK, let's park my work a side - do you agree with me like this driver
should be part of spi-nor?

>
>> [1] http://lists.infradead.org/pipermail/linux-mtd/2015-April/058650.html

thanks!
-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-06  8:07             ` Jagan Teki
@ 2015-11-06  9:28               ` Thomas Chou
  2015-11-06  9:52                 ` Jagan Teki
  0 siblings, 1 reply; 34+ messages in thread
From: Thomas Chou @ 2015-11-06  9:28 UTC (permalink / raw)
  To: u-boot

Hi Jagan,

On 2015?11?06? 16:07, Jagan Teki wrote:
> I appreciate your hardware expertise and am not questioning about that
> as well. I do agree with the hw logic about altera qspi controller and
> I don't have any questions with hw either.
>
> But my main intention here was about the software support since Linux
> discussed about this subject and finally moved to spi-nor controllers
> (though they don't use spi bus at-all) to spi-nor framework and Marek
> knows this topic very well.
>
> I believe discussion about this topic much more clear if we send this
> driver to Linux.

Sorry that I was absent and didn't know about the topic discussed on 
Linux. The purpose of u-boot and Linux is quite different thought they 
may share some code. The drivers are different, too. Whatever they chose 
on Linux is not related here.

Marek did agree that "The behavior of this device is closer to CFI 
flash.". This is what the core designed for, to replace the CFI flash. I 
am more concerned with users. Users can use memory commands to display 
and modify the content directly. This is very point where the driver 
should stand.

Thanks.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-06  9:28               ` Thomas Chou
@ 2015-11-06  9:52                 ` Jagan Teki
  2015-11-06 11:48                   ` Jagan Teki
  0 siblings, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-06  9:52 UTC (permalink / raw)
  To: u-boot

Hi Thomas,

On 6 November 2015 at 14:58, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Jagan,
>
> On 2015?11?06? 16:07, Jagan Teki wrote:
>>
>> I appreciate your hardware expertise and am not questioning about that
>> as well. I do agree with the hw logic about altera qspi controller and
>> I don't have any questions with hw either.
>>
>> But my main intention here was about the software support since Linux
>> discussed about this subject and finally moved to spi-nor controllers
>> (though they don't use spi bus at-all) to spi-nor framework and Marek
>> knows this topic very well.
>>
>> I believe discussion about this topic much more clear if we send this
>> driver to Linux.
>
>
> Sorry that I was absent and didn't know about the topic discussed on Linux.
> The purpose of u-boot and Linux is quite different thought they may share
> some code. The drivers are different, too. Whatever they chose on Linux is
> not related here.

I'm trying to interface the same standard wrt Linux stack, So adding
new features is reasonable and easy for developers to send the patches
if we have same stand-point as what Linux or vice-versa. Yes drivers
are bit different wrt Linux ie OK, anyway we need to implement with
dm-driven but the functionality flow will be same like

Linux --> u-boot
mtd_utils --> cmd_sf
mtd_info -->mtd_info
spi-nor --> spi-nor
m25p80.c --> spi-nor-flash (dm-driven)
fsl-quadspi --> fsl-qspi (dm-driven)

Finally, what is the main issue if we move to spi-nor instead of cfi?
agreed that it never used generic spi but even if it there in spi-nor
also it never used generic spi, spi-nor should also use mtd as cfi and
also it's serial flash it should be part of spi-nor that make more
sense to me.

>
> Marek did agree that "The behavior of this device is closer to CFI flash.".
> This is what the core designed for, to replace the CFI flash. I am more
> concerned with users. Users can use memory commands to display and modify
> the content directly. This is very point where the driver should stand.

Yes from uses point of view, it's a cfi flash but generally all cfi's
are parallel in nature so it's shouldn't treated as serial. If we use
sf user at least thought he would doing serial flash operations.

thanks!
-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-06  9:52                 ` Jagan Teki
@ 2015-11-06 11:48                   ` Jagan Teki
  2015-11-06 13:32                     ` Thomas Chou
  0 siblings, 1 reply; 34+ messages in thread
From: Jagan Teki @ 2015-11-06 11:48 UTC (permalink / raw)
  To: u-boot

Hi Thomas,

On 6 November 2015 at 15:22, Jagan Teki <jteki@openedev.com> wrote:
> Hi Thomas,
>
> On 6 November 2015 at 14:58, Thomas Chou <thomas@wytron.com.tw> wrote:
>> Hi Jagan,
>>
>> On 2015?11?06? 16:07, Jagan Teki wrote:
>>>
>>> I appreciate your hardware expertise and am not questioning about that
>>> as well. I do agree with the hw logic about altera qspi controller and
>>> I don't have any questions with hw either.
>>>
>>> But my main intention here was about the software support since Linux
>>> discussed about this subject and finally moved to spi-nor controllers
>>> (though they don't use spi bus at-all) to spi-nor framework and Marek
>>> knows this topic very well.
>>>
>>> I believe discussion about this topic much more clear if we send this
>>> driver to Linux.
>>
>>
>> Sorry that I was absent and didn't know about the topic discussed on Linux.
>> The purpose of u-boot and Linux is quite different thought they may share
>> some code. The drivers are different, too. Whatever they chose on Linux is
>> not related here.
>
> I'm trying to interface the same standard wrt Linux stack, So adding
> new features is reasonable and easy for developers to send the patches
> if we have same stand-point as what Linux or vice-versa. Yes drivers
> are bit different wrt Linux ie OK, anyway we need to implement with
> dm-driven but the functionality flow will be same like
>
> Linux --> u-boot
> mtd_utils --> cmd_sf
> mtd_info -->mtd_info
> spi-nor --> spi-nor
> m25p80.c --> spi-nor-flash (dm-driven)
> fsl-quadspi --> fsl-qspi (dm-driven)
>
> Finally, what is the main issue if we move to spi-nor instead of cfi?
> agreed that it never used generic spi but even if it there in spi-nor
> also it never used generic spi, spi-nor should also use mtd as cfi and
> also it's serial flash it should be part of spi-nor that make more
> sense to me.
>
>>
>> Marek did agree that "The behavior of this device is closer to CFI flash.".
>> This is what the core designed for, to replace the CFI flash. I am more
>> concerned with users. Users can use memory commands to display and modify
>> the content directly. This is very point where the driver should stand.
>
> Yes from uses point of view, it's a cfi flash but generally all cfi's
> are parallel in nature so it's shouldn't treated as serial. If we use
> sf user at least thought he would doing serial flash operations.

My intention is not to hold this, but once spi-nor is ready will you
able to move it from here?

thanks!
-- 
Jagan | openedev.

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-06 11:48                   ` Jagan Teki
@ 2015-11-06 13:32                     ` Thomas Chou
  0 siblings, 0 replies; 34+ messages in thread
From: Thomas Chou @ 2015-11-06 13:32 UTC (permalink / raw)
  To: u-boot

Hi Jagan,

On 2015?11?06? 19:48, Jagan Teki wrote:
> My intention is not to hold this, but once spi-nor is ready will you
> able to move it from here?

Sure, I will look at the new spi-nor interface then. And I will think 
again if it is good to move. Thanks a lot for your help.

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver
  2015-11-06  8:11             ` Jagan Teki
@ 2015-11-06 13:45               ` Marek Vasut
  0 siblings, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2015-11-06 13:45 UTC (permalink / raw)
  To: u-boot

On Friday, November 06, 2015 at 09:11:20 AM, Jagan Teki wrote:

[...]

> >> all these are spi-nor controller which doesn't do any generic spi
> >> things but should be in spi-nor subsystem. Even Marek send altera_qspi
> >> as spi-nor controller [1]
> > 
> > This is because that thing communicates like a SPI controller.
> 
> OK, the driver you sent to Linux is not same as this - means not same
> controller?

This is correct, the controller we're discussing here is completely different 
from the Cadence QSPI I submitted for Linux kernel.

> >> Since I'm working on similar spi-nor subsystem what Linux have +
> >> driver model little worried about this because once we have spi-nor
> >> again it should be a re-work.
> > 
> > Your work and this driver are orthogonal things.
> 
> OK, let's park my work a side - do you agree with me like this driver
> should be part of spi-nor?

No

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 34+ messages in thread

* [U-Boot] [PATCH v3] mtd: add altera quadspi driver
  2015-11-03 13:22 [U-Boot] [PATCH] mtd: add altera quadspi driver Thomas Chou
                   ` (2 preceding siblings ...)
  2015-11-05  8:47 ` [U-Boot] [PATCH v2 1/2] nios2: add memcpy_fromio and memcpy_toio Thomas Chou
@ 2015-11-07  8:07 ` Thomas Chou
  3 siblings, 0 replies; 34+ messages in thread
From: Thomas Chou @ 2015-11-07  8:07 UTC (permalink / raw)
  To: u-boot

Add Altera Generic Quad SPI Controller support. The controller
converts SPI NOR flash to parallel flash interface. So it is
not like other SPI flash, but rather like CFI flash.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
v2
  use memcpy_toio() for mtd_write() as suggested by Chin Liang
  and Marek.
v3
  use auto-allocated uclass priv mtd_info.

 doc/device-tree-bindings/mtd/altera_qspi.txt |  35 ++++
 drivers/mtd/Kconfig                          |   9 +
 drivers/mtd/Makefile                         |   1 +
 drivers/mtd/altera_qspi.c                    | 273 +++++++++++++++++++++++++++
 4 files changed, 318 insertions(+)
 create mode 100644 doc/device-tree-bindings/mtd/altera_qspi.txt
 create mode 100644 drivers/mtd/altera_qspi.c

diff --git a/doc/device-tree-bindings/mtd/altera_qspi.txt b/doc/device-tree-bindings/mtd/altera_qspi.txt
new file mode 100644
index 0000000..3361ac9
--- /dev/null
+++ b/doc/device-tree-bindings/mtd/altera_qspi.txt
@@ -0,0 +1,35 @@
+Altera QUADSPI driver
+
+Required properties:
+- compatible: Should be "altr,quadspi-1.0"
+- reg: Address and length of the register set  for the device. It contains
+  the information of registers in the same order as described by reg-names
+- reg-names: Should contain the reg names
+  "avl_csr": Should contain the register configuration base address
+  "avl_mem": Should contain the data base address
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.
+- flash device tree subnode, there must be a node with the following fields:
+	- compatible: Should contain the flash name:
+	  1. EPCS:   epcs16, epcs64, epcs128
+	  2. EPCQ:   epcq16, epcq32, epcq64, epcq128, epcq256, epcq512, epcq1024
+	  3. EPCQ-L: epcql256, epcql512, epcql1024
+	- #address-cells: please refer to /mtd/partition.txt
+	- #size-cells: please refer to /mtd/partition.txt
+	For partitions inside each flash, please refer to /mtd/partition.txt
+
+Example:
+
+	quadspi_controller_0: quadspi at 0x180014a0 {
+		compatible = "altr,quadspi-1.0";
+		reg = <0x180014a0 0x00000020>,
+		      <0x14000000 0x04000000>;
+		reg-names = "avl_csr", "avl_mem";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		flash0: epcq512 at 0 {
+			compatible = "altr,epcq512";
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+	};
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 57e4b86..c58841e 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -19,6 +19,15 @@ config CFI_FLASH
 	  option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
 	  for more information on CFI.
 
+config ALTERA_QSPI
+	bool "Altera Generic Quad SPI Controller"
+	depends on MTD
+	help
+	  This enables access to Altera EPCQ/EPCS flash chips using the
+	  Altera Generic Quad SPI Controller. The controller converts SPI
+	  NOR flash to parallel flash interface. Please find details on the
+	  "Embedded Peripherals IP User Guide" of Altera.
+
 endmenu
 
 source "drivers/mtd/nand/Kconfig"
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index c23c0c1..7f018a4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -11,6 +11,7 @@ endif
 obj-$(CONFIG_MTD) += mtd-uclass.o
 obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
 obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
+obj-$(CONFIG_ALTERA_QSPI) += altera_qspi.o
 obj-$(CONFIG_HAS_DATAFLASH) += at45.o
 obj-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
 obj-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
new file mode 100644
index 0000000..1826dc8
--- /dev/null
+++ b/drivers/mtd/altera_qspi.c
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <fdt_support.h>
+#include <flash.h>
+#include <mtd.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * The QUADSPI_MEM_OP register is used to do memory protect and erase operations
+ */
+#define QUADSPI_MEM_OP_BULK_ERASE		0x00000001
+#define QUADSPI_MEM_OP_SECTOR_ERASE		0x00000002
+#define QUADSPI_MEM_OP_SECTOR_PROTECT		0x00000003
+
+/*
+ * The QUADSPI_ISR register is used to determine whether an invalid write or
+ * erase operation trigerred an interrupt
+ */
+#define QUADSPI_ISR_ILLEGAL_ERASE		BIT(0)
+#define QUADSPI_ISR_ILLEGAL_WRITE		BIT(1)
+
+struct altera_qspi_regs {
+	u32	rd_status;
+	u32	rd_sid;
+	u32	rd_rdid;
+	u32	mem_op;
+	u32	isr;
+	u32	imr;
+	u32	chip_select;
+};
+
+struct altera_qspi_platdata {
+	struct altera_qspi_regs *regs;
+	void *base;
+	unsigned long size;
+};
+
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* FLASH chips info */
+
+void flash_print_info(flash_info_t *info)
+{
+	printf("Altera QSPI flash  Size: %ld MB in %d Sectors\n",
+	       info->size >> 20, info->sector_count);
+}
+
+int flash_erase(flash_info_t *info, int s_first, int s_last)
+{
+	struct mtd_info *mtd = info->mtd;
+	struct erase_info instr;
+	int ret;
+
+	memset(&instr, 0, sizeof(instr));
+	instr.addr = mtd->erasesize * s_first;
+	instr.len = mtd->erasesize * (s_last + 1 - s_first);
+	ret = mtd_erase(mtd, &instr);
+	if (ret)
+		return ERR_NOT_ERASED;
+
+	return 0;
+}
+
+int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
+{
+	struct mtd_info *mtd = info->mtd;
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	ulong base = (ulong)pdata->base;
+	loff_t to = addr - base;
+	size_t retlen;
+	int ret;
+
+	ret = mtd_write(mtd, to, cnt, &retlen, src);
+	if (ret)
+		return ERR_NOT_ERASED;
+
+	return 0;
+}
+
+unsigned long flash_init(void)
+{
+	struct udevice *dev;
+
+	/* probe every MTD device */
+	for (uclass_first_device(UCLASS_MTD, &dev);
+	     dev;
+	     uclass_next_device(&dev)) {
+	}
+
+	return flash_info[0].size;
+}
+
+static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	size_t addr = instr->addr;
+	size_t len = instr->len;
+	size_t end = addr + len;
+	u32 sect;
+	u32 stat;
+
+	instr->state = MTD_ERASING;
+	addr &= ~(mtd->erasesize - 1); /* get lower aligned address */
+	while (addr < end) {
+		sect = addr / mtd->erasesize;
+		sect <<= 8;
+		sect |= QUADSPI_MEM_OP_SECTOR_ERASE;
+		debug("erase %08x\n", sect);
+		writel(sect, &regs->mem_op);
+		stat = readl(&regs->isr);
+		if (stat & QUADSPI_ISR_ILLEGAL_ERASE) {
+			/* erase failed, sector might be protected */
+			debug("erase %08x fail %x\n", sect, stat);
+			writel(stat, &regs->isr); /* clear isr */
+			instr->state = MTD_ERASE_FAILED;
+			return -EIO;
+		}
+		addr += mtd->erasesize;
+	}
+	instr->state = MTD_ERASE_DONE;
+	mtd_erase_callback(instr);
+
+	return 0;
+}
+
+static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len,
+			    size_t *retlen, u_char *buf)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+
+	memcpy_fromio(buf, pdata->base + from, len);
+	*retlen = len;
+
+	return 0;
+}
+
+static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len,
+			     size_t *retlen, const u_char *buf)
+{
+	struct udevice *dev = mtd->dev;
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	u32 stat;
+
+	memcpy_toio(pdata->base + to, buf, len);
+	/* check whether write triggered a illegal write interrupt */
+	stat = readl(&regs->isr);
+	if (stat & QUADSPI_ISR_ILLEGAL_WRITE) {
+		/* write failed, sector might be protected */
+		debug("write fail %x\n", stat);
+		writel(stat, &regs->isr); /* clear isr */
+		return -EIO;
+	}
+	*retlen = len;
+
+	return 0;
+}
+
+static void altera_qspi_sync(struct mtd_info *mtd)
+{
+}
+
+static int altera_qspi_probe(struct udevice *dev)
+{
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	struct altera_qspi_regs *regs = pdata->regs;
+	unsigned long base = (unsigned long)pdata->base;
+	struct mtd_info *mtd;
+	flash_info_t *flash = &flash_info[0];
+	u32 rdid;
+	int i;
+
+	rdid = readl(&regs->rd_rdid);
+	debug("rdid %x\n", rdid);
+
+	mtd = dev_get_uclass_priv(dev);
+	mtd->dev = dev;
+	mtd->name		= "nor0";
+	mtd->type		= MTD_NORFLASH;
+	mtd->flags		= MTD_CAP_NORFLASH;
+	mtd->size		= 1 << ((rdid & 0xff) - 6);
+	mtd->writesize		= 1;
+	mtd->writebufsize	= mtd->writesize;
+	mtd->_erase		= altera_qspi_erase;
+	mtd->_read		= altera_qspi_read;
+	mtd->_write		= altera_qspi_write;
+	mtd->_sync		= altera_qspi_sync;
+	mtd->numeraseregions = 0;
+	mtd->erasesize = 0x10000;
+	if (add_mtd_device(mtd))
+		return -ENOMEM;
+
+	flash->mtd = mtd;
+	flash->size = mtd->size;
+	flash->sector_count = mtd->size / mtd->erasesize;
+	flash->flash_id = rdid;
+	flash->start[0] = base;
+	for (i = 1; i < flash->sector_count; i++)
+		flash->start[i] = flash->start[i - 1] + mtd->erasesize;
+	gd->bd->bi_flashstart = base;
+
+	return 0;
+}
+
+static int altera_qspi_ofdata_to_platdata(struct udevice *dev)
+{
+	struct altera_qspi_platdata *pdata = dev_get_platdata(dev);
+	void *blob = (void *)gd->fdt_blob;
+	int node = dev->of_offset;
+	const char *list, *end;
+	const fdt32_t *cell;
+	void *base;
+	unsigned long addr, size;
+	int parent, addrc, sizec;
+	int len, idx;
+
+	/*
+	 * decode regs. there are multiple reg tuples, and they need to
+	 * match with reg-names.
+	 */
+	parent = fdt_parent_offset(blob, node);
+	of_bus_default_count_cells(blob, parent, &addrc, &sizec);
+	list = fdt_getprop(blob, node, "reg-names", &len);
+	if (!list)
+		return -ENOENT;
+	end = list + len;
+	cell = fdt_getprop(blob, node, "reg", &len);
+	if (!cell)
+		return -ENOENT;
+	idx = 0;
+	while (list < end) {
+		addr = fdt_translate_address((void *)blob,
+					     node, cell + idx);
+		size = fdt_addr_to_cpu(cell[idx + addrc]);
+		base = ioremap(addr, size);
+		len = strlen(list);
+		if (strcmp(list, "avl_csr") == 0) {
+			pdata->regs = base;
+		} else if (strcmp(list, "avl_mem") == 0) {
+			pdata->base = base;
+			pdata->size = size;
+		}
+		idx += addrc + sizec;
+		list += (len + 1);
+	}
+
+	return 0;
+}
+
+static const struct udevice_id altera_qspi_ids[] = {
+	{ .compatible = "altr,quadspi-1.0" },
+	{}
+};
+
+U_BOOT_DRIVER(altera_qspi) = {
+	.name	= "altera_qspi",
+	.id	= UCLASS_MTD,
+	.of_match = altera_qspi_ids,
+	.ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata),
+	.probe	= altera_qspi_probe,
+};
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2015-11-07  8:07 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-03 13:22 [U-Boot] [PATCH] mtd: add altera quadspi driver Thomas Chou
2015-11-03 17:44 ` Marek Vasut
2015-11-03 17:49   ` Jagan Teki
2015-11-03 17:52     ` Marek Vasut
2015-11-03 17:56       ` Jagan Teki
2015-11-03 18:11         ` Marek Vasut
2015-11-04  2:36   ` Thomas Chou
2015-11-04  3:45     ` Marek Vasut
2015-11-04  4:45       ` Thomas Chou
2015-11-04  5:15         ` Marek Vasut
2015-11-04  5:33           ` Thomas Chou
2015-11-04 14:02             ` Marek Vasut
2015-11-04 15:56 ` Chin Liang See
2015-11-04 16:18   ` Marek Vasut
2015-11-05  2:49     ` Chin Liang See
2015-11-05  2:53       ` Marek Vasut
2015-11-05  3:05         ` Chin Liang See
2015-11-05  4:26           ` Thomas Chou
2015-11-05  4:36             ` Marek Vasut
2015-11-05  8:47 ` [U-Boot] [PATCH v2 1/2] nios2: add memcpy_fromio and memcpy_toio Thomas Chou
2015-11-05  8:47   ` [U-Boot] [PATCH v2 2/2] mtd: add altera quadspi driver Thomas Chou
2015-11-05 14:25     ` Jagan Teki
2015-11-05 14:45       ` Thomas Chou
2015-11-05 14:57         ` Jagan Teki
2015-11-05 15:51           ` Marek Vasut
2015-11-06  8:11             ` Jagan Teki
2015-11-06 13:45               ` Marek Vasut
2015-11-06  0:18           ` Thomas Chou
2015-11-06  8:07             ` Jagan Teki
2015-11-06  9:28               ` Thomas Chou
2015-11-06  9:52                 ` Jagan Teki
2015-11-06 11:48                   ` Jagan Teki
2015-11-06 13:32                     ` Thomas Chou
2015-11-07  8:07 ` [U-Boot] [PATCH v3] " Thomas Chou

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.