| Message ID | 20220714075131.411548-9-michael@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hi Michael, On Thu, Jul 14, 2022 at 9:51 AM Michael Trimarchi <michael@amarulasolutions.com> wrote: > > Upstream commit 10d4e75c36f6c16311dde1461f318210da357219 > > Move Micron specific initialization logic into nand_micron.c. This is > part of the "separate vendor specific code from core" cleanup process. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Acked-by: Richard Weinberger <richard@nod.at> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- > 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 > > diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile > index 2eb08c1a9f..bb20a04616 100644 > --- a/drivers/mtd/nand/raw/Makefile > +++ b/drivers/mtd/nand/raw/Makefile > @@ -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_SPL_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 > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index c5a5c22b12..9024948ded 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -3863,30 +3863,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. > */ > @@ -3986,9 +3962,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 > @@ -4265,10 +4238,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; > } > > diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c > index 509652c8e2..bb5ac8337f 100644 > --- a/drivers/mtd/nand/raw/nand_ids.c > +++ b/drivers/mtd/nand/raw/nand_ids.c > @@ -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"}, > diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c > new file mode 100644 > index 0000000000..a99bf8bbec > --- /dev/null > +++ b/drivers/mtd/nand/raw/nand_micron.c > @@ -0,0 +1,88 @@ > +/* > + * Copyright (C) 2017 Free Electrons > + * Copyright (C) 2017 NextThing Co > + * > + * Author: Boris Brezillon <boris.brezillon@free-electrons.com> > + * > + * 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> > + > +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; > + > +static int micron_nand_setup_read_retry(struct mtd_info *mtd, int retry_mode) > +{ > + struct nand_chip *chip = mtd_to_nand(mtd); > + u8 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 int micron_nand_onfi_init(struct nand_chip *chip) > +{ > + struct nand_onfi_params *p = &chip->onfi_params; > + struct nand_onfi_vendor_micron *micron = (void *)p->vendor; > + > + if (!chip->onfi_version) > + return 0; > + > + if (le16_to_cpu(p->vendor_revision) < 1) > + return 0; > + > + chip->read_retries = micron->read_retry_options; > + chip->setup_read_retry = micron_nand_setup_read_retry; > + > + return 0; > +} > + > +static int micron_nand_init(struct nand_chip *chip) > +{ > + struct mtd_info *mtd = nand_to_mtd(chip); > + int ret; > + > + ret = micron_nand_onfi_init(chip); > + if (ret) > + return ret; > + > + if (mtd->writesize == 2048) > + chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; > + > + return 0; > +} > + > +const struct nand_manufacturer_ops micron_nand_manuf_ops = { > + .init = micron_nand_init, > +}; > diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h > index 73abb34016..ec0f77b24b 100644 > --- a/include/linux/mtd/rawnand.h > +++ b/include/linux/mtd/rawnand.h > @@ -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); > -- > 2.34.1 > Looks good to me. Regards, Dario
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 2eb08c1a9f..bb20a04616 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -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_SPL_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 diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index c5a5c22b12..9024948ded 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -3863,30 +3863,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. */ @@ -3986,9 +3962,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 @@ -4265,10 +4238,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; } diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index 509652c8e2..bb5ac8337f 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -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"}, diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c new file mode 100644 index 0000000000..a99bf8bbec --- /dev/null +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2017 Free Electrons + * Copyright (C) 2017 NextThing Co + * + * Author: Boris Brezillon <boris.brezillon@free-electrons.com> + * + * 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> + +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; + +static int micron_nand_setup_read_retry(struct mtd_info *mtd, int retry_mode) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + u8 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 int micron_nand_onfi_init(struct nand_chip *chip) +{ + struct nand_onfi_params *p = &chip->onfi_params; + struct nand_onfi_vendor_micron *micron = (void *)p->vendor; + + if (!chip->onfi_version) + return 0; + + if (le16_to_cpu(p->vendor_revision) < 1) + return 0; + + chip->read_retries = micron->read_retry_options; + chip->setup_read_retry = micron_nand_setup_read_retry; + + return 0; +} + +static int micron_nand_init(struct nand_chip *chip) +{ + struct mtd_info *mtd = nand_to_mtd(chip); + int ret; + + ret = micron_nand_onfi_init(chip); + if (ret) + return ret; + + if (mtd->writesize == 2048) + chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; + + return 0; +} + +const struct nand_manufacturer_ops micron_nand_manuf_ops = { + .init = micron_nand_init, +}; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 73abb34016..ec0f77b24b 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -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);