From mboxrd@z Thu Jan 1 00:00:00 1970 From: miquel.raynal@bootlin.com (Miquel Raynal) Date: Fri, 2 Mar 2018 18:03:59 +0100 Subject: [PATCH 51/52] mtd: rawnand: do not export nand_scan_[ident|tail]() anymore In-Reply-To: <20180302170400.6712-1-miquel.raynal@bootlin.com> References: <20180302170400.6712-1-miquel.raynal@bootlin.com> Message-ID: <20180302170400.6712-52-miquel.raynal@bootlin.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Both nand_scan_ident() and nand_scan_tail() helpers used to be called directly from controller drivers that needed to tweak some ECC-related parameters before nand_scan_tail(). This separation prevented dynamic allocations during the phase of NAND identification, which was inconvenient. All controller drivers have been moved to use nand_scan(), in conjunction with the chip->ecc.[attach|detach]_chip() hooks that actually do the required tweaking sequence between both ident/tail calls, allowing programmers to use dynamic allocation as they need all across the scanning sequence. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/nand_base.c | 54 ++++++++++++++++++++++++++++++++-------- include/linux/mtd/rawnand.h | 12 +++------ 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 0d850dbf843d..82d52112907f 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -5100,6 +5100,7 @@ static int nand_flash_detect_onfi(struct nand_chip *chip) { struct mtd_info *mtd = nand_to_mtd(chip); struct nand_onfi_params *p; + char *model; char id[4]; int i, ret, val; @@ -5159,7 +5160,14 @@ static int nand_flash_detect_onfi(struct nand_chip *chip) sanitize_string(p->manufacturer, sizeof(p->manufacturer)); sanitize_string(p->model, sizeof(p->model)); - memcpy(chip->parameters.model, p->model, sizeof(p->model)); + model = kzalloc(sizeof(p->model), GFP_KERNEL); + if (!model) { + ret = -ENOMEM; + goto free_onfi_param_page; + } + + memcpy(model, p->model, sizeof(p->model)); + chip->parameters.model = model; if (!mtd->name) mtd->name = chip->parameters.model; @@ -5240,6 +5248,7 @@ static int nand_flash_detect_jedec(struct nand_chip *chip) struct mtd_info *mtd = nand_to_mtd(chip); struct nand_jedec_params *p; struct jedec_ecc_info *ecc; + char *model; char id[5]; int i, val, ret; @@ -5290,7 +5299,14 @@ static int nand_flash_detect_jedec(struct nand_chip *chip) sanitize_string(p->manufacturer, sizeof(p->manufacturer)); sanitize_string(p->model, sizeof(p->model)); - memcpy(chip->parameters.model, p->model, sizeof(p->model)); + model = kzalloc(sizeof(p->model), GFP_KERNEL); + if (!p) { + ret = -ENOMEM; + goto free_jedec_param_page; + } + + memcpy(model, p->model, sizeof(p->model)); + chip->parameters.model = model; if (!mtd->name) mtd->name = chip->parameters.model; @@ -5858,7 +5874,7 @@ static int nand_dt_init(struct nand_chip *chip) } /** - * nand_scan_ident - [NAND Interface] Scan for the NAND device + * nand_scan_ident - Scan for the NAND device * @mtd: MTD device structure * @maxchips: number of chips to scan for * @table: alternative NAND ID table @@ -5866,9 +5882,13 @@ static int nand_dt_init(struct nand_chip *chip) * This is the first phase of the normal nand_scan() function. It reads the * flash ID and sets up MTD fields accordingly. * + * This helper used to be called directly from controller drivers that needed + * to tweak some ECC-related parameters before nand_scan_tail(). This separation + * prevented dynamic allocations during this phase which was unconvenient and + * as been banned for the benefit of the ->init_ecc()/cleanup_ecc() hooks. */ -int nand_scan_ident(struct mtd_info *mtd, int maxchips, - struct nand_flash_dev *table) +static int nand_scan_ident(struct mtd_info *mtd, int maxchips, + struct nand_flash_dev *table) { int i, nand_maf_id, nand_dev_id; struct nand_chip *chip = mtd_to_nand(mtd); @@ -5942,7 +5962,11 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, return 0; } -EXPORT_SYMBOL(nand_scan_ident); + +static void nand_scan_ident_cleanup(struct nand_chip *chip) +{ + kfree(chip->parameters.model); +} static int nand_set_ecc_soft_ops(struct mtd_info *mtd) { @@ -6295,14 +6319,14 @@ static bool nand_ecc_strength_good(struct mtd_info *mtd) } /** - * nand_scan_tail - [NAND Interface] Scan for the NAND device + * nand_scan_tail - Scan for the NAND device * @mtd: MTD device structure * * This is the second phase of the normal nand_scan() function. It fills out * all the uninitialized function pointers with the defaults and scans for a * bad block table if appropriate. */ -int nand_scan_tail(struct mtd_info *mtd) +static int nand_scan_tail(struct mtd_info *mtd) { struct nand_chip *chip = mtd_to_nand(mtd); struct nand_ecc_ctrl *ecc = &chip->ecc; @@ -6626,7 +6650,6 @@ int nand_scan_tail(struct mtd_info *mtd) return ret; } -EXPORT_SYMBOL(nand_scan_tail); /* * is_module_text_address() isn't exported, and it's mostly a pointless @@ -6661,12 +6684,20 @@ int nand_scan(struct mtd_info *mtd, int maxchips) if (chip->ecc.attach_chip) { ret = chip->ecc.attach_chip(chip); if (ret) - return ret; + goto cleanup_ident; } ret = nand_scan_tail(mtd); + if (ret) + goto detach_chip; + + return 0; + +detach_chip: if (ret && chip->ecc.detach_chip) chip->ecc.detach_chip(chip); +cleanup_ident: + nand_scan_ident_cleanup(chip); return ret; } @@ -6699,6 +6730,9 @@ void nand_cleanup(struct nand_chip *chip) /* Free controller specific allocations after chip identification */ if (chip->ecc.detach_chip) chip->ecc.detach_chip(chip); + + /* Free identification phase allocations */ + nand_scan_ident_cleanup(chip); } EXPORT_SYMBOL_GPL(nand_cleanup); diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 318c73a206fc..9e15256bef2b 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -29,15 +29,11 @@ struct device_node; /* Scan and identify a NAND device */ int nand_scan(struct mtd_info *mtd, int max_chips); + /* - * Separate phases of nand_scan(), allowing board driver to intervene - * and override command or ECC setup according to flash type. + * Unregister the MTD device and free resources held by the NAND device, must be + * called on error after a successful nand_scan(). */ -int nand_scan_ident(struct mtd_info *mtd, int max_chips, - struct nand_flash_dev *table); -int nand_scan_tail(struct mtd_info *mtd); - -/* Unregister the MTD device and free resources held by the NAND device */ void nand_release(struct mtd_info *mtd); /* Internal helper for board drivers which need to override command function */ @@ -443,7 +439,7 @@ struct onfi_params { struct nand_parameters { /* Generic parameters */ - char model[100]; + const char *model; bool supports_set_get_features; DECLARE_BITMAP(set_feature_list, ONFI_FEATURE_NUMBER); DECLARE_BITMAP(get_feature_list, ONFI_FEATURE_NUMBER); -- 2.14.1