Skip to content

Commit

Permalink
WIP: Start switching SPL NAND to use nand_base for nand_command
Browse files Browse the repository at this point in the history 
Needed for dynamically getting CONFIG_SYS_ADDR_[45]_CYCLE correct

Signed-off-by: Tom Rini <trini@ti.com>
  • Loading branch information
@trini
trini committed Oct 24, 2011
1 parent 80003d9 commit c4f170a
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 111 deletions.
2 changes: 1 addition & 1 deletion drivers/mtd/nand/Makefile
View file
Expand Up @@ -33,9 +33,9 @@ endif
else
COBJS-y += nand.o
COBJS-y += nand_bbt.o
COBJS-y += nand_ids.o
COBJS-y += nand_util.o
endif
COBJS-y += nand_ids.o
COBJS-y += nand_ecc.o
COBJS-y += nand_base.o

Expand Down
55 changes: 45 additions & 10 deletions drivers/mtd/nand/nand_base.c
View file
Expand Up @@ -113,8 +113,6 @@ static int nand_get_device(struct nand_chip *chip, struct mtd_info *mtd,
static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops);

static int nand_wait(struct mtd_info *mtd, struct nand_chip *this);

/**
* nand_release_device - [GENERIC] release chip
* @mtd: MTD device structure
Expand Down Expand Up @@ -152,6 +150,7 @@ static uint8_t nand_read_byte16(struct mtd_info *mtd)
return (uint8_t) cpu_to_le16(readw(chip->IO_ADDR_R));
}

#ifndef CONFIG_SPL_BUILD
/**
* nand_read_word - [DEFAULT] read one word from the chip
* @mtd: MTD device structure
Expand All @@ -164,7 +163,9 @@ static u16 nand_read_word(struct mtd_info *mtd)
struct nand_chip *chip = mtd->priv;
return readw(chip->IO_ADDR_R);
}
#endif

#ifndef CONFIG_SPL_BUILD
/**
* nand_select_chip - [DEFAULT] control CE line
* @mtd: MTD device structure
Expand All @@ -187,7 +188,16 @@ static void nand_select_chip(struct mtd_info *mtd, int chipnr)
BUG();
}
}
#else
static void nand_select_chip(struct mtd_info *mtd, int chipnr)
{
struct nand_chip *chip = mtd->priv;

chip->cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
}
#endif

#ifndef CONFIG_SPL_BUILD
/**
* nand_write_buf - [DEFAULT] write buffer to chip
* @mtd: MTD device structure
Expand All @@ -204,6 +214,7 @@ static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
for (i = 0; i < len; i++)
writeb(buf[i], chip->IO_ADDR_W);
}
#endif

/**
* nand_read_buf - [DEFAULT] read chip data into buffer
Expand All @@ -222,6 +233,7 @@ void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
buf[i] = readb(chip->IO_ADDR_R);
}

#ifndef CONFIG_SPL_BUILD
/**
* nand_verify_buf - [DEFAULT] Verify chip data against buffer
* @mtd: MTD device structure
Expand Down Expand Up @@ -260,6 +272,7 @@ static void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
writew(p[i], chip->IO_ADDR_W);

}
#endif

/**
* nand_read_buf16 - [DEFAULT] read chip data into buffer
Expand All @@ -280,6 +293,7 @@ void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len)
p[i] = readw(chip->IO_ADDR_R);
}

#ifndef CONFIG_SPL_BUILD
/**
* nand_verify_buf16 - [DEFAULT] Verify chip data against buffer
* @mtd: MTD device structure
Expand Down Expand Up @@ -388,6 +402,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)

return ret;
}
#endif

/**
* nand_check_wp - [GENERIC] check if the chip is write protected
Expand Down Expand Up @@ -461,7 +476,7 @@ void nand_wait_ready(struct mtd_info *mtd)
* Send command to NAND device. This function is used for small page
* devices (256/512 Bytes per page)
*/
static void nand_command(struct mtd_info *mtd, unsigned int command,
void nand_command(struct mtd_info *mtd, unsigned int command,
int column, int page_addr)
{
register struct nand_chip *chip = mtd->priv;
Expand Down Expand Up @@ -566,7 +581,7 @@ static void nand_command(struct mtd_info *mtd, unsigned int command,
* devices We dont have the separate regions as we have in the small page
* devices. We must emulate NAND_CMD_READOOB to keep the code compatible.
*/
static void nand_command_lp(struct mtd_info *mtd, unsigned int command,
void nand_command_lp(struct mtd_info *mtd, unsigned int command,
int column, int page_addr)
{
register struct nand_chip *chip = mtd->priv;
Expand Down Expand Up @@ -692,6 +707,7 @@ static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int ne
return 0;
}

#ifndef CONFIG_SPL_BUILD
/**
* nand_wait - [DEFAULT] wait until the command is done
* @mtd: MTD device structure
Expand Down Expand Up @@ -741,6 +757,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this)

return this->read_byte(mtd);
}
#endif

/**
* nand_read_page_raw - [Intern] read raw page data without ecc
Expand Down Expand Up @@ -2094,6 +2111,7 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t to,
return ret;
}

#ifndef CONFIG_SPL_BUILD
/**
* single_erease_cmd - [GENERIC] NAND standard block erase command function
* @mtd: MTD device structure
Expand Down Expand Up @@ -2127,6 +2145,7 @@ static void multi_erase_cmd(struct mtd_info *mtd, int page)
chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
}
#endif

/**
* nand_erase - [MTD Interface] erase block(s)
Expand Down Expand Up @@ -2385,6 +2404,13 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)
if (!chip->chip_delay)
chip->chip_delay = 20;

if (!chip->select_chip)
chip->select_chip = nand_select_chip;

if (!chip->read_byte)
chip->read_byte = busw ? nand_read_byte16 : nand_read_byte;

#ifndef CONFIG_SPL_BUILD
/* check, if a user supplied command function given */
if (chip->cmdfunc == NULL)
chip->cmdfunc = nand_command;
Expand All @@ -2393,10 +2419,6 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)
if (chip->waitfunc == NULL)
chip->waitfunc = nand_wait;

if (!chip->select_chip)
chip->select_chip = nand_select_chip;
if (!chip->read_byte)
chip->read_byte = busw ? nand_read_byte16 : nand_read_byte;
if (!chip->read_word)
chip->read_word = nand_read_word;
if (!chip->block_bad)
Expand All @@ -2413,6 +2435,7 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)
chip->scan_bbt = nand_default_bbt;
if (!chip->controller)
chip->controller = &chip->hwcontrol;
#endif
}

#ifdef CONFIG_SYS_NAND_ONFI_DETECTION
Expand Down Expand Up @@ -2627,6 +2650,11 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
break;
}

