mtd: nand_ids: introduce helper macros
Subsystems (2)
PATCH 1/2 mtd: nand_ids: introduce helper macros
From: Artem Bityutskiy <[email protected]>
Introduce helper macros for defining NAND chips. These macros do not really add much value in the current code-base. However, we are going to add full ID support which adds some more complexity to the table, and helper macros become useful for readability.
--- drivers/mtd/nand/nand_ids.c | 174 +++++++++++++++++++++--------------------- drivers/mtd/nand/sm_common.c | 56 +++++++------- include/linux/mtd/nand.h | 24 ++++++ 3 files changed, 138 insertions(+), 116 deletions(-)
drivers/mtd/nand/nand_ids.c +87 -87
@@ -22,41 +22,41 @@* extended chip ID. */ struct nand_flash_dev nand_flash_ids[] = { - {"NAND 4MiB 5V 8-bit" ,0x6b ,512 ,4 ,0x2000 ,0 }, - {"NAND 4MiB 3,3V 8-bit" ,0xd5 ,512 ,4 ,0x2000 ,0 }, - {"NAND 4MiB 3,3V 8-bit" ,0xe3 ,512 ,4 ,0x2000 ,0 }, - {"NAND 4MiB 3,3V 8-bit" ,0xe5 ,512 ,4 ,0x2000 ,0 }, - {"NAND 8MiB 3,3V 8-bit" ,0xd6 ,512 ,8 ,0x2000 ,0 }, - - {"NAND 8MiB 1,8V 8-bit" ,0x39 ,512 ,8 ,0x2000 ,0 }, - {"NAND 8MiB 3,3V 8-bit" ,0xe6 ,512 ,8 ,0x2000 ,0 }, - {"NAND 8MiB 1,8V 16-bit" ,0x49 ,512 ,8 ,0x2000 ,NAND_BUSWIDTH_16 }, - {"NAND 8MiB 3,3V 16-bit" ,0x59 ,512 ,8 ,0x2000 ,NAND_BUSWIDTH_16 }, - - {"NAND 16MiB 1,8V 8-bit" ,0x33 ,512 ,16 ,0x4000 ,0 }, - {"NAND 16MiB 3,3V 8-bit" ,0x73 ,512 ,16 ,0x4000 ,0 }, - {"NAND 16MiB 1,8V 16-bit" ,0x43 ,512 ,16 ,0x4000 ,NAND_BUSWIDTH_16 }, - {"NAND 16MiB 3,3V 16-bit" ,0x53 ,512 ,16 ,0x4000 ,NAND_BUSWIDTH_16 }, - - {"NAND 32MiB 1,8V 8-bit" ,0x35 ,512 ,32 ,0x4000 ,0 }, - {"NAND 32MiB 3,3V 8-bit" ,0x75 ,512 ,32 ,0x4000 ,0 }, - {"NAND 32MiB 1,8V 16-bit" ,0x45 ,512 ,32 ,0x4000 ,NAND_BUSWIDTH_16 }, - {"NAND 32MiB 3,3V 16-bit" ,0x55 ,512 ,32 ,0x4000 ,NAND_BUSWIDTH_16 }, - - {"NAND 64MiB 1,8V 8-bit" ,0x36 ,512 ,64 ,0x4000 ,0 }, - {"NAND 64MiB 3,3V 8-bit" ,0x76 ,512 ,64 ,0x4000 ,0 }, - {"NAND 64MiB 1,8V 16-bit" ,0x46 ,512 ,64 ,0x4000 ,NAND_BUSWIDTH_16 }, - {"NAND 64MiB 3,3V 16-bit" ,0x56 ,512 ,64 ,0x4000 ,NAND_BUSWIDTH_16 }, - - {"NAND 128MiB 1,8V 8-bit" ,0x78 ,512 ,128 ,0x4000 ,0 }, - {"NAND 128MiB 1,8V 8-bit" ,0x39 ,512 ,128 ,0x4000 ,0 }, - {"NAND 128MiB 3,3V 8-bit" ,0x79 ,512 ,128 ,0x4000 ,0 }, - {"NAND 128MiB 1,8V 16-bit" ,0x72 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 }, - {"NAND 128MiB 1,8V 16-bit" ,0x49 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 }, - {"NAND 128MiB 3,3V 16-bit" ,0x74 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 }, - {"NAND 128MiB 3,3V 16-bit" ,0x59 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 }, - - {"NAND 256MiB 3,3V 8-bit" ,0x71 ,512 ,256 ,0x4000 ,0 }, +LEGACY_ID_NAND ("NAND 4MiB 5V 8-bit" ,0x6b ,512 ,4 ,0x2000 ,0 ), +LEGACY_ID_NAND ("NAND 4MiB 3,3V 8-bit" ,0xd5 ,512 ,4 ,0x2000 ,0 ), +LEGACY_ID_NAND ("NAND 4MiB 3,3V 8-bit" ,0xe3 ,512 ,4 ,0x2000 ,0 ), +LEGACY_ID_NAND ("NAND 4MiB 3,3V 8-bit" ,0xe5 ,512 ,4 ,0x2000 ,0 ), +LEGACY_ID_NAND ("NAND 8MiB 3,3V 8-bit" ,0xd6 ,512 ,8 ,0x2000 ,0 ), + +LEGACY_ID_NAND ("NAND 8MiB 1,8V 8-bit" ,0x39 ,512 ,8 ,0x2000 ,0 ), +LEGACY_ID_NAND ("NAND 8MiB 3,3V 8-bit" ,0xe6 ,512 ,8 ,0x2000 ,0 ), +LEGACY_ID_NAND ("NAND 8MiB 1,8V 16-bit" ,0x49 ,512 ,8 ,0x2000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 8MiB 3,3V 16-bit" ,0x59 ,512 ,8 ,0x2000 ,NAND_BUSWIDTH_16 ), + +LEGACY_ID_NAND ("NAND 16MiB 1,8V 8-bit" ,0x33 ,512 ,16 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 16MiB 3,3V 8-bit" ,0x73 ,512 ,16 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 16MiB 1,8V 16-bit" ,0x43 ,512 ,16 ,0x4000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 16MiB 3,3V 16-bit" ,0x53 ,512 ,16 ,0x4000 ,NAND_BUSWIDTH_16 ), + +LEGACY_ID_NAND ("NAND 32MiB 1,8V 8-bit" ,0x35 ,512 ,32 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 32MiB 3,3V 8-bit" ,0x75 ,512 ,32 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 32MiB 1,8V 16-bit" ,0x45 ,512 ,32 ,0x4000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 32MiB 3,3V 16-bit" ,0x55 ,512 ,32 ,0x4000 ,NAND_BUSWIDTH_16 ), + +LEGACY_ID_NAND ("NAND 64MiB 1,8V 8-bit" ,0x36 ,512 ,64 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 64MiB 3,3V 8-bit" ,0x76 ,512 ,64 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 64MiB 1,8V 16-bit" ,0x46 ,512 ,64 ,0x4000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 64MiB 3,3V 16-bit" ,0x56 ,512 ,64 ,0x4000 ,NAND_BUSWIDTH_16 ), + +LEGACY_ID_NAND ("NAND 128MiB 1,8V 8-bit" ,0x78 ,512 ,128 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 128MiB 1,8V 8-bit" ,0x39 ,512 ,128 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 128MiB 3,3V 8-bit" ,0x79 ,512 ,128 ,0x4000 ,0 ), +LEGACY_ID_NAND ("NAND 128MiB 1,8V 16-bit" ,0x72 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 128MiB 1,8V 16-bit" ,0x49 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 128MiB 3,3V 16-bit" ,0x74 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 ), +LEGACY_ID_NAND ("NAND 128MiB 3,3V 16-bit" ,0x59 ,512 ,128 ,0x4000 ,NAND_BUSWIDTH_16 ), + +LEGACY_ID_NAND ("NAND 256MiB 3,3V 8-bit" ,0x71 ,512 ,256 ,0x4000 ,0 ),/* * These are the new chips with large page size. Their page size and
@@ -64,79 +64,79 @@ struct nand_flash_dev nand_flash_ids[] = {*/ /* 512 Megabit */ - {"NAND 64MiB 1,8V 8-bit", 0xA2, 0, 64, 0, LP_OPTIONS}, - {"NAND 64MiB 1,8V 8-bit", 0xA0, 0, 64, 0, LP_OPTIONS}, - {"NAND 64MiB 3,3V 8-bit", 0xF2, 0, 64, 0, LP_OPTIONS}, - {"NAND 64MiB 3,3V 8-bit", 0xD0, 0, 64, 0, LP_OPTIONS}, - {"NAND 64MiB 3,3V 8-bit", 0xF0, 0, 64, 0, LP_OPTIONS}, - {"NAND 64MiB 1,8V 16-bit", 0xB2, 0, 64, 0, LP_OPTIONS16}, - {"NAND 64MiB 1,8V 16-bit", 0xB0, 0, 64, 0, LP_OPTIONS16}, - {"NAND 64MiB 3,3V 16-bit", 0xC2, 0, 64, 0, LP_OPTIONS16}, - {"NAND 64MiB 3,3V 16-bit", 0xC0, 0, 64, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 64MiB 1,8V 8-bit" ,0xA2 ,64 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64MiB 1,8V 8-bit" ,0xA0 ,64 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64MiB 3,3V 8-bit" ,0xF2 ,64 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64MiB 3,3V 8-bit" ,0xD0 ,64 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64MiB 3,3V 8-bit" ,0xF0 ,64 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64MiB 1,8V 16-bit" ,0xB2 ,64 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 64MiB 1,8V 16-bit" ,0xB0 ,64 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 64MiB 3,3V 16-bit" ,0xC2 ,64 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 64MiB 3,3V 16-bit" ,0xC0 ,64 ,LP_OPTIONS16 ),/* 1 Gigabit */ - {"NAND 128MiB 1,8V 8-bit", 0xA1, 0, 128, 0, LP_OPTIONS}, - {"NAND 128MiB 3,3V 8-bit", 0xF1, 0, 128, 0, LP_OPTIONS}, - {"NAND 128MiB 3,3V 8-bit", 0xD1, 0, 128, 0, LP_OPTIONS}, - {"NAND 128MiB 1,8V 16-bit", 0xB1, 0, 128, 0, LP_OPTIONS16}, - {"NAND 128MiB 3,3V 16-bit", 0xC1, 0, 128, 0, LP_OPTIONS16}, - {"NAND 128MiB 1,8V 16-bit", 0xAD, 0, 128, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 128MiB 1,8V 8-bit" ,0xA1 ,128 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 128MiB 3,3V 8-bit" ,0xF1 ,128 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 128MiB 3,3V 8-bit" ,0xD1 ,128 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 128MiB 1,8V 16-bit" ,0xB1 ,128 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 128MiB 3,3V 16-bit" ,0xC1 ,128 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 128MiB 1,8V 16-bit" ,0xAD ,128 ,LP_OPTIONS16 ),/* 2 Gigabit */ - {"NAND 256MiB 1,8V 8-bit", 0xAA, 0, 256, 0, LP_OPTIONS}, - {"NAND 256MiB 3,3V 8-bit", 0xDA, 0, 256, 0, LP_OPTIONS}, - {"NAND 256MiB 1,8V 16-bit", 0xBA, 0, 256, 0, LP_OPTIONS16}, - {"NAND 256MiB 3,3V 16-bit", 0xCA, 0, 256, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 256MiB 1,8V 8-bit" ,0xAA ,256 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 256MiB 3,3V 8-bit" ,0xDA ,256 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 256MiB 1,8V 16-bit" ,0xBA ,256 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 256MiB 3,3V 16-bit" ,0xCA ,256 ,LP_OPTIONS16 ),/* 4 Gigabit */ - {"NAND 512MiB 1,8V 8-bit", 0xAC, 0, 512, 0, LP_OPTIONS}, - {"NAND 512MiB 3,3V 8-bit", 0xDC, 0, 512, 0, LP_OPTIONS}, - {"NAND 512MiB 1,8V 16-bit", 0xBC, 0, 512, 0, LP_OPTIONS16}, - {"NAND 512MiB 3,3V 16-bit", 0xCC, 0, 512, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 512MiB 1,8V 8-bit" ,0xAC ,512 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 512MiB 3,3V 8-bit" ,0xDC ,512 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 512MiB 1,8V 16-bit" ,0xBC ,512 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 512MiB 3,3V 16-bit" ,0xCC ,512 ,LP_OPTIONS16 ),/* 8 Gigabit */ - {"NAND 1GiB 1,8V 8-bit", 0xA3, 0, 1024, 0, LP_OPTIONS}, - {"NAND 1GiB 3,3V 8-bit", 0xD3, 0, 1024, 0, LP_OPTIONS}, - {"NAND 1GiB 1,8V 16-bit", 0xB3, 0, 1024, 0, LP_OPTIONS16}, - {"NAND 1GiB 3,3V 16-bit", 0xC3, 0, 1024, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 1GiB 1,8V 8-bit" ,0xA3 ,1024 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 1GiB 3,3V 8-bit" ,0xD3 ,1024 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 1GiB 1,8V 16-bit" ,0xB3 ,1024 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 1GiB 3,3V 16-bit" ,0xC3 ,1024 ,LP_OPTIONS16 ),/* 16 Gigabit */ - {"NAND 2GiB 1,8V 8-bit", 0xA5, 0, 2048, 0, LP_OPTIONS}, - {"NAND 2GiB 3,3V 8-bit", 0xD5, 0, 2048, 0, LP_OPTIONS}, - {"NAND 2GiB 1,8V 16-bit", 0xB5, 0, 2048, 0, LP_OPTIONS16}, - {"NAND 2GiB 3,3V 16-bit", 0xC5, 0, 2048, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 2GiB 1,8V 8-bit" ,0xA5 ,2048 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 2GiB 3,3V 8-bit" ,0xD5 ,2048 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 2GiB 1,8V 16-bit" ,0xB5 ,2048 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 2GiB 3,3V 16-bit" ,0xC5 ,2048 ,LP_OPTIONS16 ),/* 32 Gigabit */ - {"NAND 4GiB 1,8V 8-bit", 0xA7, 0, 4096, 0, LP_OPTIONS}, - {"NAND 4GiB 3,3V 8-bit", 0xD7, 0, 4096, 0, LP_OPTIONS}, - {"NAND 4GiB 1,8V 16-bit", 0xB7, 0, 4096, 0, LP_OPTIONS16}, - {"NAND 4GiB 3,3V 16-bit", 0xC7, 0, 4096, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 4GiB 1,8V 8-bit" ,0xA7 ,4096 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 4GiB 3,3V 8-bit" ,0xD7 ,4096 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 4GiB 1,8V 16-bit" ,0xB7 ,4096 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 4GiB 3,3V 16-bit" ,0xC7 ,4096 ,LP_OPTIONS16 ),/* 64 Gigabit */ - {"NAND 8GiB 1,8V 8-bit", 0xAE, 0, 8192, 0, LP_OPTIONS}, - {"NAND 8GiB 3,3V 8-bit", 0xDE, 0, 8192, 0, LP_OPTIONS}, - {"NAND 8GiB 1,8V 16-bit", 0xBE, 0, 8192, 0, LP_OPTIONS16}, - {"NAND 8GiB 3,3V 16-bit", 0xCE, 0, 8192, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 8GiB 1,8V 8-bit" ,0xAE ,8192 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 8GiB 3,3V 8-bit" ,0xDE ,8192 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 8GiB 1,8V 16-bit" ,0xBE ,8192 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 8GiB 3,3V 16-bit" ,0xCE ,8192 ,LP_OPTIONS16 ),/* 128 Gigabit */ - {"NAND 16GiB 1,8V 8-bit", 0x1A, 0, 16384, 0, LP_OPTIONS}, - {"NAND 16GiB 3,3V 8-bit", 0x3A, 0, 16384, 0, LP_OPTIONS}, - {"NAND 16GiB 1,8V 16-bit", 0x2A, 0, 16384, 0, LP_OPTIONS16}, - {"NAND 16GiB 3,3V 16-bit", 0x4A, 0, 16384, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 16GiB 1,8V 8-bit" ,0x1A ,16384 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 16GiB 3,3V 8-bit" ,0x3A ,16384 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 16GiB 1,8V 16-bit" ,0x2A ,16384 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 16GiB 3,3V 16-bit" ,0x4A ,16384 ,LP_OPTIONS16 ),/* 256 Gigabit */ - {"NAND 32GiB 1,8V 8-bit", 0x1C, 0, 32768, 0, LP_OPTIONS}, - {"NAND 32GiB 3,3V 8-bit", 0x3C, 0, 32768, 0, LP_OPTIONS}, - {"NAND 32GiB 1,8V 16-bit", 0x2C, 0, 32768, 0, LP_OPTIONS16}, - {"NAND 32GiB 3,3V 16-bit", 0x4C, 0, 32768, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 32GiB 1,8V 8-bit" ,0x1C ,32768 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 32GiB 3,3V 8-bit" ,0x3C ,32768 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 32GiB 1,8V 16-bit" ,0x2C ,32768 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 32GiB 3,3V 16-bit" ,0x4C ,32768 ,LP_OPTIONS16 ),/* 512 Gigabit */ - {"NAND 64GiB 1,8V 8-bit", 0x1E, 0, 65536, 0, LP_OPTIONS}, - {"NAND 64GiB 3,3V 8-bit", 0x3E, 0, 65536, 0, LP_OPTIONS}, - {"NAND 64GiB 1,8V 16-bit", 0x2E, 0, 65536, 0, LP_OPTIONS16}, - {"NAND 64GiB 3,3V 16-bit", 0x4E, 0, 65536, 0, LP_OPTIONS16}, +EXTENDED_ID_NAND ("NAND 64GiB 1,8V 8-bit" ,0x1E ,65536 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64GiB 3,3V 8-bit" ,0x3E ,65536 ,LP_OPTIONS ), +EXTENDED_ID_NAND ("NAND 64GiB 1,8V 16-bit" ,0x2E ,65536 ,LP_OPTIONS16 ), +EXTENDED_ID_NAND ("NAND 64GiB 3,3V 16-bit" ,0x4E ,65536 ,LP_OPTIONS16 ), - {NULL,} + {NULL} };/* Manufacturer IDs */
drivers/mtd/nand/sm_common.c +27 -29
66 lines not on this page · raw message
include/linux/mtd/nand.h +24 -0
@@ -539,6 +539,30 @@ struct nand_chip {#define NAND_MFR_MACRONIX 0xc2#define NAND_MFR_EON 0x92 +/* +* A helper for defining older NAND chips where the second ID byte fully +* defined the chip, including the geometry (chip size, eraseblock size, page +* size). +*/ +#define LEGACY_ID_NAND (nm, devid, pagesz, chipsz, erasesz, opts) \ + { .name = (nm), .dev_id = (devid), .pagesize = (pagesz), \ + .chipsize = (chipsz), .erasesize = (erasesz), \ + .options = (opts) } + +/* +* A helper for defining newer chips which report their page size and +* eraseblock size via the extended ID bytes. +* +* The real difference between LEGACY_ID_NAND and EXTENDED_ID_NAND is that with +* EXTENDED_ID_NAND, manufacturers overloaded the same device ID so that the +* device ID now only represented a particular total chip size (and voltage, +* buswidth), and the page size, eraseblock size, and OOB size could vary while +* using the same device ID. +*/ +#define EXTENDED_ID_NAND (nm, devid, chipsz, opts) \ + { .name = (nm), .dev_id = (devid), .chipsize = (chipsz), \ + .options = (opts) } +/** * struct nand_flash_dev - NAND Flash Device ID Structure * @name: a human-readable name of the NAND chip
Signature · 1 line
1.7.10.4
PATCH 2/2 mtd: nand: provision full ID support
From: Artem Bityutskiy <[email protected]>
Up until now we identified NAND chips by the 'device ID' part of the full chip ID array, which is the second full ID array byte. However, the newest flashes use the same device ID for chips with identical page and eraseblock sizes, but different OOB sizes. And unfortunately, it is not clear if there is a "standard" way to fetch the OOB size from chip's full ID array. Here is an example:
Toshiba TC58NVG2S0F: 0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08 Toshiba TC58NVG3S0F: 0x98, 0xd3, 0x90, 0x26, 0x76, 0x15, 0x02, 0x08
The first one is a 512MiB NAND chip with 4KiB NAND pages, 256KiB eraseblock size and 224 bytes OOB. The second one is a 1GiB NAND chip with the same page and eraseblock sizes, but with 232 bytes OOB.
This means that we have to store full ID in our NAND flashes table in order to distinguish between these 2.
This patch adds the 'id[8]' field to the 'struct nand_flash_dev' structure, and it makes it to be a part of anonymous union, where the second member is a structure containing the 'mfr_id' and 'dev_id' bytes. The union makes sure that 'mfr_id' refers the same RAM address as 'id[0]' and 'dev_id' refers the same RAM address as 'id[1]'. The only motivation for the union is an assumption that 'type->dev_id' is more readable than 'type->id[1]'.
--- include/linux/mtd/nand.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
include/linux/mtd/nand.h +12 -1
@@ -567,6 +567,11 @@ struct nand_chip {* struct nand_flash_dev - NAND Flash Device ID Structure * @name: a human-readable name of the NAND chip * @dev_id: the device ID (the second byte of the full chip ID array) +* @mfr_id: manufecturer ID part of the full chip ID array (refers the same +* memory address as @id[0]) +* @dev_id: device ID part of the full chip ID array (refers the same memory +* address as @id[0]) +* @id: full device ID array * @pagesize: size of the NAND page in bytes; if 0, then the real page size (as * well as the eraseblock size) is determined from the extended NAND * chip ID array)
@@ -576,7 +581,13 @@ struct nand_chip {*/ struct nand_flash_dev {char *name; -int dev_id; +union { +struct { +uint8_t mfr_id; +uint8_t dev_id; + }; +uint8_t id[8 ]; + };unsigned long pagesize;unsigned long chipsize;unsigned long erasesize;
Signature · 1 line
1.7.10.4
Re: [PATCH 2/2] mtd: nand: provision full ID support
Quoted 2 lines · Artem Bityutskiy
+ * @dev_id: device ID part of the full chip ID array (refers the same memory
+ * address as @id[0])
Here it should be @id[1] instead.
Signature · 2 lines
Best Regards, Artem Bityutskiy
Re: [PATCH 2/2] mtd: nand: provision full ID support
Quoted 7 lines · Artem Bityutskiy
Quoted 2 lines · Artem Bityutskiy
+ * @dev_id: device ID part of the full chip ID array (refers the same memory
+ * address as @id[0])Here it should be @id[1] instead.
this patch causes a compiler error.
I tested the l2-mtd tree just now.
thanks
Huang Shijie
Re: [PATCH 2/2] mtd: nand: provision full ID support
Quoted 9 lines · Huang Shijie
Quoted 7 lines · Artem Bityutskiy
Quoted 2 lines · Artem Bityutskiy
+ * @dev_id: device ID part of the full chip ID array (refers the same memory
+ * address as @id[0])Here it should be @id[1] instead.
this patch causes a compiler error.
Should be fine now, thanks!
Signature · 2 lines
Best Regards, Artem Bityutskiy
Artem Bityutskiy
AppliedQuoted 8 lines · Artem Bityutskiy
From: Artem Bityutskiy <[email protected]>
Introduce helper macros for defining NAND chips. These macros do not really add much value in the current code-base. However, we are going to add full ID support which adds some more complexity to the table, and helper macros become useful for readability.
Signed-off-by Artem Bityutskiy <[email protected]>
Pushed to l2-mtd.git. If there is more review or tags coming, I can amend the patches and re-base the tree. Thanks!
Signature · 2 lines
Best Regards, Artem Bityutskiy