AT91SAM9XE add embedded flash support

Add support for the embedded flash in the AT91SAM9XE128/256/512 SoCs:
- Environment can be put into that flash
- U-Boot can be in that flash
- Commands "cp" and "protect" are supported

---
 arch/arm/cpu/arm926ejs/at91/Makefile       |    1 +
 arch/arm/cpu/arm926ejs/at91/eflash.c       |  277
++++++++++++++++++++++++++++
 arch/arm/include/asm/arch-at91/at91_dbu.h  |   41 ++++
 arch/arm/include/asm/arch-at91/at91_eefc.h |   51 +++++
 4 files changed, 370 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/at91/eflash.c
 create mode 100644 arch/arm/include/asm/arch-at91/at91_dbu.h
 create mode 100644 arch/arm/include/asm/arch-at91/at91_eefc.h

b/arch/arm/cpu/arm926ejs/at91/Makefile
index 4f467be..def3980 100644

@@ -34,6 +34,7 @@ COBJS-$(CONFIG_AT91SAM9263)    += at91sam9263_devices.o
 COBJS-$(CONFIG_AT91SAM9RL)    += at91sam9rl_devices.o
 COBJS-$(CONFIG_AT91SAM9M10G45)    += at91sam9m10g45_devices.o
 COBJS-$(CONFIG_AT91SAM9G45)    += at91sam9m10g45_devices.o
+COBJS-$(CONFIG_AT91_EFLASH)    += eflash.o
 COBJS-$(CONFIG_AT91_LED)    += led.o
 COBJS-y += clock.o
 COBJS-y += cpu.o

b/arch/arm/cpu/arm926ejs/at91/eflash.c
new file mode 100644
index 0000000..83dce7d

AT91_DBU_CID_ARCH_9XExx) {
+#ifdef DEBUG_FLASH
+ puts("eflash: not an AT91SAM9XE\n");
+#endif
+ return 0;
+ }
+

+    /* now query the eflash for its structure */
+    writel(AT91_EEFC_FCR_KEY | AT91_EEFC_FCR_FCMD_GETD, &eefc->fcr);
+    while ((readl(&eefc->fsr) & AT91_EEFC_FSR_FRDY) == 0)
+        ;
+    id = readl(&eefc->frr);        /* word 0 */
+    size = readl(&eefc->frr);    /* word 1 */
+    pagesize = readl(&eefc->frr);    /* word 2 */
+    nplanes = readl(&eefc->frr);    /* word 3 */
+    planesize = readl(&eefc->frr);    /* word 4 */
+    DEBUGF("id=%08x size=%u pagesize=%u planes=%u planesize=%u\n",
+        id, size, pagesize, nplanes, planesize);
+    for (i=1; i<nplanes; i++) {
+        tmp = readl(&eefc->frr);    /* words 5..4+nplanes-1 */
+    };
+    nlocks = readl(&eefc->frr);    /* word 4+nplanes */
+    DEBUGF("nlocks=%u\n", nlocks);
+    /* since we are going to use the lock regions as sectors, check

count */
+ if (nlocks > CONFIG_SYS_MAX_FLASH_SECT) {
+ printf("eflash: number of lock regions(%u) "\
+ "> CONFIG_SYS_MAX_FLASH_SECT. reducing...\n",
+ nlocks);
+ nlocks = CONFIG_SYS_MAX_FLASH_SECT;

+    }
+    flash_info[0].size = size;
+    flash_info[0].sector_count = nlocks;
+    flash_info[0].flash_id = id;
+
+    addr = AT91SAM9XE_FLASH_BASE;
+    for (i=0; i<nlocks; i++) {
+        tmp = readl(&eefc->frr);    /* words 4+nplanes+1.. */
+        flash_info[0].start[i] = addr;
+        flash_info[0].protect[i] = 0;
+        addr += tmp;
+    };
+
+    /* now read the protection information for all regions */
+    writel(AT91_EEFC_FCR_KEY | AT91_EEFC_FCR_FCMD_GLB, &eefc->fcr);
+    while ((readl(&eefc->fsr) & AT91_EEFC_FSR_FRDY) == 0)

