Hi Boris, Boris Brezillon <boris.brezillon at bootlin.com> wrote on Tue, 17 Jul 2018 14:03:32 +0200: > On Tue, 17 Jul 2018 11:54:54 +0200 > Miquel Raynal <miquel.raynal at bootlin.com> wrote: > > > In order to remove the limitation that forbids dynamic allocation in > > nand_scan_ident(), we must create a path that will be the same for all > > controller drivers. The idea is to use nand_scan() instead of the widely > > implemented nand_scan_ident()/nand_scan_tail() couple. In order to > > ^ used > > > achieve this, controller drivers will need to adjust some parameters > > between these two functions depending on the NAND chip wired on them. > > > > For that, a hook called ->attach_chip() is created in the > > nand_controller structure. This structure may be referenced by two ways: > > This is no longer true. Now ->attach_chip() is part of > nand_controller_ops, and nand_controller has a pointer to a > nand_controller_ops implementation. That's right. > > > 1/ if the driver does not implement its own controller, the > > chip->controller hook is not populated before nand_scan() so it > > cannot be dereferenced: use chip->hwcontrol instead (which is > > statically allocated and will be referenced later by chip->controller > > anyway). > > Not related to this patch, but I'd rename chip->hwcontrol into > chip->dummycontroller or something that clearly shows that this field > should only be used when the controller driver is dumb and can only > control a single chip. I like this idea but was not sure of a good name for it. If you are okay I'll do the change in the same patch renaming nand_hw_control -> nand_controller and nand_hw_control_init -> nand_controller_init. I think it's related enough. > > > 2/ through chip->controller if the driver implements its own controller. > > > > Another hook, ->detach_chip() is also introduced in order to clean the > > controller driver's potential allocations in case of failure of > > nand_scan_tail(). There is no need for the controller driver to call the > > ->detach_chip() hook directly upon error after a successful nand_scan(). > > In this situation, calling nand_release() as before is enough. > > > > Both ->attac/detach_chip() hooks are located in a nand_controller_ops > > structure. > > > > Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com> > > The implementation looks good (one minor comment below, but you can > ignore it if you disagree), so once you've fixed the commit message you > can add > > Acked-by: Boris Brezillon <boris.brezillon at bootlin.com> > > > --- > > drivers/mtd/nand/raw/nand_base.c | 21 +++++++++++++++++++-- > > include/linux/mtd/rawnand.h | 16 ++++++++++++++++ > > 2 files changed, 35 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > > index e21f03ee3251..5e8278281ba8 100644 > > --- a/drivers/mtd/nand/raw/nand_base.c > > +++ b/drivers/mtd/nand/raw/nand_base.c > > @@ -6710,11 +6710,23 @@ EXPORT_SYMBOL(nand_scan_tail); > > int nand_scan_with_ids(struct mtd_info *mtd, int maxchips, > > struct nand_flash_dev *ids) > > { > > + struct nand_chip *chip = mtd_to_nand(mtd); > > int ret; > > > > ret = nand_scan_ident(mtd, maxchips, ids); > > - if (!ret) > > - ret = nand_scan_tail(mtd); > > + if (ret) > > + return ret; > > + > > + if (chip->controller->ops && chip->controller->ops->attach_chip) { > > + ret = chip->controller->ops->attach_chip(chip); > > + if (ret) > > + return ret; > > + } > > + > > + ret = nand_scan_tail(mtd); > > + if (ret && chip->controller->ops && chip->controller->ops->detach_chip) > > + chip->controller->ops->detach_chip(chip); > > I'd recommend creating wrappers for detach/attach operations, just in case > you need to automate more things in there: > > static int nand_attach(struct nand_chip *chip) > { > if (chip->controller->ops && chip->controller->ops->attach_chip) > return chip->controller->ops->attach_chip(chip); > > return 0; > } > > static void nand_detach(struct nand_chip *chip) > { > if (chip->controller->ops && chip->controller->ops->detach_chip) > chip->controller->ops->detach_chip(chip); > } Even better. I'll add it. Thanks, Miqu?l