X1000: simplify NAND driver

- Removed unnecessary layers of generic code
- Software ECC is gone since we don't need it now (and maybe not ever)
- Removed bounce buffering, so callers must now align buffers

Change-Id: I33fbac9d9d12a4657980b8618c7d62bfa91e2ea0

3 files changed, 24 insertions, 99 deletions

diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/installer-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/installer-fiiom3k.c
index cdd7276bee..154785ee0b 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/installer-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/installer-fiiom3k.c
@@ -21,6 +21,7 @@
 
 #include "installer.h"
 #include "nand-x1000.h"
+#include "system.h"
 #include "core_alloc.h"
 #include "file.h"
 
@@ -40,22 +41,27 @@
 
 static int install_from_buffer(const void* buf)
 {
+    int status = INSTALL_SUCCESS;
+    int mf_id, dev_id;
+
     if(nand_open())
         return ERR_FLASH_OPEN_FAILED;
-
-    int status = INSTALL_SUCCESS;
+    if(nand_identify(&mf_id, &dev_id)) {
+        status = ERR_FLASH_OPEN_FAILED;
+        goto _exit;
+    }
 
     if(nand_enable_writes(true)) {
         status = ERR_FLASH_DISABLE_WP_FAILED;
         goto _exit;
     }
 
-    if(nand_erase_bytes(0, BOOT_IMAGE_SIZE)) {
+    if(nand_erase(0, BOOT_IMAGE_SIZE)) {
         status = ERR_FLASH_ERASE_FAILED;
         goto _exit;
     }
 
-    if(nand_write_bytes(0, BOOT_IMAGE_SIZE, buf)) {
+    if(nand_write(0, BOOT_IMAGE_SIZE, (const uint8_t*)buf)) {
         status = ERR_FLASH_WRITE_FAILED;
         goto _exit;
     }
@@ -72,12 +78,17 @@ static int install_from_buffer(const void* buf)
 
 static int dump_to_buffer(void* buf)
 {
+    int status = INSTALL_SUCCESS;
+    int mf_id, dev_id;
+
     if(nand_open())
         return ERR_FLASH_OPEN_FAILED;
+    if(nand_identify(&mf_id, &dev_id)) {
+        status = ERR_FLASH_OPEN_FAILED;
+        goto _exit;
+    }
 
-    int status = INSTALL_SUCCESS;
-
-    if(nand_read_bytes(0, BOOT_IMAGE_SIZE, buf)) {
+    if(nand_read(0, BOOT_IMAGE_SIZE, (uint8_t*)buf)) {
         status = ERR_FLASH_READ_FAILED;
         goto _exit;
     }
@@ -90,12 +101,14 @@ static int dump_to_buffer(void* buf)
 int install_bootloader(const char* path)
 {
     /* Allocate memory to hold image */
-    int handle = core_alloc("boot_image", BOOT_IMAGE_SIZE);
+    size_t bufsize = BOOT_IMAGE_SIZE + CACHEALIGN_SIZE - 1;
+    int handle = core_alloc("boot_image", bufsize);
     if(handle < 0)
         return ERR_OUT_OF_MEMORY;
 
     int status = INSTALL_SUCCESS;
     void* buffer = core_get_data(handle);
+    CACHEALIGN_BUFFER(buffer, bufsize);
 
     /* Open the boot image */
     int fd = open(path, O_RDONLY);
@@ -132,13 +145,15 @@ int install_bootloader(const char* path)
 int dump_bootloader(const char* path)
 {
     /* Allocate memory to hold image */
-    int handle = core_alloc("boot_image", BOOT_IMAGE_SIZE);
+    size_t bufsize = BOOT_IMAGE_SIZE + CACHEALIGN_SIZE - 1;
+    int handle = core_alloc("boot_image", bufsize);
     if(handle < 0)
         return -1;
 
     /* Read data from flash */
     int fd = -1;
     void* buffer = core_get_data(handle);
+    CACHEALIGN_BUFFER(buffer, bufsize);
     int status = dump_to_buffer(buffer);
     if(status)
         goto _exit;
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/nand-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/nand-fiiom3k.c
deleted file mode 100644
index 7c8a306bae..0000000000
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/nand-fiiom3k.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2021 Aidan MacDonald
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#include "nand-x1000.h"
-#include "nand-target.h"
-#include "sfc-x1000.h"
-
-/* Unbelievably FiiO has completely disabled the use of ECC for this chip
- * in their Linux kernel, even though it has perfectly good spare areas.
- * There's no internal ECC either.
- *
- * Using nanddump to read the spare areas reveals they're filled with 0xff,
- * and the publicly released Linux source has the ecc_strength set to 0.
- */
-static const nand_chip_data ato25d1ga = {
-    .name = "ATO25D1GA",
-    .mf_id = 0x9b,
-    .dev_id = 0x12,
-    .dev_conf = NAND_INIT_SFC_DEV_CONF,
-    /* XXX: datasheet says 104 MHz but FiiO seems to run this at 150 MHz.
-     * Didn't find any issues doing this so might as well keep the behavior.
-     */
-    .clock_freq = NAND_INIT_CLOCK_SPEED,
-    .block_size = 64,
-    .page_size = 2048,
-    .spare_size = 64,
-    .rowaddr_width = 3,
-    .coladdr_width = 2,
-    .flags = NANDCHIP_FLAG_QUAD,
-};
-
-const nand_chip_desc target_nand_chip_descs[] = {
-    {&ato25d1ga, &nand_chip_ops_std},
-    {NULL, NULL},
-};
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/nand-target.h b/firmware/target/mips/ingenic_x1000/fiiom3k/nand-target.h
deleted file mode 100644
index 1238d7e452..0000000000
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/nand-target.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2021 Aidan MacDonald
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __NAND_TARGET_H__
-#define __NAND_TARGET_H__
-
-/* The max page size (main + spare) of all NAND chips used by this target */
-#define NAND_MAX_PAGE_SIZE (2048 + 64)
-
-/* The clock speed to use for the SFC controller during chip identification */
-#define NAND_INIT_CLOCK_SPEED 150000000
-
-/* Initial value to program SFC_DEV_CONF register with */
-#define NAND_INIT_SFC_DEV_CONF \
-    jz_orf(SFC_DEV_CONF, CE_DL(1), HOLD_DL(1), WP_DL(1), \
-           CPHA(0), CPOL(0), TSH(7), TSETUP(0), THOLD(0), \
-           STA_TYPE_V(1BYTE), CMD_TYPE_V(8BITS), SMP_DELAY(1))
-
-#endif /* __NAND_TARGET_H__ */