@@ -1382,6 +1382,7 @@ config CMD_NAND
NAND support.
if CMD_NAND
+
config CMD_NAND_TRIMFFS
bool "nand write.trimffs"
default y if ARCH_SUNXI
@@ -1398,6 +1399,15 @@ config CMD_NAND_TORTURE
help
NAND torture support.
+config CMD_NAND_ONFI
+ bool "nand onfi"
+ help
+ Set ONFI timing modes explicitly.
+ This is a debugging command to switch to slower ONFI timing
+ modes for testing.
+ In normal operation determining the timing mode automatically
+ should work fine, and you don't need this.
+
endif # CMD_NAND
config CMD_NVME
@@ -494,6 +494,48 @@ static void adjust_size_for_badblocks(loff_t *size, loff_t offset, int dev)
}
}
+#ifdef CONFIG_CMD_NAND_ONFI
+static int do_nand_onfi(struct mtd_info *mtd, int mode)
+{
+ struct nand_chip *chip;
+ int ret;
+ int i;
+
+ if (mtd->type != MTD_NANDFLASH) {
+ printf("MTD device is no NAND flash!\n");
+ return CMD_RET_FAILURE;
+ }
+
+ chip = mtd_to_nand(mtd);
+
+ if (mode < 0) {
+ printf("Reporting current ONFI settings not yet supported!\n");
+ return CMD_RET_FAILURE;
+ }
+
+ ret = onfi_init_data_interface(chip, chip->data_interface,
+ NAND_SDR_IFACE, mode);
+ if (ret) {
+ printf("onfi_init_data_interface() for mode %d failed with error %d\n",
+ mode, ret);
+ return CMD_RET_FAILURE;
+ }
+
+ for (i = 0; i < chip->numchips; i++) {
+ chip->select_chip(mtd, i);
+ ret = nand_setup_data_interface(chip, i);
+ chip->select_chip(mtd, -1);
+ if (ret) {
+ printf("nand_setup_data_interface() for mode %d failed with error %d\n",
+ mode, ret);
+ return CMD_RET_FAILURE;
+ }
+ }
+
+ return CMD_RET_SUCCESS;
+}
+#endif
+
static int do_nand(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
@@ -919,6 +961,21 @@ static int do_nand(struct cmd_tbl *cmdtp, int flag, int argc,
}
#endif
+#ifdef CONFIG_CMD_NAND_ONFI
+ /*
+ * Syntax is:
+ * 0 1 2
+ * nand onfi [mode]
+ */
+ if (strcmp(cmd, "onfi") == 0) {
+ int mode = -1;
+
+ if (argc > 2)
+ mode = dectoul(argv[2], NULL);
+ return do_nand_onfi(mtd, mode);
+ }
+#endif
+
usage:
return CMD_RET_USAGE;
}
@@ -961,6 +1018,10 @@ U_BOOT_LONGHELP(nand,
" bring nand to lock state or display locked pages\n"
"nand unlock[.allexcept] [offset] [size] - unlock section"
#endif
+#ifdef CONFIG_CMD_NAND_ONFI
+ "\n"
+ "nand onfi [mode] - set ONFI mode\n"
+#endif
#ifdef CONFIG_ENV_OFFSET_OOB
"\n"
"nand env.oob - environment offset in OOB of block 0 of"
@@ -983,7 +983,7 @@ static int nand_onfi_set_timings(struct mtd_info *mtd, struct nand_chip *chip)
*
* Returns 0 for success or negative error code otherwise.
*/
-static int nand_setup_data_interface(struct nand_chip *chip, int chipnr)
+int nand_setup_data_interface(struct nand_chip *chip, int chipnr)
{
struct mtd_info *mtd = nand_to_mtd(chip);
int ret;
@@ -1315,6 +1315,7 @@ void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
uint8_t nand_read_byte(struct mtd_info *mtd);
+int nand_setup_data_interface(struct nand_chip *chip, int chipnr);
/* get timing characteristics from ONFI timing mode. */
const struct nand_sdr_timings *onfi_async_timing_mode_to_sdr_timings(int mode);
Override the ONFI timing mode at runtime. Signed-off-by: Alexander Dahl <ada@thorsis.com> --- Notes: v3: - no changes to this patch v2: - initial patch version (not present in v1) cmd/Kconfig | 10 ++++++ cmd/nand.c | 61 ++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/nand_base.c | 2 +- include/linux/mtd/rawnand.h | 1 + 4 files changed, 73 insertions(+), 1 deletion(-)