mtd: nand: Get rid of busw parameter
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/11 mtd: nand: Get rid of busw parameter
Upstream commit 29a198a1592d83f2bc1be3b2631b3bcf3d5b380f
Auto-detection functions are passed a busw parameter to retrieve the actual NAND bus width and eventually set the correct value in chip->options. Rework the nand_get_flash_type() function to get rid of this extra parameter and let detection code directly set the NAND_BUSWIDTH_16 flag in chip->options if needed.
--- drivers/mtd/nand/raw/nand_base.c | 59 +++++++++++++++++--------------- 1 file changed, 32 insertions(+), 27 deletions(-)
drivers/mtd/nand/raw/nand_base.c +32 -27
@@ -3898,8 +3898,7 @@ static void nand_onfi_detect_micron(struct nand_chip *chip,/* * Check if the NAND chip is ONFI compliant, returns 1 if it is, 0 otherwise. */ -static int nand_flash_detect_onfi (struct mtd_info *mtd,struct nand_chip *chip, -int *busw) +static int nand_flash_detect_onfi (struct mtd_info *mtd,struct nand_chip *chip) {struct nand_onfi_params *p = &chip->onfi_params;char id[4 ];
@@ -3971,9 +3970,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, chip->bits_per_cell = p->bits_per_cell;if (onfi_feature (chip) &ONFI_FEATURE_16_BIT_BUS ) - *busw =NAND_BUSWIDTH_16 ; -else - *busw =0 ; + chip->options |=NAND_BUSWIDTH_16 ;if (p->ecc_bits !=0xff ) { chip->ecc_strength_ds = p->ecc_bits;
@@ -4003,8 +4000,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, return 1; }#else -static int nand_flash_detect_onfi (struct mtd_info *mtd,struct nand_chip *chip, -int *busw) +static int nand_flash_detect_onfi (struct mtd_info *mtd,struct nand_chip *chip) {return 0 ; }
@@ -4013,8 +4009,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,/* * Check if the NAND chip is JEDEC compliant, returns 1 if it is, 0 otherwise. */ -static int nand_flash_detect_jedec (struct mtd_info *mtd,struct nand_chip *chip, -int *busw) +static int nand_flash_detect_jedec (struct mtd_info *mtd,struct nand_chip *chip) {struct nand_jedec_params *p = &chip->jedec_params;struct jedec_ecc_info *ecc;
@@ -4076,9 +4071,7 @@ static int nand_flash_detect_jedec(struct mtd_info *mtd, struct nand_chip *chip, chip->bits_per_cell = p->bits_per_cell;if (jedec_feature (chip) &JEDEC_FEATURE_16_BIT_BUS ) - *busw =NAND_BUSWIDTH_16 ; -else - *busw =0 ; + chip->options |=NAND_BUSWIDTH_16 ;/* ECC info */ ecc = &p->ecc_info[0 ];
@@ -4168,7 +4161,7 @@ static int nand_get_bits_per_cell(u8 cellinfo)* manufacturer-specific "extended ID" decoding patterns. */ static void nand_decode_ext_id (struct mtd_info *mtd,struct nand_chip *chip, -u8 id_data[8 ],int *busw) +u8 id_data[8 ]) {int extid, id_len;/* The 3rd id byte holds MLC / multichip data */
@@ -4221,7 +4214,6 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip,/* Calc blocksize */ mtd->erasesize = (128 *1024 ) << (((extid >>1 ) &0x04 ) | (extid &0x03 )); - *busw =0 ; }else if (id_len ==6 && id_data[0 ] ==NAND_MFR_HYNIX && !nand_is_slc (chip)) {unsigned int tmp;
@@ -4262,7 +4254,6 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, mtd->erasesize =768 *1024 ; else mtd->erasesize = (64 * 1024) << tmp; - *busw =0 ; }else {/* Calc pagesize */ mtd->writesize =1024 << (extid &0x03 );
@@ -4275,7 +4266,9 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, mtd->erasesize = (64 *1024 ) << (extid &0x03 ); extid >>=2 ;/* Get buswidth information */ - *busw = (extid &0x01 ) ?NAND_BUSWIDTH_16 :0 ; +/* Get buswidth information */ +if (extid &0x1 ) + chip->options |=NAND_BUSWIDTH_16 ;/* * Toshiba 24nm raw SLC (i.e., not BENAND) have 32B OOB per
@@ -4301,15 +4294,13 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip,* the chip. */ static void nand_decode_id (struct mtd_info *mtd,struct nand_chip *chip, -struct nand_flash_dev *type,u8 id_data[8 ], -int *busw) +struct nand_flash_dev *type,u8 id_data[8 ]) {int maf_id = id_data[0 ]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize; mtd->oobsize = mtd->writesize /32 ; - *busw = type->options &NAND_BUSWIDTH_16 ;/* All legacy ID NAND are small-page, SLC */ chip->bits_per_cell =1 ;
@@ -4371,7 +4362,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) }static bool find_full_id_nand (struct mtd_info *mtd,struct nand_chip *chip, -struct nand_flash_dev *type,u8 *id_data,int *busw) +struct nand_flash_dev *type,u8 *id_data) {if (!strncmp ((char *)type->id, (char *)id_data, type->id_len)) { mtd->writesize = type->pagesize;
@@ -4386,8 +4377,6 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, chip->onfi_timing_mode_default = type->onfi_timing_mode_default; - *busw = type->options &NAND_BUSWIDTH_16 ; -if (!mtd->name) mtd->name = type->name;
@@ -4449,9 +4438,24 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,if (!type) type = nand_flash_ids; +/* +* Save the NAND_BUSWIDTH_16 flag before letting auto-detection logic +* override it. +* This is required to make sure initial NAND bus width set by the +* NAND controller driver is coherent with the real NAND bus width +* (extracted by auto-detection code). +*/ + busw = chip->options &NAND_BUSWIDTH_16 ; + +/* +* The flag is only set (never cleared), reset it to its default value +* before starting auto-detection. +*/ + chip->options &= ~NAND_BUSWIDTH_16 ; +for (; type->name !=NULL ; type++) {if (is_full_id_nand (type)) { -if (find_full_id_nand (mtd, chip, type, id_data, &busw)) +if (find_full_id_nand (mtd, chip, type, id_data)) goto ident_done; }else if (*dev_id == type->dev_id) {break ;
@@ -4461,11 +4465,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->onfi_version =0 ;if (!type->name || !type->pagesize) {/* Check if the chip is ONFI compliant */ -if (nand_flash_detect_onfi (mtd, chip, &busw)) +if (nand_flash_detect_onfi (mtd, chip)) goto ident_done;/* Check if the chip is JEDEC compliant */ -if (nand_flash_detect_jedec (mtd, chip, &busw)) +if (nand_flash_detect_jedec (mtd, chip)) goto ident_done; }
@@ -4479,10 +4483,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,if (!type->pagesize) {/* Decode parameters from extended ID */ -nand_decode_ext_id (mtd, chip, id_data, &busw); +nand_decode_ext_id (mtd, chip, id_data); }else { -nand_decode_id (mtd, chip, type, id_data, &busw); +nand_decode_id (mtd, chip, type, id_data); } +/* Get chip options */ chip->options |= type->options;
Signature · 1 line
2.34.1
PATCH 2/11 mtd: nand: Store nand ID in struct nand_chip
In reply to a message not in the archiveUpstream commit 7f501f0a72036dc29ad9a53811474c393634b401
Store the NAND ID in struct nand_chip to avoid passing id_data and id_len as function parameters.
--- drivers/mtd/nand/raw/nand_base.c | 54 ++++++++++++++++---------------- include/linux/mtd/rawnand.h | 15 +++++++++ 2 files changed, 42 insertions(+), 27 deletions(-)
drivers/mtd/nand/raw/nand_base.c +27 -27
@@ -4160,16 +4160,14 @@ static int nand_get_bits_per_cell(u8 cellinfo)* chip. The rest of the parameters must be decoded according to generic or * manufacturer-specific "extended ID" decoding patterns. */ -static void nand_decode_ext_id (struct mtd_info *mtd,struct nand_chip *chip, -u8 id_data[8 ]) +static void nand_decode_ext_id (struct mtd_info *mtd,struct nand_chip *chip) {int extid, id_len;/* The 3rd id byte holds MLC / multichip data */ - chip->bits_per_cell =nand_get_bits_per_cell (id_data[2 ]); + chip->bits_per_cell =nand_get_bits_per_cell (chip->id.data[2 ]);/* The 4th id byte is the important one */ - extid = id_data[3 ]; - - id_len =nand_id_len (id_data,8 ); + extid = chip->id.data[3 ]; + id_len = chip->id.len;/* * Field definitions are in the following datasheets:
@@ -4180,8 +4178,8 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip,* Check for ID length, non-zero 6th byte, cell type, and Hynix/Samsung * ID to decide what to do. */ -if (id_len ==6 && id_data[0 ] ==NAND_MFR_SAMSUNG && - !nand_is_slc (chip) && id_data[5 ] !=0x00 ) { +if (id_len ==6 && chip->id.data[0 ] ==NAND_MFR_SAMSUNG && + !nand_is_slc (chip) && chip->id.data[5 ] !=0x00 ) {/* Calc pagesize */ mtd->writesize =2048 << (extid &0x03 ); extid >>=2 ;
@@ -4214,7 +4212,7 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip,/* Calc blocksize */ mtd->erasesize = (128 *1024 ) << (((extid >>1 ) &0x04 ) | (extid &0x03 )); - }else if (id_len ==6 && id_data[0 ] ==NAND_MFR_HYNIX && + }else if (id_len ==6 && chip->id.data[0 ] ==NAND_MFR_HYNIX && !nand_is_slc (chip)) {unsigned int tmp;
@@ -4278,10 +4276,10 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip,* 110b -> 24nm * - ID byte 5, bit[7]: 1 -> BENAND, 0 -> raw SLC */ -if (id_len >=6 && id_data[0 ] ==NAND_MFR_TOSHIBA && +if (id_len >=6 && chip->id.data[0 ] ==NAND_MFR_TOSHIBA &&nand_is_slc (chip) && - (id_data[5 ] &0x7 ) ==0x6 /* 24nm */ && - !(id_data[4 ] &0x80 )/* !BENAND */ ) { + (chip->id.data[5 ] &0x7 ) ==0x6 /* 24nm */ && + !(chip->id.data[4 ] &0x80 )/* !BENAND */ ) { mtd->oobsize =32 * mtd->writesize >>9 ; }
@@ -4294,9 +4292,9 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip,* the chip. */ static void nand_decode_id (struct mtd_info *mtd,struct nand_chip *chip, -struct nand_flash_dev *type,u8 id_data[8 ]) +struct nand_flash_dev *type) { -int maf_id = id_data[0 ]; +int maf_id = chip->id.data[0 ]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize;
@@ -4311,11 +4309,11 @@ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip,* listed in nand_ids table. * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39) */ -if (maf_id ==NAND_MFR_AMD && id_data[4 ] !=0x00 && id_data[5 ] ==0x00 - && id_data[6 ] ==0x00 && id_data[7 ] ==0x00 +if (maf_id ==NAND_MFR_AMD && chip->id.data[4 ] !=0x00 && chip->id.data[5 ] ==0x00 + && chip->id.data[6 ] ==0x00 && chip->id.data[7 ] ==0x00 && mtd->writesize ==512 ) { mtd->erasesize =128 *1024 ; - mtd->erasesize <<= ((id_data[3 ] &0x03 ) <<1 ); + mtd->erasesize <<= ((chip->id.data[3 ] &0x03 ) <<1 ); } }
@@ -4325,9 +4323,9 @@ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip,* page size, cell-type information). */ static void nand_decode_bbm_options (struct mtd_info *mtd, -struct nand_chip *chip,u8 id_data[8 ]) +struct nand_chip *chip) { -int maf_id = id_data[0 ]; +int maf_id = chip->id.data[0 ];/* Set the bad block position */ if (mtd->writesize >512 || (chip->options &NAND_BUSWIDTH_16 ))
@@ -4362,14 +4360,14 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) }static bool find_full_id_nand (struct mtd_info *mtd,struct nand_chip *chip, -struct nand_flash_dev *type,u8 *id_data) +struct nand_flash_dev *type) { -if (!strncmp ((char *)type->id, (char *)id_data, type->id_len)) { +if (!strncmp ((char *)type->id, (char *)chip->id.data, type->id_len)) { mtd->writesize = type->pagesize; mtd->erasesize = type->erasesize; mtd->oobsize = type->oobsize; - chip->bits_per_cell =nand_get_bits_per_cell (id_data[2 ]); + chip->bits_per_cell =nand_get_bits_per_cell (chip->id.data[2 ]); chip->chipsize = (uint64_t )type->chipsize <<20 ; chip->options |= type->options; chip->ecc_strength_ds =NAND_ECC_STRENGTH (type);
@@ -4395,7 +4393,7 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, {int busw, ret;int maf_idx; -u8 id_data[8 ]; +u8 *id_data = chip->id.data;/* * Reset the chip, required by some chips (e.g. Micron MT29FxGxxxxx)
@@ -4453,9 +4451,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,*/ chip->options &= ~NAND_BUSWIDTH_16 ; + chip->id.len =nand_id_len (id_data,ARRAY_SIZE (chip->id.data)); +for (; type->name !=NULL ; type++) {if (is_full_id_nand (type)) { -if (find_full_id_nand (mtd, chip, type, id_data)) +if (find_full_id_nand (mtd, chip, type)) goto ident_done; }else if (*dev_id == type->dev_id) {break ;
@@ -4483,9 +4483,9 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,if (!type->pagesize) {/* Decode parameters from extended ID */ -nand_decode_ext_id (mtd, chip, id_data); +nand_decode_ext_id (mtd, chip); }else { -nand_decode_id (mtd, chip, type, id_data); +nand_decode_id (mtd, chip, type); }/* Get chip options */
@@ -4523,7 +4523,7 @@ ident_done:return ERR_PTR (-EINVAL ); } -nand_decode_bbm_options (mtd, chip, id_data); +nand_decode_bbm_options (mtd, chip);/* Calculate the address shift from the page size */ chip->page_shift =ffs (mtd->writesize) -1 ;
include/linux/mtd/rawnand.h +15 -0
@@ -507,6 +507,19 @@ static inline void nand_hw_control_init(struct nand_hw_control *nfc)init_waitqueue_head (&nfc->wq); } +/* The maximum expected count of bytes in the NAND ID sequence */ +#define NAND_MAX_ID_LEN 8 + +/** +* struct nand_id - NAND id structure +* @data: buffer containing the id bytes. +* @len: ID length. +*/ +struct nand_id { +u8 data[NAND_MAX_ID_LEN ]; +int len; +}; +/** * struct nand_ecc_step_info - ECC step information of ECC engine * @stepsize: data bytes per ECC step
@@ -888,6 +901,8 @@ nand_get_sdr_timings(const struct nand_data_interface *conf)struct nand_chip {struct mtd_info mtd; +struct nand_id id; +void __iomem *IO_ADDR_R;void __iomem *IO_ADDR_W;
Signature · 1 line
2.34.1
PATCH 3/11 mtd: nand: Add manufacturer specific initialization/detection steps
In reply to a message not in the archiveUpstream commit abbe26d144ec22bb067fa414d717b9f7ca2e12bd
A lot of NANDs are implementing generic features in a non-generic way, or are providing advanced auto-detection logic where the NAND ID bytes meaning changes with the NAND generation.
Providing this vendor specific initialization step will allow us to get rid of full-id entries in the nand_ids table or all the vendor specific cases added over the time in the generic NAND ID decoding logic.
--- drivers/mtd/nand/raw/nand_base.c | 90 +++++++++++++++++++++++++------- include/linux/mtd/rawnand.h | 30 +++++++++++ 2 files changed, 102 insertions(+), 18 deletions(-)
drivers/mtd/nand/raw/nand_base.c +72 -18
@@ -4286,6 +4286,39 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) } } +/* +* Manufacturer detection. Only used when the NAND is not ONFI or JEDEC +* compliant and does not have a full-id or legacy-id entry in the nand_ids +* table. +*/ +static void nand_manufacturer_detect (struct mtd_info *mtd,struct nand_chip *chip) +{ +/* +* Try manufacturer detection if available and use +* nand_decode_ext_id() otherwise. +*/ +if (chip->manufacturer.desc && chip->manufacturer.desc->ops && + chip->manufacturer.desc->ops->detect) + chip->manufacturer.desc->ops->detect (chip); +else +nand_decode_ext_id (mtd, chip); +} + +/* +* Manufacturer initialization. This function is called for all NANDs including +* ONFI and JEDEC compliant ones. +* Manufacturer drivers should put all their specific initialization code in +* their ->init() hook. +*/ +static int nand_manufacturer_init (struct nand_chip *chip) +{ +if (!chip->manufacturer.desc || !chip->manufacturer.desc->ops || + !chip->manufacturer.desc->ops->init) +return 0 ; + +return chip->manufacturer.desc->ops->init (chip); +} +/* * Old devices have chip data hardcoded in the device ID table. nand_decode_id * decodes a matching ID table entry and assigns the MTD size parameters for
@@ -4383,6 +4416,26 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,return false; } +/** +* nand_get_manufacturer_desc - Get manufacturer information from the +* manufacturer ID +* @id: manufacturer ID +* +* Returns a nand_manufacturer_desc object if the manufacturer is defined +* in the NAND manufacturers database, NULL otherwise. +*/ +static const struct nand_manufacturers *nand_get_manufacturer_desc (u8 id) +{ +int i; + +for (i =0 ; nand_manuf_ids[i].id !=0x0 ; i++) { +if (nand_manuf_ids[i].id == id) +return &nand_manuf_ids[i]; + } + +return NULL ; +} +/* * Get the flash and manufacturer id and lookup if the type is supported. */
@@ -4391,8 +4444,8 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, int *maf_id, int *dev_id, struct nand_flash_dev *type) { + const struct nand_manufacturers *manufacturer_desc;int busw, ret; -int maf_idx;u8 *id_data = chip->id.data;/*
@@ -4433,6 +4486,12 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,return ERR_PTR (-ENODEV ); } + chip->id.len =nand_id_len (id_data,ARRAY_SIZE (chip->id.data)); + +/* Try to identify manufacturer */ + manufacturer_desc =nand_get_manufacturer_desc (*maf_id); + chip->manufacturer.desc = manufacturer_desc; +if (!type) type = nand_flash_ids;
@@ -4451,8 +4510,6 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,*/ chip->options &= ~NAND_BUSWIDTH_16 ; - chip->id.len =nand_id_len (id_data,ARRAY_SIZE (chip->id.data)); -for (; type->name !=NULL ; type++) {if (is_full_id_nand (type)) {if (find_full_id_nand (mtd, chip, type))
@@ -4482,8 +4539,7 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->chipsize = (uint64_t )type->chipsize <<20 ;if (!type->pagesize) { -/* Decode parameters from extended ID */ -nand_decode_ext_id (mtd, chip); +nand_manufacturer_detect (mtd, chip); }else {nand_decode_id (mtd, chip, type); }
@@ -4499,12 +4555,6 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->options &= ~NAND_SAMSUNG_LP_OPTIONS ; ident_done: -/* Try to identify manufacturer */ -for (maf_idx =0 ; nand_manuf_ids[maf_idx].id !=0x0 ; maf_idx++) { -if (nand_manuf_ids[maf_idx].id == *maf_id) -break ; - } -if (chip->options &NAND_BUSWIDTH_AUTO ) {WARN_ON (chip->options &NAND_BUSWIDTH_16 ); chip->options |= busw;
@@ -4516,7 +4566,7 @@ ident_done:*/ pr_info ("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n" , *maf_id, *dev_id); -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, mtd->name); +pr_info ("%s %s\n" , manufacturer_desc->name, mtd->name);pr_warn ("bus width %d instead %d bit\n" , (chip->options &NAND_BUSWIDTH_16 ) ?16 :8 , busw ?16 :8 );
@@ -4549,28 +4599,32 @@ ident_done:if (mtd->writesize >512 && chip->cmdfunc == nand_command) chip->cmdfunc = nand_command_lp; + ret =nand_manufacturer_init (chip); +if (ret) +return ERR_PTR (ret); +pr_info ("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n" , *maf_id, *dev_id);#ifdef CONFIG_SYS_NAND_ONFI_DETECTION if (chip->onfi_version) -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, +pr_info ("%s %s\n" , manufacturer_desc->name, chip->onfi_params.model);else if (chip->jedec_version) -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, +pr_info ("%s %s\n" , manufacturer_desc->name, chip->jedec_params.model);else -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, +pr_info ("%s %s\n" , manufacturer_desc->name, type->name);#else if (chip->jedec_version) -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, +pr_info ("%s %s\n" , manufacturer_desc->name, chip->jedec_params.model);else -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, +pr_info ("%s %s\n" , manufacturer_desc->name, type->name); -pr_info ("%s %s\n" , nand_manuf_ids[maf_idx].name, +pr_info ("%s %s\n" , manufacturer_desc->name, type->name);#endif
include/linux/mtd/rawnand.h +30 -0
@@ -796,6 +796,17 @@ nand_get_sdr_timings(const struct nand_data_interface *conf)return &conf->timings.sdr; } +/** +* struct nand_manufacturer_ops - NAND Manufacturer operations +* @detect: detect the NAND memory organization and capabilities +* @init: initialize all vendor specific fields (like the ->read_retry() +* implementation) if any. +*/ +struct nand_manufacturer_ops { +void (*detect)(struct nand_chip *chip); +int (*init)(struct nand_chip *chip); +}; +/** * struct nand_chip - NAND Private Flash Chip Data * @mtd: MTD device registered to the MTD framework
@@ -897,6 +908,7 @@ nand_get_sdr_timings(const struct nand_data_interface *conf)* devices. * @priv: [OPTIONAL] pointer to private chip data * @write_page: [REPLACEABLE] High-level page write function +* @manufacturer: [INTERN] Contains manufacturer information */ struct nand_chip {
@@ -983,6 +995,11 @@ struct nand_chip {struct nand_bbt_descr *badblock_pattern;void *priv; + +struct { +const struct nand_manufacturers *desc; +void *priv; + } manufacturer; }; static inline void nand_set_flash_node(struct nand_chip *chip,
@@ -1016,6 +1033,17 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv) chip->priv = priv; } +static inline void nand_set_manufacturer_data (struct nand_chip *chip, +void *priv) +{ + chip->manufacturer.priv = priv; +} + +static inline void *nand_get_manufacturer_data (struct nand_chip *chip) +{ +return chip->manufacturer.priv; +} +/* * NAND Flash Manufacturer ID Codes */
@@ -1120,10 +1148,12 @@ struct nand_flash_dev {* struct nand_manufacturers - NAND Flash Manufacturer ID Structure * @name: Manufacturer name * @id: manufacturer ID code of device. +* @ops: manufacturer operations */ struct nand_manufacturers {int id;char *name; +const struct nand_manufacturer_ops *ops; };extern struct nand_flash_dev nand_flash_ids[];
Signature · 1 line
2.34.1
PATCH 4/11 mtd: nand: Get rid of mtd variable in function calls
In reply to a message not in the archivechip points to mtd. Passing chip is enough to have a reference to mtd when is necessary
--- drivers/mtd/nand/raw/nand_base.c | 20 +++++++++++--------- include/linux/mtd/rawnand.h | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-)
drivers/mtd/nand/raw/nand_base.c +11 -9
@@ -4160,8 +4160,9 @@ static int nand_get_bits_per_cell(u8 cellinfo)* chip. The rest of the parameters must be decoded according to generic or * manufacturer-specific "extended ID" decoding patterns. */ -static void nand_decode_ext_id (struct mtd_info *mtd,struct nand_chip *chip) +static void nand_decode_ext_id (struct nand_chip *chip) { +struct mtd_info *mtd = &chip->mtd;int extid, id_len;/* The 3rd id byte holds MLC / multichip data */ chip->bits_per_cell =nand_get_bits_per_cell (chip->id.data[2 ]);
@@ -4291,7 +4292,7 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip)* compliant and does not have a full-id or legacy-id entry in the nand_ids * table. */ -static void nand_manufacturer_detect (struct mtd_info *mtd,struct nand_chip *chip) +static void nand_manufacturer_detect (struct nand_chip *chip) {/* * Try manufacturer detection if available and use
@@ -4301,7 +4302,7 @@ static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chi chip->manufacturer.desc->ops->detect) chip->manufacturer.desc->ops->detect (chip); else -nand_decode_ext_id (mtd ,chip ); +nand_decode_ext_id (chip ); }/*
@@ -4324,9 +4325,10 @@ static int nand_manufacturer_init(struct nand_chip *chip)* decodes a matching ID table entry and assigns the MTD size parameters for * the chip. */ -static void nand_decode_id (struct mtd_info *mtd,struct nand_chip *chip, +static void nand_decode_id (struct nand_chip *chip,struct nand_flash_dev *type) { +struct mtd_info *mtd = &chip->mtd;int maf_id = chip->id.data[0 ]; mtd->erasesize = type->erasesize;
@@ -4439,11 +4441,11 @@ static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id)/* * Get the flash and manufacturer id and lookup if the type is supported. */ -struct nand_flash_dev *nand_get_flash_type (struct mtd_info *mtd, -struct nand_chip *chip, +struct nand_flash_dev *nand_get_flash_type (struct nand_chip *chip,int *maf_id,int *dev_id,struct nand_flash_dev *type) { +struct mtd_info *mtd = &chip->mtd;const struct nand_manufacturers *manufacturer_desc;int busw, ret;u8 *id_data = chip->id.data;
@@ -4539,9 +4541,9 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->chipsize = (uint64_t )type->chipsize <<20 ;if (!type->pagesize) { -nand_manufacturer_detect (mtd, chip); +nand_manufacturer_detect (chip); }else { -nand_decode_id (mtd, chip, type); +nand_decode_id (chip, type); }/* Get chip options */
@@ -4731,7 +4733,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,nand_set_defaults (chip, chip->options &NAND_BUSWIDTH_16 );/* Read the flash type */ - type =nand_get_flash_type (mtd, chip, &nand_maf_id, + type =nand_get_flash_type (chip, &nand_maf_id, &nand_dev_id, table);if (IS_ERR (type)) {
include/linux/mtd/rawnand.h +1 -2
@@ -29,8 +29,7 @@ struct nand_flash_dev;struct device_node ;/* Get the flash and manufacturer id and lookup if the type is supported. */ -struct nand_flash_dev *nand_get_flash_type (struct mtd_info *mtd, -struct nand_chip *chip, +struct nand_flash_dev *nand_get_flash_type (struct nand_chip *chip,int *maf_id,int *dev_id,struct nand_flash_dev *type);
Signature · 1 line
2.34.1
PATCH 5/11 mtd: nand: Export symbol nand_decode_ext_id
In reply to a message not in the archiveIn preparation of moving specific nand support that are not jedec or onfi
--- drivers/mtd/nand/raw/nand_base.c | 3 ++- include/linux/mtd/rawnand.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/nand_base.c +2 -1
@@ -4160,7 +4160,7 @@ static int nand_get_bits_per_cell(u8 cellinfo)* chip. The rest of the parameters must be decoded according to generic or * manufacturer-specific "extended ID" decoding patterns. */ -static void nand_decode_ext_id (struct nand_chip *chip) +void nand_decode_ext_id (struct nand_chip *chip) {struct mtd_info *mtd = &chip->mtd;int extid, id_len;
@@ -4286,6 +4286,7 @@ static void nand_decode_ext_id(struct nand_chip *chip) } } +EXPORT_SYMBOL_GPL (nand_decode_ext_id);/* * Manufacturer detection. Only used when the NAND is not ONFI or JEDEC
include/linux/mtd/rawnand.h +3 -0
@@ -1374,4 +1374,7 @@ int nand_read_data_op(struct nand_chip *chip, void *buf, unsigned int len,int nand_write_data_op (struct nand_chip *chip,const void *buf,unsigned int len,bool force_8bit); +/* Default extended ID decoding function */ +void nand_decode_ext_id (struct nand_chip *chip); +#endif /* __LINUX_MTD_RAWNAND_H */
Signature · 1 line
2.34.1
PATCH 6/11 mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c
In reply to a message not in the archiveUpstream commit c51d0ac59f24200dfdccc897ff7c3c9446c7599a
Move Samsung specific initialization and detection logic into nand_samsung.c. This is part of the "separate vendor specific code from core" cleanup process.
--- drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 50 +--------------- drivers/mtd/nand/raw/nand_ids.c | 4 +- drivers/mtd/nand/raw/nand_samsung.c | 90 +++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 2 + 5 files changed, 99 insertions(+), 50 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_samsung.c
drivers/mtd/nand/raw/Makefile +2 -1
@@ -14,7 +14,7 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_samsung.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
@@ -31,6 +31,7 @@ obj-y += nand_ids.o obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o +obj-y += nand_samsung.o obj-y += nand_timings.o endif # not spl
drivers/mtd/nand/raw/nand_base.c +3 -47
75 lines not on this page · raw message
drivers/mtd/nand/raw/nand_ids.c +2 -2
@@ -10,7 +10,7 @@#include <linux/mtd/rawnand.h> #include <linux/sizes.h> -#define LP_OPTIONS NAND_SAMSUNG_LP_OPTIONS +#define LP_OPTIONS 0#define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16)#define SP_OPTIONS NAND_NEED_READRDY
@@ -189,7 +189,7 @@ struct nand_flash_dev nand_flash_ids[] = {/* Manufacturer IDs */ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_TOSHIBA ,"Toshiba" }, - {NAND_MFR_SAMSUNG ,"Samsung" }, + {NAND_MFR_SAMSUNG ,"Samsung" , &samsung_nand_manuf_ops}, {NAND_MFR_FUJITSU ,"Fujitsu" }, {NAND_MFR_NATIONAL ,"National" }, {NAND_MFR_RENESAS ,"Renesas" },
drivers/mtd/nand/raw/nand_samsung.c new file +90 -0
90 lines not on this page · raw message
include/linux/mtd/rawnand.h +2 -0
@@ -1158,6 +1158,8 @@ struct nand_manufacturers {extern struct nand_flash_dev nand_flash_ids[];extern struct nand_manufacturers nand_manuf_ids[]; +extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; +int nand_default_bbt (struct mtd_info *mtd);int nand_markbad_bbt (struct mtd_info *mtd,loff_t offs);int nand_isreserved_bbt (struct mtd_info *mtd,loff_t offs);
Signature · 1 line
2.34.1
PATCH 7/11 mtd: nand: Move Hynix specific init/detection logic in nand_hynix.c
In reply to a message not in the archiveUpstream commit 01389b6bd2f4f7649cdbb4a99a15d9e0c05d6f8c
Move Hynix specific initialization and detection logic into nand_hynix.c. This is part of the "separate vendor specific code from core" cleanup process.
--- drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 117 ++++++++---------------------- drivers/mtd/nand/raw/nand_hynix.c | 86 ++++++++++++++++++++++ drivers/mtd/nand/raw/nand_ids.c | 2 +- include/linux/mtd/rawnand.h | 1 + 5 files changed, 121 insertions(+), 88 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_hynix.c
drivers/mtd/nand/raw/Makefile +2 -1
@@ -14,7 +14,7 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_samsung.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_samsung.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
@@ -31,6 +31,7 @@ obj-y += nand_ids.o obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o +obj-y += nand_hynix.o obj-y += nand_samsung.o obj-y += nand_timings.o
drivers/mtd/nand/raw/nand_base.c +31 -86
131 lines not on this page · raw message
drivers/mtd/nand/raw/nand_hynix.c new file +86 -0
86 lines not on this page · raw message
drivers/mtd/nand/raw/nand_ids.c +1 -1
@@ -194,7 +194,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_NATIONAL, "National"}, {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, - {NAND_MFR_HYNIX, "Hynix"}, + {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, {NAND_MFR_MICRON, "Micron"}, {NAND_MFR_AMD, "AMD/Spansion"}, {NAND_MFR_MACRONIX, "Macronix"},
include/linux/mtd/rawnand.h +1 -0
@@ -1159,6 +1159,7 @@ extern struct nand_flash_dev nand_flash_ids[];extern struct nand_manufacturers nand_manuf_ids[];extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; +extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;int nand_default_bbt (struct mtd_info *mtd);int nand_markbad_bbt (struct mtd_info *mtd,loff_t offs);
Signature · 1 line
2.34.1
PATCH 8/11 mtd: nand: Move Toshiba specific init/detection logic in nand_toshiba.c
In reply to a message not in the archiveUpstream commit 9b2d61f80b060ce3ea5af2a99e148b0b214932b2
Move Toshiba specific initialization and detection logic into nand_toshiba.c. This is part of the "separate vendor specific code from core" cleanup process.
--- drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 21 ++---------- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/nand/raw/nand_toshiba.c | 53 +++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 1 + 5 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_toshiba.c
drivers/mtd/nand/raw/Makefile +2 -1
@@ -14,7 +14,7 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_samsung.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_samsung.o nand_toshiba.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
@@ -33,6 +33,7 @@ obj-y += nand_ecc.o obj-y += nand_base.o obj-y += nand_hynix.o obj-y += nand_samsung.o +obj-y += nand_toshiba.o obj-y += nand_timings.o endif # not spl
drivers/mtd/nand/raw/nand_base.c +2 -19
@@ -4163,12 +4163,11 @@ static int nand_get_bits_per_cell(u8 cellinfo)void nand_decode_ext_id (struct nand_chip *chip) {struct mtd_info *mtd = &chip->mtd; -int extid, id_len; +int extid;/* The 3rd id byte holds MLC / multichip data */ chip->bits_per_cell =nand_get_bits_per_cell (chip->id.data[2 ]);/* The 4th id byte is the important one */ extid = chip->id.data[3 ]; - id_len = chip->id.len;/* Calc pagesize */ mtd->writesize =1024 << (extid &0x03 );
@@ -4184,21 +4183,6 @@ void nand_decode_ext_id(struct nand_chip *chip)/* Get buswidth information */ if (extid &0x1 ) chip->options |=NAND_BUSWIDTH_16 ; - -/* -* Toshiba 24nm raw SLC (i.e., not BENAND) have 32B OOB per -* 512B page. For Toshiba SLC, we decode the 5th/6th byte as -* follows: -* - ID byte 6, bits[2:0]: 100b -> 43nm, 101b -> 32nm, -* 110b -> 24nm -* - ID byte 5, bit[7]: 1 -> BENAND, 0 -> raw SLC -*/ -if (id_len >=6 && chip->id.data[0 ] ==NAND_MFR_TOSHIBA && -nand_is_slc (chip) && - (chip->id.data[5 ] &0x7 ) ==0x6 /* 24nm */ && - !(chip->id.data[4 ] &0x80 )/* !BENAND */ ) { - mtd->oobsize =32 * mtd->writesize >>9 ; - } }EXPORT_SYMBOL_GPL (nand_decode_ext_id);
@@ -4290,8 +4274,7 @@ static void nand_decode_bbm_options(struct mtd_info *mtd,* AMD/Spansion, and Macronix. All others scan only the first page. */ if ((nand_is_slc (chip) && - (maf_id ==NAND_MFR_TOSHIBA || - maf_id ==NAND_MFR_AMD || + (maf_id ==NAND_MFR_AMD || maf_id ==NAND_MFR_MACRONIX )) || (mtd->writesize ==2048 && maf_id ==NAND_MFR_MICRON )) chip->bbt_options |=NAND_BBT_SCAN2NDPAGE ;
drivers/mtd/nand/raw/nand_ids.c +1 -1
@@ -188,7 +188,7 @@ struct nand_flash_dev nand_flash_ids[] = {/* Manufacturer IDs */ struct nand_manufacturers nand_manuf_ids[] = { - {NAND_MFR_TOSHIBA ,"Toshiba" }, + {NAND_MFR_TOSHIBA ,"Toshiba" , &toshiba_nand_manuf_ops}, {NAND_MFR_SAMSUNG ,"Samsung" , &samsung_nand_manuf_ops}, {NAND_MFR_FUJITSU ,"Fujitsu" }, {NAND_MFR_NATIONAL ,"National" },
drivers/mtd/nand/raw/nand_toshiba.c new file +53 -0
53 lines not on this page · raw message
include/linux/mtd/rawnand.h +1 -0
@@ -1158,6 +1158,7 @@ struct nand_manufacturers {extern struct nand_flash_dev nand_flash_ids[];extern struct nand_manufacturers nand_manuf_ids[]; +extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;
Signature · 1 line
2.34.1
PATCH 9/11 mtd: nand: Move Micron specific init logic in nand_micron.c
In reply to a message not in the archiveUpstream commit 10d4e75c36f6c16311dde1461f318210da357219
Move Micron specific initialization logic into nand_micron.c. This is part of the "separate vendor specific code from core" cleanup process.
--- drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 33 +---------- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/nand/raw/nand_micron.c | 88 ++++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 21 +------ 5 files changed, 94 insertions(+), 53 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_micron.c
drivers/mtd/nand/raw/Makefile +2 -1
@@ -14,7 +14,7 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_samsung.o nand_toshiba.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_micron.o nand_samsung.o nand_toshiba.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
@@ -32,6 +32,7 @@ obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o obj-y += nand_hynix.o +obj-y += nand_micron.o obj-y += nand_samsung.o obj-y += nand_toshiba.o obj-y += nand_timings.o
drivers/mtd/nand/raw/nand_base.c +2 -31
@@ -3871,30 +3871,6 @@ ext_out:return ret; } -static int nand_setup_read_retry_micron (struct mtd_info *mtd,int retry_mode) -{ -struct nand_chip *chip =mtd_to_nand (mtd); -uint8_t feature[ONFI_SUBFEATURE_PARAM_LEN ] = {retry_mode}; - -return chip->onfi_set_features (mtd, chip,ONFI_FEATURE_ADDR_READ_RETRY , - feature); -} - -/* -* Configure chip properties from Micron vendor-specific ONFI table -*/ -static void nand_onfi_detect_micron (struct nand_chip *chip, -struct nand_onfi_params *p) -{ -struct nand_onfi_vendor_micron *micron = (void *)p->vendor; - -if (le16_to_cpu (p->vendor_revision) <1 ) -return ; - - chip->read_retries = micron->read_retry_options; - chip->setup_read_retry = nand_setup_read_retry_micron; -} -/* * Check if the NAND chip is ONFI compliant, returns 1 if it is, 0 otherwise. */
@@ -3994,9 +3970,6 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip) pr_warn("Could not retrieve ONFI ECC requirements\n"); } -if (p->jedec_id ==NAND_MFR_MICRON ) -nand_onfi_detect_micron (chip, p); -return 1 ; }#else
@@ -4273,10 +4246,8 @@ static void nand_decode_bbm_options(struct mtd_info *mtd,* Micron devices with 2KiB pages and on SLC Samsung, Hynix, Toshiba, * AMD/Spansion, and Macronix. All others scan only the first page. */ -if ((nand_is_slc (chip) && - (maf_id ==NAND_MFR_AMD || - maf_id ==NAND_MFR_MACRONIX )) || - (mtd->writesize ==2048 && maf_id ==NAND_MFR_MICRON )) +if (nand_is_slc (chip) && + (maf_id ==NAND_MFR_AMD || maf_id ==NAND_MFR_MACRONIX )) chip->bbt_options |=NAND_BBT_SCAN2NDPAGE ; }
drivers/mtd/nand/raw/nand_ids.c +1 -1
@@ -195,7 +195,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, - {NAND_MFR_MICRON, "Micron"}, + {NAND_MFR_MICRON, "Micron", µn_nand_manuf_ops}, {NAND_MFR_AMD, "AMD/Spansion"}, {NAND_MFR_MACRONIX, "Macronix"}, {NAND_MFR_EON, "Eon"},
drivers/mtd/nand/raw/nand_micron.c new file +88 -0
88 lines not on this page · raw message
include/linux/mtd/rawnand.h +1 -20
@@ -388,26 +388,6 @@ struct onfi_ext_param_page {*/ } __packed; -struct nand_onfi_vendor_micron { -u8 two_plane_read; -u8 read_cache; -u8 read_unique_id; -u8 dq_imped; -u8 dq_imped_num_settings; -u8 dq_imped_feat_addr; -u8 rb_pulldown_strength; -u8 rb_pulldown_strength_feat_addr; -u8 rb_pulldown_strength_num_settings; -u8 otp_mode; -u8 otp_page_start; -u8 otp_data_prot_addr; -u8 otp_num_pages; -u8 otp_feat_addr; -u8 read_retry_options; -u8 reserved[72 ]; -u8 param_revision; -} __packed; -struct jedec_ecc_info {u8 ecc_bits;u8 codeword_size;
@@ -1161,6 +1141,7 @@ extern struct nand_manufacturers nand_manuf_ids[];extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;extern const struct nand_manufacturer_ops hynix_nand_manuf_ops; +extern const struct nand_manufacturer_ops micron_nand_manuf_ops;int nand_default_bbt (struct mtd_info *mtd);int nand_markbad_bbt (struct mtd_info *mtd,loff_t offs);
Signature · 1 line
2.34.1
PATCH 10/11 mtd: nand: Move AMD/Spansion specific init/detection logic in nand_amd.c
In reply to a message not in the archiveUpstream commit 229204da53b31d576fcc1c93a33626943ea8202c
Move AMD/Spansion specific initialization/detection logic into nand_amd.c. This is part of the "separate vendor specific code from core" cleanup process.
--- drivers/mtd/nand/raw/Makefile | 4 ++- drivers/mtd/nand/raw/nand_amd.c | 53 ++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/nand_base.c | 17 +--------- drivers/mtd/nand/raw/nand_ids.c | 2 +- include/linux/mtd/rawnand.h | 1 + 5 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_amd.c
drivers/mtd/nand/raw/Makefile +3 -1
@@ -14,7 +14,8 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_micron.o nand_samsung.o nand_toshiba.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_amd.o nand_hynix.o nand_micron.o \ + nand_samsung.o nand_toshiba.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
@@ -31,6 +32,7 @@ obj-y += nand_ids.o obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o +obj-y += nand_amd.o obj-y += nand_hynix.o obj-y += nand_micron.o obj-y += nand_samsung.o
drivers/mtd/nand/raw/nand_amd.c new file +53 -0
53 lines not on this page · raw message
drivers/mtd/nand/raw/nand_base.c +1 -16
@@ -4201,7 +4201,6 @@ static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) {struct mtd_info *mtd = &chip->mtd; -int maf_id = chip->id.data[0 ]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize;
@@ -4209,19 +4208,6 @@ static void nand_decode_id(struct nand_chip *chip,/* All legacy ID NAND are small-page, SLC */ chip->bits_per_cell =1 ; - -/* -* Check for Spansion/AMD ID + repeating 5th, 6th byte since -* some Spansion chips have erasesize that conflicts with size -* listed in nand_ids table. -* Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39) -*/ -if (maf_id ==NAND_MFR_AMD && chip->id.data[4 ] !=0x00 && chip->id.data[5 ] ==0x00 - && chip->id.data[6 ] ==0x00 && chip->id.data[7 ] ==0x00 - && mtd->writesize ==512 ) { - mtd->erasesize =128 *1024 ; - mtd->erasesize <<= ((chip->id.data[3 ] &0x03 ) <<1 ); - } }/*
@@ -4246,8 +4232,7 @@ static void nand_decode_bbm_options(struct mtd_info *mtd,* Micron devices with 2KiB pages and on SLC Samsung, Hynix, Toshiba, * AMD/Spansion, and Macronix. All others scan only the first page. */ -if (nand_is_slc (chip) && - (maf_id ==NAND_MFR_AMD || maf_id ==NAND_MFR_MACRONIX )) +if (nand_is_slc (chip) && maf_id ==NAND_MFR_MACRONIX ) chip->bbt_options |=NAND_BBT_SCAN2NDPAGE ; }
drivers/mtd/nand/raw/nand_ids.c +1 -1
@@ -196,7 +196,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_STMICRO, "ST Micro"}, {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, {NAND_MFR_MICRON, "Micron", µn_nand_manuf_ops}, - {NAND_MFR_AMD, "AMD/Spansion"}, + {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops}, {NAND_MFR_MACRONIX, "Macronix"}, {NAND_MFR_EON, "Eon"}, {NAND_MFR_SANDISK, "SanDisk"},
include/linux/mtd/rawnand.h +1 -0
@@ -1142,6 +1142,7 @@ extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;extern const struct nand_manufacturer_ops micron_nand_manuf_ops; +extern const struct nand_manufacturer_ops amd_nand_manuf_ops;int nand_default_bbt (struct mtd_info *mtd);int nand_markbad_bbt (struct mtd_info *mtd,loff_t offs);
Signature · 1 line
2.34.1
PATCH 11/11 mtd: nand: Move Macronix specific initialization in nand_macronix.c
In reply to a message not in the archiveUpstream commit 3b5206f4be9b65d2f0f85b3239cf117a1d0de7ce
Move Macronix specific initialization logic into nand_macronix.c. This is part of the "separate vendor specific code from core" cleanup process.
--- drivers/mtd/nand/raw/Makefile | 4 +++- drivers/mtd/nand/raw/nand_base.c | 11 ---------- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/nand/raw/nand_macronix.c | 32 ++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 1 + 5 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_macronix.c
drivers/mtd/nand/raw/Makefile +3 -1
@@ -14,7 +14,8 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_amd.o nand_hynix.o nand_micron.o \ +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_amd.o nand_hynix.o \ + nand_macronix.o nand_micron.o \ nand_samsung.o nand_toshiba.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o
@@ -34,6 +35,7 @@ obj-y += nand_ecc.o obj-y += nand_base.o obj-y += nand_amd.o obj-y += nand_hynix.o +obj-y += nand_macronix.o obj-y += nand_micron.o obj-y += nand_samsung.o obj-y += nand_toshiba.o
drivers/mtd/nand/raw/nand_base.c +0 -11
@@ -4218,22 +4218,11 @@ static void nand_decode_id(struct nand_chip *chip,static void nand_decode_bbm_options (struct mtd_info *mtd,struct nand_chip *chip) { -int maf_id = chip->id.data[0 ]; -/* Set the bad block position */ if (mtd->writesize >512 || (chip->options &NAND_BUSWIDTH_16 )) chip->badblockpos =NAND_LARGE_BADBLOCK_POS ;else chip->badblockpos =NAND_SMALL_BADBLOCK_POS ; - -/* -* Bad block marker is stored in the last page of each block on Samsung -* and Hynix MLC devices; stored in first two pages of each block on -* Micron devices with 2KiB pages and on SLC Samsung, Hynix, Toshiba, -* AMD/Spansion, and Macronix. All others scan only the first page. -*/ -if (nand_is_slc (chip) && maf_id ==NAND_MFR_MACRONIX ) - chip->bbt_options |=NAND_BBT_SCAN2NDPAGE ; }static inline bool is_full_id_nand (struct nand_flash_dev *type)
drivers/mtd/nand/raw/nand_ids.c +1 -1
@@ -197,7 +197,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, {NAND_MFR_MICRON, "Micron", µn_nand_manuf_ops}, {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops}, - {NAND_MFR_MACRONIX, "Macronix"}, + {NAND_MFR_MACRONIX, "Macronix", ¯onix_nand_manuf_ops}, {NAND_MFR_EON, "Eon"}, {NAND_MFR_SANDISK, "SanDisk"}, {NAND_MFR_INTEL, "Intel"},
drivers/mtd/nand/raw/nand_macronix.c new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Copyright (C) 2017 Free Electrons +* Copyright (C) 2017 NextThing Co +* +* Author: Boris Brezillon <[email protected]> +* +* 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 program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/bug.h> +#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> + +static int macronix_nand_init (struct nand_chip *chip) +{ +if (nand_is_slc (chip)) + chip->bbt_options |=NAND_BBT_SCAN2NDPAGE ; + +return 0 ; +} + +const struct nand_manufacturer_ops macronix_nand_manuf_ops = { + .init = macronix_nand_init, +};
include/linux/mtd/rawnand.h +1 -0
@@ -1143,6 +1143,7 @@ extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;extern const struct nand_manufacturer_ops micron_nand_manuf_ops;extern const struct nand_manufacturer_ops amd_nand_manuf_ops; +extern const struct nand_manufacturer_ops macronix_nand_manuf_ops;int nand_default_bbt (struct mtd_info *mtd);int nand_markbad_bbt (struct mtd_info *mtd,loff_t offs);
Signature · 1 line
2.34.1