/*
* SPL does not require this information or provides it in
* static form.
*/
#ifndef CONFIG_SPL_BUILD
/*
* Check, if buswidth is correct. Hardware drivers should set
* chip correct !
Expand Down Expand Up @@ -2672,6 +2700,7 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
/* Do not replace user supplied command function ! */
if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
chip->cmdfunc = nand_command_lp;
#endif

MTDDEBUG (MTD_DEBUG_LEVEL0, "NAND device: Manufacturer ID:"
" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id,
Expand All @@ -2694,7 +2723,7 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
int nand_scan_ident(struct mtd_info *mtd, int maxchips,
const struct nand_flash_dev *table)
{
int i, busw, nand_maf_id, nand_dev_id;
int i = 1, busw, nand_maf_id, nand_dev_id;
struct nand_chip *chip = mtd->priv;
const struct nand_flash_dev *type;

Expand All @@ -2706,16 +2735,21 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
/* Read the flash type */
type = nand_get_flash_type(mtd, chip, busw, &nand_maf_id, &nand_dev_id, table);

/* A valid flash must have been found already for SPL to be running */
#ifndef CONFIG_SPL
if (IS_ERR(type)) {
#ifndef CONFIG_SYS_NAND_QUIET_TEST
printk(KERN_WARNING "No NAND device found!!!\n");
#endif
chip->select_chip(mtd, -1);
return PTR_ERR(type);
}
#endif

/* SPL only supports 1 chip, maximum. */
#ifndef CONFIG_SPL_BUILD
/* Check for a chip array */
for (i = 1; i < maxchips; i++) {
for (; i < maxchips; i++) {
chip->select_chip(mtd, i);
/* See comment in nand_get_flash_type for reset */
chip->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
Expand All @@ -2729,6 +2763,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
#ifdef DEBUG
if (i > 1)
printk(KERN_INFO "%d NAND chips detected\n", i);
#endif
#endif

/* Store the number of chips and calc total size for mtd */
Expand Down
117 changes: 17 additions & 100 deletions drivers/mtd/nand/nand_spl_simple.c
View file
Expand Up @@ -19,112 +19,20 @@
*/

#include <common.h>
#include <linux/mtd/mtd.h>
#include <nand.h>
#include <asm/io.h>

static int nand_ecc_pos[] = CONFIG_SYS_NAND_ECCPOS;
static nand_info_t mtd;
static struct nand_chip nand_chip;

#if (CONFIG_SYS_NAND_PAGE_SIZE <= 512)
/*
* NAND command for small page NAND devices (512)
*/
static int nand_command(int block, int page, uint32_t offs,
u8 cmd)
{
struct nand_chip *this = mtd.priv;
int page_addr = page + block * CONFIG_SYS_NAND_PAGE_COUNT;

while (!this->dev_ready(&mtd))
;

/* Begin command latch cycle */
this->cmd_ctrl(&mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);
/* Set ALE and clear CLE to start address cycle */
/* Column address */
this->cmd_ctrl(&mtd, offs, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
this->cmd_ctrl(&mtd, page_addr & 0xff, NAND_CTRL_ALE); /* A[16:9] */
this->cmd_ctrl(&mtd, (page_addr >> 8) & 0xff,
NAND_CTRL_ALE); /* A[24:17] */
#ifdef CONFIG_SYS_NAND_4_ADDR_CYCLE
/* One more address cycle for devices > 32MiB */
this->cmd_ctrl(&mtd, (page_addr >> 16) & 0x0f,
NAND_CTRL_ALE); /* A[28:25] */
#endif
/* Latch in address */
this->cmd_ctrl(&mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);

/*
* Wait a while for the data to be ready
*/
while (!this->dev_ready(&mtd))
;

return 0;
}
#else
/*
* NAND command for large page NAND devices (2k)
*/
static int nand_command(int block, int page, uint32_t offs,
u8 cmd)
{
struct nand_chip *this = mtd.priv;
int page_addr = page + block * CONFIG_SYS_NAND_PAGE_COUNT;
void (*hwctrl)(struct mtd_info *mtd, int cmd,
unsigned int ctrl) = this->cmd_ctrl;

while (!this->dev_ready(&mtd))
;

/* Emulate NAND_CMD_READOOB */
if (cmd == NAND_CMD_READOOB) {
offs += CONFIG_SYS_NAND_PAGE_SIZE;
cmd = NAND_CMD_READ0;
}

/* Shift the offset from byte addressing to word addressing. */
if (this->options & NAND_BUSWIDTH_16)
offs >>= 1;

/* Begin command latch cycle */
hwctrl(&mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);
/* Set ALE and clear CLE to start address cycle */
/* Column address */
hwctrl(&mtd, offs & 0xff,
NAND_CTRL_ALE | NAND_CTRL_CHANGE); /* A[7:0] */
hwctrl(&mtd, (offs >> 8) & 0xff, NAND_CTRL_ALE); /* A[11:9] */
/* Row address */
hwctrl(&mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */
hwctrl(&mtd, ((page_addr >> 8) & 0xff),
NAND_CTRL_ALE); /* A[27:20] */
#ifdef CONFIG_SYS_NAND_5_ADDR_CYCLE
/* One more address cycle for devices > 128MiB */
hwctrl(&mtd, (page_addr >> 16) & 0x0f,
NAND_CTRL_ALE); /* A[31:28] */
#endif
/* Latch in address */
hwctrl(&mtd, NAND_CMD_READSTART,
NAND_CTRL_CLE | NAND_CTRL_CHANGE);
hwctrl(&mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);

/*
* Wait a while for the data to be ready
*/
while (!this->dev_ready(&mtd))
;

return 0;
}
#endif

static int nand_is_bad_block(int block)
{
struct nand_chip *this = mtd.priv;

nand_command(block, 0, CONFIG_SYS_NAND_BAD_BLOCK_POS,
NAND_CMD_READOOB);
this->cmdfunc(&mtd, NAND_CMD_READOOB, CONFIG_SYS_NAND_BAD_BLOCK_POS,
block * CONFIG_SYS_NAND_PAGE_COUNT);

/*
* Read one byte (or two if it's a 16 bit chip).
Expand Down Expand Up @@ -153,7 +61,8 @@ static int nand_read_page(int block, int page, void *dst)
uint8_t *p = dst;
int stat;

nand_command(block, page, 0, NAND_CMD_READ0);
this->cmdfunc(&mtd, NAND_CMD_READ0, 0,
page + block * CONFIG_SYS_NAND_PAGE_COUNT);

/* No malloc available for now, just use some temporary locations
* in SDRAM
Expand Down Expand Up @@ -230,11 +139,19 @@ void nand_init(void)
mtd.priv = &nand_chip;
nand_chip.IO_ADDR_R = nand_chip.IO_ADDR_W =
(void __iomem *)CONFIG_SYS_NAND_BASE;
nand_chip.options = 0;
board_nand_init(&nand_chip);

if (nand_chip.select_chip)
nand_chip.select_chip(&mtd, 0);
#if (CONFIG_SYS_NAND_PAGE_SIZE <= 512)
nand_chip.cmdfunc = nand_command;
#else
nand_chip.cmdfunc = nand_command_lp;
#endif

/* We only need a small part of the init sequence done. */
if (board_nand_init(&nand_chip) == 0)
nand_scan_ident(&mtd, 1, NULL);

/* Make sure that we've selected chip 0 */
nand_chip.select_chip(&mtd, 0);
}

/* Unselect after operation */
Expand Down
4 changes: 4 additions & 0 deletions include/nand.h
View file
Expand Up @@ -137,6 +137,10 @@ void nand_deselect(void);

void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
void nand_command(struct mtd_info *mtd, unsigned int command,
int column, int page_addr);
void nand_command_lp(struct mtd_info *mtd, unsigned int command,
int column, int page_addr);

#ifdef CONFIG_SYS_NAND_SELECT_DEVICE
void board_nand_select_device(struct nand_chip *nand, int chip);
Expand Down

0 comments on commit c4f170a

Please sign in to comment.