Message ID | 1479732328-18363-6-git-send-email-boris.brezillon@free-electrons.com |
---|---|
State | Superseded |
Delegated to: | Boris Brezillon |
Headers | show |
On 11/21/2016 01:45 PM, Boris Brezillon wrote: > Create the rawnand_device struct inheriting from nand_device and make > nand_chip inherit from this struct. > > The rawnand_device object should be used for the new > rawnand-device/rawnand-controller model, and fields inside nand_chip > should progressively move to the future rawnand_controller or the existing > rawnand_device struct. > > In the meantime, we make sure nand_device fields are properly initialized > by converting information stored in mtd_info and nand_chip into the > nand_memory_organization format. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/mtd/nand/raw/nand_base.c | 40 ++++++++++++++++++++++++++++++++++++++++ > include/linux/mtd/rawnand.h | 26 ++++++++++++++++++++------ > 2 files changed, 60 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index 893ec615332a..77ca2dbee341 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -3999,6 +3999,43 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, > return false; > } > > +static int rawnand_erase(struct nand_device *nand, struct erase_info *einfo) > +{ > + struct mtd_info *mtd = nand_to_mtd(nand); > + > + return nand_erase_nand(mtd, einfo, 1); > +} > + > +static int rawnand_markbad(struct nand_device *nand, int block) > +{ > + struct mtd_info *mtd = nand_to_mtd(nand); > + struct nand_chip *chip = mtd_to_nandc(mtd); > + loff_t offs = nand_eraseblock_to_offs(nand, block); > + > + return chip->block_markbad(mtd, offs); > +} > + > +static const struct nand_ops rawnand_ops = { > + .erase = rawnand_erase, > + .markbad = rawnand_markbad, > +}; > + > +static void nandc_fill_nandd(struct nand_chip *chip) > +{ > + struct mtd_info *mtd = nandc_to_mtd(chip); > + struct nand_device *nand = mtd_to_nand(mtd); > + struct nand_memory_organization *memorg = &nand->memorg; > + > + memorg->pagesize = mtd->writesize; > + memorg->oobsize = mtd->oobsize; > + memorg->eraseblocksize = mtd->erasesize; > + memorg->ndies = chip->numchips; > + memorg->diesize = chip->chipsize; > + /* TODO: fill ->planesize and ->nplanes */ When will this be addressed ? > + nand->ops = &rawnand_ops; > +} [...]
On Tue, 10 Jan 2017 20:09:15 +0100 Marek Vasut <marek.vasut@gmail.com> wrote: > On 11/21/2016 01:45 PM, Boris Brezillon wrote: > > Create the rawnand_device struct inheriting from nand_device and make > > nand_chip inherit from this struct. > > > > The rawnand_device object should be used for the new > > rawnand-device/rawnand-controller model, and fields inside nand_chip > > should progressively move to the future rawnand_controller or the existing > > rawnand_device struct. > > > > In the meantime, we make sure nand_device fields are properly initialized > > by converting information stored in mtd_info and nand_chip into the > > nand_memory_organization format. > > > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > --- > > drivers/mtd/nand/raw/nand_base.c | 40 ++++++++++++++++++++++++++++++++++++++++ > > include/linux/mtd/rawnand.h | 26 ++++++++++++++++++++------ > > 2 files changed, 60 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > > index 893ec615332a..77ca2dbee341 100644 > > --- a/drivers/mtd/nand/raw/nand_base.c > > +++ b/drivers/mtd/nand/raw/nand_base.c > > @@ -3999,6 +3999,43 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, > > return false; > > } > > > > +static int rawnand_erase(struct nand_device *nand, struct erase_info *einfo) > > +{ > > + struct mtd_info *mtd = nand_to_mtd(nand); > > + > > + return nand_erase_nand(mtd, einfo, 1); > > +} > > + > > +static int rawnand_markbad(struct nand_device *nand, int block) > > +{ > > + struct mtd_info *mtd = nand_to_mtd(nand); > > + struct nand_chip *chip = mtd_to_nandc(mtd); > > + loff_t offs = nand_eraseblock_to_offs(nand, block); > > + > > + return chip->block_markbad(mtd, offs); > > +} > > + > > +static const struct nand_ops rawnand_ops = { > > + .erase = rawnand_erase, > > + .markbad = rawnand_markbad, > > +}; > > + > > +static void nandc_fill_nandd(struct nand_chip *chip) > > +{ > > + struct mtd_info *mtd = nandc_to_mtd(chip); > > + struct nand_device *nand = mtd_to_nand(mtd); > > + struct nand_memory_organization *memorg = &nand->memorg; > > + > > + memorg->pagesize = mtd->writesize; > > + memorg->oobsize = mtd->oobsize; > > + memorg->eraseblocksize = mtd->erasesize; > > + memorg->ndies = chip->numchips; > > + memorg->diesize = chip->chipsize; > > + /* TODO: fill ->planesize and ->nplanes */ > > When will this be addressed ? We first need to extract these information from the NAND ID or the ONFI/JEDEC parameter page. I think I'll just drop those fields for now, and add them back when we have the proper infrastructure to extract this information. > > > + nand->ops = &rawnand_ops; > > +} > > [...] >
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 893ec615332a..77ca2dbee341 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -3999,6 +3999,43 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, return false; } +static int rawnand_erase(struct nand_device *nand, struct erase_info *einfo) +{ + struct mtd_info *mtd = nand_to_mtd(nand); + + return nand_erase_nand(mtd, einfo, 1); +} + +static int rawnand_markbad(struct nand_device *nand, int block) +{ + struct mtd_info *mtd = nand_to_mtd(nand); + struct nand_chip *chip = mtd_to_nandc(mtd); + loff_t offs = nand_eraseblock_to_offs(nand, block); + + return chip->block_markbad(mtd, offs); +} + +static const struct nand_ops rawnand_ops = { + .erase = rawnand_erase, + .markbad = rawnand_markbad, +}; + +static void nandc_fill_nandd(struct nand_chip *chip) +{ + struct mtd_info *mtd = nandc_to_mtd(chip); + struct nand_device *nand = mtd_to_nand(mtd); + struct nand_memory_organization *memorg = &nand->memorg; + + memorg->pagesize = mtd->writesize; + memorg->oobsize = mtd->oobsize; + memorg->eraseblocksize = mtd->erasesize; + memorg->ndies = chip->numchips; + memorg->diesize = chip->chipsize; + /* TODO: fill ->planesize and ->nplanes */ + + nand->ops = &rawnand_ops; +} + /* * Get the flash and manufacturer id and lookup if the type is supported. */ @@ -4380,6 +4417,9 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, chip->numchips = i; mtd->size = i * chip->chipsize; + /* Fill nand_device info */ + nandc_fill_nandd(chip); + return 0; } EXPORT_SYMBOL(nand_scan_ident); diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 220c2d457989..6b701efb3841 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -20,6 +20,7 @@ #include <linux/spinlock.h> #include <linux/mtd/mtd.h> #include <linux/mtd/flashchip.h> +#include <linux/mtd/nand.h> #include <linux/mtd/bbm.h> struct mtd_info; @@ -719,8 +720,21 @@ nand_get_sdr_timings(const struct nand_data_interface *conf) } /** + * struct rawnand_device - raw NAND device structure + * @base: NAND device instance (inheritance) + * + * This structure describes a raw NAND device and should progressively + * replace the nand_chip struct. + * + * Note: do not blindly move nand_chip fields into rawnand_device. + */ +struct rawnand_device { + struct nand_device base; +}; + +/** * struct nand_chip - NAND Private Flash Chip Data - * @mtd: MTD device registered to the MTD framework + * @base: raw NAND device instance (inheritance) * @IO_ADDR_R: [BOARDSPECIFIC] address to read the 8 I/O lines of the * flash device * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the @@ -820,7 +834,7 @@ nand_get_sdr_timings(const struct nand_data_interface *conf) */ struct nand_chip { - struct mtd_info mtd; + struct rawnand_device base; void __iomem *IO_ADDR_R; void __iomem *IO_ADDR_W; @@ -910,22 +924,22 @@ extern const struct mtd_ooblayout_ops nand_ooblayout_lp_ops; static inline void nand_set_flash_node(struct nand_chip *chip, struct device_node *np) { - mtd_set_of_node(&chip->mtd, np); + nand_set_of_node(&chip->base.base, np); } static inline struct device_node *nand_get_flash_node(struct nand_chip *chip) { - return mtd_get_of_node(&chip->mtd); + return nand_get_of_node(&chip->base.base); } static inline struct nand_chip *mtd_to_nandc(struct mtd_info *mtd) { - return container_of(mtd, struct nand_chip, mtd); + return container_of(mtd_to_nand(mtd), struct nand_chip, base.base); } static inline struct mtd_info *nandc_to_mtd(struct nand_chip *chip) { - return &chip->mtd; + return nand_to_mtd(&chip->base.base); } static inline void *nand_get_controller_data(struct nand_chip *chip)
Create the rawnand_device struct inheriting from nand_device and make nand_chip inherit from this struct. The rawnand_device object should be used for the new rawnand-device/rawnand-controller model, and fields inside nand_chip should progressively move to the future rawnand_controller or the existing rawnand_device struct. In the meantime, we make sure nand_device fields are properly initialized by converting information stored in mtd_info and nand_chip into the nand_memory_organization format. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> --- drivers/mtd/nand/raw/nand_base.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 26 ++++++++++++++++++++------ 2 files changed, 60 insertions(+), 6 deletions(-)