| Message ID | 20220714075131.411548-11-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 3b5206f4be9b65d2f0f85b3239cf117a1d0de7ce > > Move Macronix specific initialization logic into nand_macronix.c. This > is part of the "separate vendor specific code from core" cleanup > process. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- > 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 > > diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile > index 090bb413f7..d888eb2be5 100644 > --- a/drivers/mtd/nand/raw/Makefile > +++ b/drivers/mtd/nand/raw/Makefile > @@ -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_SPL_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 > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index baa7618923..b16300c304 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -4210,22 +4210,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) > diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c > index c78f2e0880..7602dd30f1 100644 > --- a/drivers/mtd/nand/raw/nand_ids.c > +++ b/drivers/mtd/nand/raw/nand_ids.c > @@ -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"}, > diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c > new file mode 100644 > index 0000000000..3cccb5869a > --- /dev/null > +++ b/drivers/mtd/nand/raw/nand_macronix.c > @@ -0,0 +1,32 @@ > +/* > + * 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> > + > +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, > +}; > diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h > index bb1a359a9c..aa45558b3d 100644 > --- a/include/linux/mtd/rawnand.h > +++ b/include/linux/mtd/rawnand.h > @@ -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); > -- > 2.34.1 > Looks good to me. Regards, Dario
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 090bb413f7..d888eb2be5 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -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_SPL_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 diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index baa7618923..b16300c304 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4210,22 +4210,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) diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index c78f2e0880..7602dd30f1 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -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"}, diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c new file mode 100644 index 0000000000..3cccb5869a --- /dev/null +++ b/drivers/mtd/nand/raw/nand_macronix.c @@ -0,0 +1,32 @@ +/* + * 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> + +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, +}; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index bb1a359a9c..aa45558b3d 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -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);