+ ;
+ for (i=0; i<flash_info[0].sector_count; i++) {
+ if (i%32 == 0)
+ tmp = readl(&eefc->frr);
+ flash_info[0].protect[i] = (tmp >> (i%32)) & 1;
+#if defined(CONFIG_EFLASH_PROTSECTORS)
+ if (i < CONFIG_EFLASH_PROTSECTORS)
+ flash_info[0].protect[i] = 1;
+#endif
+ }
+
+ return size;
+}
+
+void flash_print_info (flash_info_t *info)
+{
+ int i;
+
+ puts("AT91SAM9XE embedded flash\n");
+ if (info->size >= (1 << 20)) {
+ i = 20;
+ } else {
+ i = 10;
+ }
+ printf(" Size: %ld %cB in %d Sectors\n",

+        info->size >> i,
+        (i == 20) ? 'M' : 'k',
+        info->sector_count);

+
+ printf(" Sector Start Addresses:");
+ for (i=0; i<info->sector_count; ++i) {
+ if ((i % 5) == 0)
+ printf("\n ");
+ printf(" %08lX%s",
+ info->start[i],
+ info->protect[i] ? " (RO)" : " "
+ );

+    }
+    printf ("\n");
+    return;

+}
+
+int flash_real_protect (flash_info_t *info, long sector, int prot) +{

+    at91_eefc_t *eefc = (at91_eefc_t *) 0xfffffa00;
+    u32 pagenum = (info->start[sector]-AT91SAM9XE_FLASH_BASE)/pagesize;
+    u32 i, tmp=0;

+
+ DEBUGF("protect sector=%ld prot=%d\n", sector, prot);
+
+#if defined(CONFIG_EFLASH_PROTSECTORS)
+ if (sector < CONFIG_EFLASH_PROTSECTORS) {
+ if (!prot) {
+ printf("eflash: sector %lu cannot be unprotected\n",
+ sector);
+ }
+ return 1; /* return anyway, caller does not care for result */
+ }
+#endif
+ if (prot) {
+ writel(AT91_EEFC_FCR_KEY | AT91_EEFC_FCR_FCMD_SLB |
+ (pagenum << AT91_EEFC_FCR_FARG_SHIFT), &eefc->fcr);
+ } else {
+ writel(AT91_EEFC_FCR_KEY | AT91_EEFC_FCR_FCMD_CLB |
+ (pagenum << AT91_EEFC_FCR_FARG_SHIFT), &eefc->fcr);
+ }
+ while ((readl(&eefc->fsr) & AT91_EEFC_FSR_FRDY) == 0)
+ ;

+    /* now read the protection information for all regions */
+    writel(AT91_EEFC_FCR_KEY | AT91_EEFC_FCR_FCMD_GLB, &eefc->fcr);
+    while ((readl(&eefc->fsr) & AT91_EEFC_FSR_FRDY) == 0)

+ ;
+ for (i=0; i<info->sector_count; i++) {
+ if (i%32 == 0)
+ tmp = readl(&eefc->frr);
+ info->protect[i] = (tmp >> (i%32)) & 1;
+ }
+ return 0;
+}
+
+static u32 erase_write_page (u32 pagenum)
+{
+ at91_eefc_t *eefc = (at91_eefc_t *) 0xfffffa00;
+
+ DEBUGF("erase+write page=%u\n", pagenum);
+
+ /* give erase and write page command */
+ writel(AT91_EEFC_FCR_KEY | AT91_EEFC_FCR_FCMD_EWP |
+ (pagenum << AT91_EEFC_FCR_FARG_SHIFT), &eefc->fcr);
+ while ((readl(&eefc->fsr) & AT91_EEFC_FSR_FRDY) == 0)
+ ;
+ /* return status */
+ return readl(&eefc->fsr)
+ & (AT91_EEFC_FSR_FCMDE | AT91_EEFC_FSR_FLOCKE);
+}
+
+int flash_erase (flash_info_t *info, int s_first, int s_last) +{
+ DEBUGF("erase first=%d last=%d\n", s_first, s_last);
+ return 0;
+}
+
+/*
+ * Copy memory to flash, returns:
+ * 0 - OK
+ * 1 - write timeout
+ */
+
+int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) +{

+    u32 pagenum;
+    u32 *src32, *dst32;
+    u32 i;

+
+ DEBUGF("write src=%08lx addr=%08lx cnt=%lx\n",
+ (ulong)src, addr, cnt);
+
+ /* REQUIRE addr to be on a page start, abort if not */
+ if (addr % pagesize) {
+ printf ("eflash: start %08lx is not on page start\n"\
+ " write aborted\n", addr);
+ return 1;
+ }
+

+    /* now start copying data */
+    pagenum = (addr-AT91SAM9XE_FLASH_BASE)/pagesize;
+    src32 = (u32 *) src;
+    dst32 = (u32 *) addr;
+    while (cnt > 0) {
+        i = pagesize / 4;
+        /* fill page buffer */
+        while (i--)

+ *dst32++ = *src32++;
+ /* write page */
+ if (erase_write_page(pagenum))
+ return 1;
+ pagenum++;
+ if (cnt > pagesize)
+ cnt -= pagesize;
+ else
+ cnt = 0;
+ }
+ return 0;
+}
+

b/arch/arm/include/asm/arch-at91/at91_dbu.h
new file mode 100644
index 0000000..669d933

b/arch/arm/include/asm/arch-at91/at91_eefc.h
new file mode 100644
index 0000000..9bb3ea2

1.5.6.5

Sorry, Thunderbird had me there again.
When the compose window is too narrow for the insterted Text, it will wrap text during insertion, even if wrapping is switched off generally! Disregard this patch. A new one is sent already.

Reinhard