X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fnand.c;h=82f5f697a30dbdec8294b41a4fb2feff0c239234;hb=15810459b8f5fb09b12cef6f8e4d4e64d167087b;hp=e6a10279c10d8ce57f0cdac001a0c952b74b115f;hpb=b003c670f7603be23f66b9e13cdb2369ef17a736;p=bertos.git diff --git a/bertos/drv/nand.c b/bertos/drv/nand.c index e6a10279..82f5f697 100644 --- a/bertos/drv/nand.c +++ b/bertos/drv/nand.c @@ -29,24 +29,48 @@ * Copyright 2011 Develer S.r.l. (http://www.develer.com/) * --> * -* \brief Micron MT29F serial NAND driver +* \brief ONFI 1.0 compliant NAND kblock driver * -* This module allows read/write access to Micron MT29F serial -* NANDs. +* Defective blocks are remapped in a reserved area of configurable size +* at the bottom of the NAND. +* At the moment there is no wear-leveling block translation: kblock's blocks +* are mapped directly on NAND erase blocks: when a (k)block is written the +* corresponding erase block is erased and all pages within are rewritten. +* Partial write is not possible: it's recommended to use buffered mode. +* +* The driver needs to format the NAND before use. If the initialization code +* detects a fresh memory it does a bad block scan and a formatting. +* Format info isn't stored in NAND in a global structure: each block has its +* info written in the spare area of its first page. These info contais a tag +* to detect formatted blocks and an index for bad block remapping (struct +* RemapInfo). +* +* The ECC for each page is written in the spare area too. +* +* Works only in 8 bit data mode and NAND parameters are not +* detected at run-time, but hand-configured in cfg_nand.h. +* +* Heap is needed to allocate the tipically large buffer necessary +* to erase and write a block. * * \author Stefano Fedrigo +* +* notest: avr */ -#include "mt29f.h" - +#include "nand.h" #include #include #include // memset /* - * Remap info written in the first page of each block - * used to remap bad blocks. + * Remap info written in the first page of each block. + * + * This structure is used in blocks of the reserved area to store + * which block the block containing the structure is remapping. + * It's stored in all other blocks too to mark a formatted block. + * In this case the member mapped_blk has non meaning. */ struct RemapInfo { @@ -54,21 +78,47 @@ struct RemapInfo uint16_t mapped_blk; // Bad block the block containing this info is remapping }; -#define MT29F_REMAP_TAG_OFFSET (CONFIG_MT29F_SPARE_SIZE - sizeof(struct RemapInfo)) -#define MT29F_REMAP_TAG 0x3e10c8ed +// Where RemapInfo is stored in the spare area +#define NAND_REMAP_TAG_OFFSET (CONFIG_NAND_SPARE_SIZE - sizeof(struct RemapInfo)) + +// Fixed tag to detect RemapInfo +#define NAND_REMAP_TAG 0x3e10c8ed + +/* + * Number of ECC words computed for a page. + * + * For 2048 bytes pages and 1 ECC word each 256 bytes, + * 24 bytes of ECC data are stored. + */ +#define NAND_ECC_NWORDS (CONFIG_NAND_DATA_SIZE / 256) + +// Total page size (user data + spare) in bytes +#define NAND_PAGE_SIZE (CONFIG_NAND_DATA_SIZE + CONFIG_NAND_SPARE_SIZE) + +// Erase block size in bytes +#define NAND_BLOCK_SIZE (CONFIG_NAND_DATA_SIZE * CONFIG_NAND_PAGES_PER_BLOCK) + +// Number of usable blocks, and index of first remapping block +#define NAND_NUM_USER_BLOCKS (CONFIG_NAND_NUM_BLOCK - CONFIG_NAND_NUM_REMAP_BLOCKS) -#define MT29F_ECC_NWORDS (CONFIG_MT29F_DATA_SIZE / 256) +// ONFI NAND status codes +#define NAND_STATUS_READY BV(6) +#define NAND_STATUS_ERROR BV(0) -// NAND flash status codes -#define MT29F_STATUS_READY BV(6) -#define MT29F_STATUS_ERROR BV(0) + +// Get block from page +#define PAGE(blk) ((blk) * CONFIG_NAND_PAGES_PER_BLOCK) + +// Page from block and page in block +#define BLOCK(page) ((uint16_t)((page) / CONFIG_NAND_PAGES_PER_BLOCK)) +#define PAGE_IN_BLOCK(page) ((uint16_t)((page) % CONFIG_NAND_PAGES_PER_BLOCK)) /* - * Translate flash page index plus a byte offset + * Translate page index plus a byte offset * in the five address cycles format needed by NAND. * - * Cycles in x8 mode as the MT29F2G08AAD + * Cycles in x8 mode. * CA = column addr, PA = page addr, BA = block addr * * Cycle I/O7 I/O6 I/O5 I/O4 I/O3 I/O2 I/O1 I/O0 @@ -81,37 +131,35 @@ struct RemapInfo */ static void getAddrCycles(uint32_t page, uint16_t offset, uint32_t *cycle0, uint32_t *cycle1234) { - ASSERT(offset < MT29F_PAGE_SIZE); + ASSERT(offset < NAND_PAGE_SIZE); *cycle0 = offset & 0xff; *cycle1234 = (page << 8) | ((offset >> 8) & 0xf); - - //LOG_INFO("mt29f addr: %lx %lx\n", *cycle1234, *cycle0); } -static void chipReset(Mt29f *chip) +static void chipReset(Nand *chip) { - mt29f_sendCommand(chip, MT29F_CMD_RESET, 0, 0, 0, 0); - mt29f_waitReadyBusy(chip, CONFIG_MT29F_TMOUT); + nand_sendCommand(chip, NAND_CMD_RESET, 0, 0, 0, 0); + nand_waitReadyBusy(chip, CONFIG_NAND_TMOUT); } -static bool isOperationComplete(Mt29f *chip) +static bool isOperationComplete(Nand *chip) { uint8_t status; - mt29f_sendCommand(chip, MT29F_CMD_STATUS, 0, 0, 0, 0); + nand_sendCommand(chip, NAND_CMD_STATUS, 0, 0, 0, 0); - status = mt29f_getChipStatus(chip); - return (status & MT29F_STATUS_READY) && !(status & MT29F_STATUS_ERROR); + status = nand_getChipStatus(chip); + return (status & NAND_STATUS_READY) && !(status & NAND_STATUS_ERROR); } /** * Erase the whole block. */ -int mt29f_blockErase(Mt29f *chip, uint16_t block) +int nand_blockErase(Nand *chip, uint16_t block) { uint32_t cycle0; uint32_t cycle1234; @@ -119,20 +167,20 @@ int mt29f_blockErase(Mt29f *chip, uint16_t block) uint16_t remapped_block = chip->block_map[block]; if (block != remapped_block) { - LOG_INFO("mt29f_blockErase: remapped block: blk %d->%d\n", block, remapped_block); + LOG_INFO("nand_blockErase: remapped block: blk %d->%d\n", block, remapped_block); block = remapped_block; } getAddrCycles(PAGE(block), 0, &cycle0, &cycle1234); - mt29f_sendCommand(chip, MT29F_CMD_ERASE_1, MT29F_CMD_ERASE_2, 3, 0, cycle1234 >> 8); + nand_sendCommand(chip, NAND_CMD_ERASE_1, NAND_CMD_ERASE_2, 3, 0, cycle1234 >> 8); - mt29f_waitReadyBusy(chip, CONFIG_MT29F_TMOUT); + nand_waitReadyBusy(chip, CONFIG_NAND_TMOUT); if (!isOperationComplete(chip)) { - LOG_ERR("mt29f: error erasing block\n"); - chip->status |= MT29F_ERR_ERASE; + LOG_ERR("nand: error erasing block\n"); + chip->status |= NAND_ERR_ERASE; return -1; } @@ -143,39 +191,39 @@ int mt29f_blockErase(Mt29f *chip, uint16_t block) /** * Read Device ID and configuration codes. */ -bool mt29f_getDevId(Mt29f *chip, uint8_t dev_id[5]) +bool nand_getDevId(Nand *chip, uint8_t dev_id[5]) { - mt29f_sendCommand(chip, MT29F_CMD_READID, 0, 1, 0, 0); + nand_sendCommand(chip, NAND_CMD_READID, 0, 1, 0, 0); - mt29f_waitReadyBusy(chip, CONFIG_MT29F_TMOUT); - if (!mt29f_waitTransferComplete(chip, CONFIG_MT29F_TMOUT)) + nand_waitReadyBusy(chip, CONFIG_NAND_TMOUT); + if (!nand_waitTransferComplete(chip, CONFIG_NAND_TMOUT)) { - LOG_ERR("mt29f: getDevId timeout\n"); - chip->status |= MT29F_ERR_RD_TMOUT; + LOG_ERR("nand: getDevId timeout\n"); + chip->status |= NAND_ERR_RD_TMOUT; return false; } - memcpy(dev_id, mt29f_dataBuffer(chip), sizeof(dev_id)); + memcpy(dev_id, nand_dataBuffer(chip), sizeof(dev_id)); return true; } -static bool mt29f_readPage(Mt29f *chip, uint32_t page, uint16_t offset) +static bool nand_readPage(Nand *chip, uint32_t page, uint16_t offset) { uint32_t cycle0; uint32_t cycle1234; - //LOG_INFO("mt29f_readPage: page 0x%lx off 0x%x\n", page, offset); + //LOG_INFO("nand_readPage: page 0x%lx off 0x%x\n", page, offset); getAddrCycles(page, offset, &cycle0, &cycle1234); - mt29f_sendCommand(chip, MT29F_CMD_READ_1, MT29F_CMD_READ_2, 5, cycle0, cycle1234); + nand_sendCommand(chip, NAND_CMD_READ_1, NAND_CMD_READ_2, 5, cycle0, cycle1234); - mt29f_waitReadyBusy(chip, CONFIG_MT29F_TMOUT); - if (!mt29f_waitTransferComplete(chip, CONFIG_MT29F_TMOUT)) + nand_waitReadyBusy(chip, CONFIG_NAND_TMOUT); + if (!nand_waitTransferComplete(chip, CONFIG_NAND_TMOUT)) { - LOG_ERR("mt29f: read timeout\n"); - chip->status |= MT29F_ERR_RD_TMOUT; + LOG_ERR("nand: read timeout\n"); + chip->status |= NAND_ERR_RD_TMOUT; return false; } @@ -187,74 +235,71 @@ static bool mt29f_readPage(Mt29f *chip, uint32_t page, uint16_t offset) * Read page data and ECC, checking for errors. * TODO: fix errors with ECC when possible. */ -static bool mt29f_read(Mt29f *chip, uint32_t page, void *buf, uint16_t offset, uint16_t size) +static bool nand_read(Nand *chip, uint32_t page, void *buf, uint16_t offset, uint16_t size) { struct RemapInfo remap_info; uint32_t remapped_page = PAGE(chip->block_map[BLOCK(page)]) + PAGE_IN_BLOCK(page); - //LOG_INFO("mt29f_read: page=%ld, offset=%d, size=%d\n", page, offset, size); + //LOG_INFO("nand_read: page=%ld, offset=%d, size=%d\n", page, offset, size); if (page != remapped_page) { - LOG_INFO("mt29f_read: remapped block: blk %d->%d, pg %ld->%ld\n", + LOG_INFO("nand_read: remapped block: blk %d->%d, pg %ld->%ld\n", BLOCK(page), chip->block_map[BLOCK(page)], page, remapped_page); page = remapped_page; } - if (!mt29f_readPage(chip, page, 0)) + if (!nand_readPage(chip, page, 0)) return false; - memcpy(buf, (char *)mt29f_dataBuffer(chip) + offset, size); + memcpy(buf, (char *)nand_dataBuffer(chip) + offset, size); /* * Check for ECC hardware status only if a valid RemapInfo structure is found. * That guarantees the page is written by us and a valid ECC is present. */ - memcpy(&remap_info, (char *)buf + MT29F_REMAP_TAG_OFFSET, sizeof(remap_info)); - if (remap_info.tag == MT29F_REMAP_TAG) - return mt29f_checkEcc(chip); + memcpy(&remap_info, (char *)buf + NAND_REMAP_TAG_OFFSET, sizeof(remap_info)); + if (remap_info.tag == NAND_REMAP_TAG && !nand_checkEcc(chip)) + { + chip->status |= NAND_ERR_ECC; + return false; + } else return true; } /* - * Write data in NFC SRAM buffer to a NAND page, starting at a given offset. - * Usually offset will be 0 to write data or CONFIG_MT29F_DATA_SIZE to write the spare + * Write data stored in nand_dataBuffer() to a NAND page, starting at a given offset. + * Usually offset will be 0 to write data or CONFIG_NAND_DATA_SIZE to write the spare * area. - * - * According to datasheet to get ECC computed by hardware is sufficient - * to write the main area. But it seems that in that way the last ECC_PR - * register is not generated. The workaround is to write data and dummy (ff) - * spare data in one write, at this point the last ECC_PR is correct and - * ECC data can be written in the spare area with a second program operation. */ -static bool mt29f_writePage(Mt29f *chip, uint32_t page, uint16_t offset) +static bool nand_writePage(Nand *chip, uint32_t page, uint16_t offset) { uint32_t cycle0; uint32_t cycle1234; - //LOG_INFO("mt29f_writePage: page 0x%lx off 0x%x\n", page, offset); + //LOG_INFO("nand_writePage: page 0x%lx off 0x%x\n", page, offset); getAddrCycles(page, offset, &cycle0, &cycle1234); - mt29f_sendCommand(chip, MT29F_CMD_WRITE_1, 0, 5, cycle0, cycle1234); + nand_sendCommand(chip, NAND_CMD_WRITE_1, 0, 5, cycle0, cycle1234); - if (!mt29f_waitTransferComplete(chip, CONFIG_MT29F_TMOUT)) + if (!nand_waitTransferComplete(chip, CONFIG_NAND_TMOUT)) { - LOG_ERR("mt29f: write timeout\n"); - chip->status |= MT29F_ERR_WR_TMOUT; + LOG_ERR("nand: write timeout\n"); + chip->status |= NAND_ERR_WR_TMOUT; return false; } - mt29f_sendCommand(chip, MT29F_CMD_WRITE_2, 0, 0, 0, 0); + nand_sendCommand(chip, NAND_CMD_WRITE_2, 0, 0, 0, 0); - mt29f_waitReadyBusy(chip, CONFIG_MT29F_TMOUT); + nand_waitReadyBusy(chip, CONFIG_NAND_TMOUT); if (!isOperationComplete(chip)) { - LOG_ERR("mt29f: error writing page\n"); - chip->status |= MT29F_ERR_WRITE; + LOG_ERR("nand: error writing page\n"); + chip->status |= NAND_ERR_WRITE; return false; } @@ -268,39 +313,41 @@ static bool mt29f_writePage(Mt29f *chip, uint32_t page, uint16_t offset) * \param page the page to be written * \parma original_page if different from page, it's the page that's being remapped * - * ECC data are extracted from ECC_PRx registers and written - * in the page's spare area. - * For 2048 bytes pages and 1 ECC word each 256 bytes, - * 24 bytes of ECC data are stored. + * Implementation note for SAM3 NFC controller: + * according to datasheet to get ECC computed by hardware is sufficient + * to write the main area. But it seems that in that way the last ECC_PR + * register is not generated. The workaround is to write data and dummy (ff) + * spare data in one write, at this point the last ECC_PR is correct and + * ECC data can be written in the spare area with a second program operation. */ -static bool mt29f_write(Mt29f *chip, uint32_t page, const void *buf, size_t size) +static bool nand_write(Nand *chip, uint32_t page, const void *buf, size_t size) { struct RemapInfo remap_info; - uint32_t *nand_buf = (uint32_t *)mt29f_dataBuffer(chip); + uint32_t *nand_buf = (uint32_t *)nand_dataBuffer(chip); uint32_t remapped_page = PAGE(chip->block_map[BLOCK(page)]) + PAGE_IN_BLOCK(page); - ASSERT(size <= CONFIG_MT29F_DATA_SIZE); + ASSERT(size <= CONFIG_NAND_DATA_SIZE); if (page != remapped_page) - LOG_INFO("mt29f_write: remapped block: blk %d->%d, pg %ld->%ld\n", + LOG_INFO("nand_write: remapped block: blk %d->%d, pg %ld->%ld\n", BLOCK(page), chip->block_map[BLOCK(page)], page, remapped_page); // Data - memset(nand_buf, 0xff, MT29F_PAGE_SIZE); + memset(nand_buf, 0xff, NAND_PAGE_SIZE); memcpy(nand_buf, buf, size); - if (!mt29f_writePage(chip, remapped_page, 0)) + if (!nand_writePage(chip, remapped_page, 0)) return false; // ECC - memset(nand_buf, 0xff, CONFIG_MT29F_SPARE_SIZE); - mt29f_computeEcc(chip, buf, size, nand_buf, MT29F_ECC_NWORDS); + memset(nand_buf, 0xff, CONFIG_NAND_SPARE_SIZE); + nand_computeEcc(chip, buf, size, nand_buf, NAND_ECC_NWORDS); // Remap info - remap_info.tag = MT29F_REMAP_TAG; + remap_info.tag = NAND_REMAP_TAG; remap_info.mapped_blk = BLOCK(page); - memcpy((char *)nand_buf + MT29F_REMAP_TAG_OFFSET, &remap_info, sizeof(remap_info)); + memcpy((char *)nand_buf + NAND_REMAP_TAG_OFFSET, &remap_info, sizeof(remap_info)); - return mt29f_writePage(chip, remapped_page, CONFIG_MT29F_DATA_SIZE); + return nand_writePage(chip, remapped_page, CONFIG_NAND_DATA_SIZE); } @@ -309,17 +356,17 @@ static bool mt29f_write(Mt29f *chip, uint32_t page, const void *buf, size_t size * that bad block are marked with "00" bytes on the spare area of the * first page in block. */ -static bool blockIsGood(Mt29f *chip, uint16_t blk) +static bool blockIsGood(Nand *chip, uint16_t blk) { - uint8_t *first_byte = (uint8_t *)mt29f_dataBuffer(chip); + uint8_t *first_byte = (uint8_t *)nand_dataBuffer(chip); bool good; // Check first byte in spare area of first page in block - mt29f_readPage(chip, PAGE(blk), CONFIG_MT29F_DATA_SIZE); + nand_readPage(chip, PAGE(blk), CONFIG_NAND_DATA_SIZE); good = *first_byte != 0; if (!good) - LOG_INFO("mt29f: bad block %d\n", blk); + LOG_INFO("nand: bad block %d\n", blk); return good; } @@ -329,14 +376,14 @@ static bool blockIsGood(Mt29f *chip, uint16_t blk) * Return the main partition block remapped on given block in the remap * partition (dest_blk). */ -static int getBadBlockFromRemapBlock(Mt29f *chip, uint16_t dest_blk) +static int getBadBlockFromRemapBlock(Nand *chip, uint16_t dest_blk) { - struct RemapInfo *remap_info = (struct RemapInfo *)mt29f_dataBuffer(chip); + struct RemapInfo *remap_info = (struct RemapInfo *)nand_dataBuffer(chip); - if (!mt29f_readPage(chip, PAGE(dest_blk), CONFIG_MT29F_DATA_SIZE + MT29F_REMAP_TAG_OFFSET)) + if (!nand_readPage(chip, PAGE(dest_blk), CONFIG_NAND_DATA_SIZE + NAND_REMAP_TAG_OFFSET)) return -1; - if (remap_info->tag == MT29F_REMAP_TAG) + if (remap_info->tag == NAND_REMAP_TAG) return remap_info->mapped_blk; else return -1; @@ -344,22 +391,22 @@ static int getBadBlockFromRemapBlock(Mt29f *chip, uint16_t dest_blk) /* - * Set a block remapping: src_blk (a block in main data partition) is remappend + * Set a block remapping: src_blk (a block in main data partition) is remapped * on dest_blk (block in reserved remapped blocks partition). */ -static bool setMapping(Mt29f *chip, uint32_t src_blk, uint32_t dest_blk) +static bool setMapping(Nand *chip, uint32_t src_blk, uint32_t dest_blk) { - struct RemapInfo *remap_info = (struct RemapInfo *)mt29f_dataBuffer(chip); + struct RemapInfo *remap_info = (struct RemapInfo *)nand_dataBuffer(chip); - LOG_INFO("mt29f, setMapping(): src=%ld dst=%ld\n", src_blk, dest_blk); + LOG_INFO("nand, setMapping(): src=%ld dst=%ld\n", src_blk, dest_blk); - if (!mt29f_readPage(chip, PAGE(dest_blk), CONFIG_MT29F_DATA_SIZE + MT29F_REMAP_TAG_OFFSET)) + if (!nand_readPage(chip, PAGE(dest_blk), CONFIG_NAND_DATA_SIZE + NAND_REMAP_TAG_OFFSET)) return false; - remap_info->tag = MT29F_REMAP_TAG; + remap_info->tag = NAND_REMAP_TAG; remap_info->mapped_blk = src_blk; - return mt29f_writePage(chip, PAGE(dest_blk), CONFIG_MT29F_DATA_SIZE + MT29F_REMAP_TAG_OFFSET); + return nand_writePage(chip, PAGE(dest_blk), CONFIG_NAND_DATA_SIZE + NAND_REMAP_TAG_OFFSET); } @@ -367,11 +414,11 @@ static bool setMapping(Mt29f *chip, uint32_t src_blk, uint32_t dest_blk) * Get a new block from the remap partition to use as a substitute * for a bad block. */ -static uint16_t getFreeRemapBlock(Mt29f *chip) +static uint16_t getFreeRemapBlock(Nand *chip) { int blk; - for (blk = chip->remap_start; blk < CONFIG_MT29F_NUM_BLOCK; blk++) + for (blk = chip->remap_start; blk < CONFIG_NAND_NUM_BLOCK; blk++) { if (blockIsGood(chip, blk)) { @@ -380,7 +427,7 @@ static uint16_t getFreeRemapBlock(Mt29f *chip) } } - LOG_ERR("mt29f: reserved blocks for bad block remapping exhausted!\n"); + LOG_ERR("nand: reserved blocks for bad block remapping exhausted!\n"); return 0; } @@ -388,37 +435,37 @@ static uint16_t getFreeRemapBlock(Mt29f *chip) /* * Check if NAND is initialized. */ -static bool chipIsMarked(Mt29f *chip) +static bool chipIsMarked(Nand *chip) { - return getBadBlockFromRemapBlock(chip, MT29F_NUM_USER_BLOCKS) != -1; + return getBadBlockFromRemapBlock(chip, NAND_NUM_USER_BLOCKS) != -1; } /* * Initialize NAND (format). Scan NAND for factory marked bad blocks. - * All bad blocks found are remapped to the remap partition: each + * All found bad blocks are remapped to the remap partition: each * block in the remap partition used to remap bad blocks is marked. */ -static void initBlockMap(Mt29f *chip) +static void initBlockMap(Nand *chip) { int b, last; // Default is for each block to not be remapped - for (b = 0; b < CONFIG_MT29F_NUM_BLOCK; b++) + for (b = 0; b < CONFIG_NAND_NUM_BLOCK; b++) chip->block_map[b] = b; - chip->remap_start = MT29F_NUM_USER_BLOCKS; + chip->remap_start = NAND_NUM_USER_BLOCKS; if (chipIsMarked(chip)) { - LOG_INFO("mt29f: found initialized NAND, searching for remapped blocks\n"); + LOG_INFO("nand: found initialized NAND, searching for remapped blocks\n"); // Scan for assigned blocks in remap area - for (b = last = MT29F_NUM_USER_BLOCKS; b < CONFIG_MT29F_NUM_BLOCK; b++) + for (b = last = NAND_NUM_USER_BLOCKS; b < CONFIG_NAND_NUM_BLOCK; b++) { int remapped_blk = getBadBlockFromRemapBlock(chip, b); if (remapped_blk != -1 && remapped_blk != b) { - LOG_INFO("mt29f: found remapped block %d->%d\n", remapped_blk, b); + LOG_INFO("nand: found remapped block %d->%d\n", remapped_blk, b); chip->block_map[remapped_blk] = b; last = b + 1; } @@ -429,27 +476,27 @@ static void initBlockMap(Mt29f *chip) { bool remapped_anything = false; - LOG_INFO("mt29f: found new NAND, searching for bad blocks\n"); + LOG_INFO("nand: found new NAND, searching for bad blocks\n"); - for (b = 0; b < MT29F_NUM_USER_BLOCKS; b++) + for (b = 0; b < NAND_NUM_USER_BLOCKS; b++) { if (!blockIsGood(chip, b)) { chip->block_map[b] = getFreeRemapBlock(chip); setMapping(chip, b, chip->block_map[b]); remapped_anything = true; - LOG_INFO("mt29f: found new bad block %d, remapped to %d\n", b, chip->block_map[b]); + LOG_WARN("nand: found new bad block %d, remapped to %d\n", b, chip->block_map[b]); } } /* - * If no bad blocks are found (we're lucky!) write a dummy + * If no bad blocks are found (we're lucky!) write anyway a dummy * remap to mark NAND and detect we already scanned it next time. */ if (!remapped_anything) { - setMapping(chip, MT29F_NUM_USER_BLOCKS, MT29F_NUM_USER_BLOCKS); - LOG_INFO("mt29f: no bad block founds, marked NAND\n"); + setMapping(chip, NAND_NUM_USER_BLOCKS, NAND_NUM_USER_BLOCKS); + LOG_INFO("nand: no bad block founds, marked NAND\n"); } } } @@ -461,17 +508,17 @@ static void initBlockMap(Mt29f *chip) * \note DON'T USE on production chips: this function will try to erase * factory marked bad blocks too. */ -void mt29f_format(Mt29f *chip) +void nand_format(Nand *chip) { int b; - for (b = 0; b < CONFIG_MT29F_NUM_BLOCK; b++) + for (b = 0; b < CONFIG_NAND_NUM_BLOCK; b++) { - LOG_INFO("mt29f: erasing block %d\n", b); + LOG_INFO("nand: erasing block %d\n", b); chip->block_map[b] = b; - mt29f_blockErase(chip, b); + nand_blockErase(chip, b); } - chip->remap_start = MT29F_NUM_USER_BLOCKS; + chip->remap_start = NAND_NUM_USER_BLOCKS; } #ifdef _DEBUG @@ -479,44 +526,44 @@ void mt29f_format(Mt29f *chip) /* * Create some bad blocks, erasing them and writing the bad block mark. */ -void mt29f_ruinSomeBlocks(Mt29f *chip) +void nand_ruinSomeBlocks(Nand *chip) { int bads[] = { 7, 99, 555, 1003, 1004, 1432 }; unsigned i; - LOG_INFO("mt29f: erasing mark\n"); - mt29f_blockErase(chip, MT29F_NUM_USER_BLOCKS); + LOG_INFO("nand: erasing mark\n"); + nand_blockErase(chip, NAND_NUM_USER_BLOCKS); for (i = 0; i < countof(bads); i++) { - LOG_INFO("mt29f: erasing block %d\n", bads[i]); - mt29f_blockErase(chip, bads[i]); + LOG_INFO("nand: erasing block %d\n", bads[i]); + nand_blockErase(chip, bads[i]); - LOG_INFO("mt29f: marking page %d as bad\n", PAGE(bads[i])); - memset(mt29f_dataBuffer(chip), 0, CONFIG_MT29F_SPARE_SIZE); - mt29f_writePage(chip, PAGE(bads[i]), CONFIG_MT29F_DATA_SIZE); + LOG_INFO("nand: marking page %d as bad\n", PAGE(bads[i])); + memset(nand_dataBuffer(chip), 0, CONFIG_NAND_SPARE_SIZE); + nand_writePage(chip, PAGE(bads[i]), CONFIG_NAND_DATA_SIZE); } } #endif -static bool commonInit(Mt29f *chip, struct Heap *heap, unsigned chip_select) +static bool commonInit(Nand *chip, struct Heap *heap, unsigned chip_select) { - memset(chip, 0, sizeof(Mt29f)); + memset(chip, 0, sizeof(Nand)); DB(chip->fd.priv.type = KBT_NAND); - chip->fd.blk_size = MT29F_BLOCK_SIZE; - chip->fd.blk_cnt = MT29F_NUM_USER_BLOCKS; + chip->fd.blk_size = NAND_BLOCK_SIZE; + chip->fd.blk_cnt = NAND_NUM_USER_BLOCKS; chip->chip_select = chip_select; - chip->block_map = heap_allocmem(heap, CONFIG_MT29F_NUM_BLOCK * sizeof(*chip->block_map)); + chip->block_map = heap_allocmem(heap, CONFIG_NAND_NUM_BLOCK * sizeof(*chip->block_map)); if (!chip->block_map) { - LOG_ERR("mt29f: error allocating block map\n"); + LOG_ERR("nand: error allocating block map\n"); return false; } - mt29f_hwInit(chip); + nand_hwInit(chip); chipReset(chip); initBlockMap(chip); @@ -527,51 +574,51 @@ static bool commonInit(Mt29f *chip, struct Heap *heap, unsigned chip_select) /**************** Kblock interface ****************/ -static size_t mt29f_writeDirect(struct KBlock *kblk, block_idx_t idx, const void *buf, size_t offset, size_t size) +static size_t nand_writeDirect(struct KBlock *kblk, block_idx_t idx, const void *buf, size_t offset, size_t size) { - ASSERT(offset <= MT29F_BLOCK_SIZE); - ASSERT(offset % CONFIG_MT29F_DATA_SIZE == 0); - ASSERT(size <= MT29F_BLOCK_SIZE); - ASSERT(size % CONFIG_MT29F_DATA_SIZE == 0); + ASSERT(offset <= NAND_BLOCK_SIZE); + ASSERT(offset % CONFIG_NAND_DATA_SIZE == 0); + ASSERT(size <= NAND_BLOCK_SIZE); + ASSERT(size % CONFIG_NAND_DATA_SIZE == 0); - //LOG_INFO("mt29f_writeDirect: idx=%ld offset=%d size=%d\n", idx, offset, size); + LOG_INFO("nand_writeDirect: idx=%ld offset=%d size=%d\n", idx, offset, size); - mt29f_blockErase(MT29F_CAST(kblk), idx); + nand_blockErase(NAND_CAST(kblk), idx); while (offset < size) { - uint32_t page = PAGE(idx) + (offset / CONFIG_MT29F_DATA_SIZE); + uint32_t page = PAGE(idx) + (offset / CONFIG_NAND_DATA_SIZE); - if (!mt29f_write(MT29F_CAST(kblk), page, buf, CONFIG_MT29F_DATA_SIZE)) + if (!nand_write(NAND_CAST(kblk), page, buf, CONFIG_NAND_DATA_SIZE)) break; - offset += CONFIG_MT29F_DATA_SIZE; - buf = (const char *)buf + CONFIG_MT29F_DATA_SIZE; + offset += CONFIG_NAND_DATA_SIZE; + buf = (const char *)buf + CONFIG_NAND_DATA_SIZE; } return offset; } -static size_t mt29f_readDirect(struct KBlock *kblk, block_idx_t idx, void *buf, size_t offset, size_t size) +static size_t nand_readDirect(struct KBlock *kblk, block_idx_t idx, void *buf, size_t offset, size_t size) { uint32_t page; size_t read_size; size_t read_offset; size_t nread = 0; - ASSERT(offset < MT29F_BLOCK_SIZE); - ASSERT(size <= MT29F_BLOCK_SIZE); + ASSERT(offset < NAND_BLOCK_SIZE); + ASSERT(size <= NAND_BLOCK_SIZE); - //LOG_INFO("mt29f_readDirect: idx=%ld offset=%d size=%d\n", idx, offset, size); + LOG_INFO("nand_readDirect: idx=%ld offset=%d size=%d\n", idx, offset, size); while (nread < size) { - page = PAGE(idx) + (offset / CONFIG_MT29F_DATA_SIZE); - read_offset = offset % CONFIG_MT29F_DATA_SIZE; - read_size = MIN(size, CONFIG_MT29F_DATA_SIZE - read_offset); + page = PAGE(idx) + (offset / CONFIG_NAND_DATA_SIZE); + read_offset = offset % CONFIG_NAND_DATA_SIZE; + read_size = MIN(size, CONFIG_NAND_DATA_SIZE - read_offset); - if (!mt29f_read(MT29F_CAST(kblk), page, (char *)buf + nread, read_offset, read_size)) + if (!nand_read(NAND_CAST(kblk), page, (char *)buf + nread, read_offset, read_size)) break; offset += read_size; @@ -582,76 +629,76 @@ static size_t mt29f_readDirect(struct KBlock *kblk, block_idx_t idx, void *buf, } -static int mt29f_error(struct KBlock *kblk) +static int nand_error(struct KBlock *kblk) { - Mt29f *chip = MT29F_CAST(kblk); + Nand *chip = NAND_CAST(kblk); return chip->status; } -static void mt29f_clearError(struct KBlock *kblk) +static void nand_clearError(struct KBlock *kblk) { - Mt29f *chip = MT29F_CAST(kblk); + Nand *chip = NAND_CAST(kblk); chip->status = 0; } -static const KBlockVTable mt29f_buffered_vt = +static const KBlockVTable nand_buffered_vt = { - .readDirect = mt29f_readDirect, - .writeDirect = mt29f_writeDirect, + .readDirect = nand_readDirect, + .writeDirect = nand_writeDirect, .readBuf = kblock_swReadBuf, .writeBuf = kblock_swWriteBuf, .load = kblock_swLoad, .store = kblock_swStore, - .error = mt29f_error, - .clearerr = mt29f_clearError, + .error = nand_error, + .clearerr = nand_clearError, }; -static const KBlockVTable mt29f_unbuffered_vt = +static const KBlockVTable nand_unbuffered_vt = { - .readDirect = mt29f_readDirect, - .writeDirect = mt29f_writeDirect, + .readDirect = nand_readDirect, + .writeDirect = nand_writeDirect, - .error = mt29f_error, - .clearerr = mt29f_clearError, + .error = nand_error, + .clearerr = nand_clearError, }; /** * Initialize NAND kblock driver in buffered mode. */ -bool mt29f_init(Mt29f *chip, struct Heap *heap, unsigned chip_select) +bool nand_init(Nand *chip, struct Heap *heap, unsigned chip_select) { if (!commonInit(chip, heap, chip_select)) return false; - chip->fd.priv.vt = &mt29f_buffered_vt; + chip->fd.priv.vt = &nand_buffered_vt; chip->fd.priv.flags |= KB_BUFFERED; - chip->fd.priv.buf = heap_allocmem(heap, MT29F_BLOCK_SIZE); + chip->fd.priv.buf = heap_allocmem(heap, NAND_BLOCK_SIZE); if (!chip->fd.priv.buf) { - LOG_ERR("mt29f: error allocating block buffer\n"); + LOG_ERR("nand: error allocating block buffer\n"); return false; } // Load the first block in the cache - return mt29f_readDirect(&chip->fd, 0, chip->fd.priv.buf, 0, chip->fd.blk_size); + return nand_readDirect(&chip->fd, 0, chip->fd.priv.buf, 0, chip->fd.blk_size); } /** * Initialize NAND kblock driver in unbuffered mode. */ -bool mt29f_initUnbuffered(Mt29f *chip, struct Heap *heap, unsigned chip_select) +bool nand_initUnbuffered(Nand *chip, struct Heap *heap, unsigned chip_select) { if (!commonInit(chip, heap, chip_select)) return false; - chip->fd.priv.vt = &mt29f_unbuffered_vt; + chip->fd.priv.vt = &nand_unbuffered_vt; return true; }