Subject: [PATCH v4 07/35] mtd: rawnand: fsmc: convert driver to nand_scan()

From: [email-masked] (Boris Brezillon)
Date: Sat, 21 Jul 2018 08:55:03 +0200

On Fri, 20 Jul 2018 17:14:59 +0200
Miquel Raynal <[email-masked]> wrote:

> Two helpers have been added to the core to make ECC-related
> configuration between the detection phase and the final NAND scan. Use
> these hooks and convert the driver to just use nand_scan() instead of
> both nand_scan_ident() and nand_scan_tail().
> 
> Signed-off-by: Miquel Raynal <[email-masked]>

Reviewed-by: Boris Brezillon <[email-masked]>

> ---
>  drivers/mtd/nand/raw/fsmc_nand.c | 148 +++++++++++++++++++++------------------
>  1 file changed, 78 insertions(+), 70 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
> index 59524d181bfe..f418236fa020 100644
> --- a/drivers/mtd/nand/raw/fsmc_nand.c
> +++ b/drivers/mtd/nand/raw/fsmc_nand.c
> @@ -919,6 +919,82 @@ static int fsmc_nand_probe_config_dt(struct platform_device *pdev,
>  	return 0;
>  }
>  
> +static int fsmc_nand_attach_chip(struct nand_chip *nand)
> +{
> +	struct mtd_info *mtd = nand_to_mtd(nand);
> +	struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
> +
> +	if (AMBA_REV_BITS(host->pid) >= 8) {
> +		switch (mtd->oobsize) {
> +		case 16:
> +		case 64:
> +		case 128:
> +		case 224:
> +		case 256:
> +			break;
> +		default:
> +			dev_warn(host->dev,
> +				 "No oob scheme defined for oobsize %d\n",
> +				 mtd->oobsize);
> +			return -EINVAL;
> +		}
> +
> +		mtd_set_ooblayout(mtd, &fsmc_ecc4_ooblayout_ops);
> +
> +		return 0;
> +	}
> +
> +	switch (nand->ecc.mode) {
> +	case NAND_ECC_HW:
> +		dev_info(host->dev, "Using 1-bit HW ECC scheme\n");
> +		nand->ecc.calculate = fsmc_read_hwecc_ecc1;
> +		nand->ecc.correct = nand_correct_data;
> +		nand->ecc.bytes = 3;
> +		nand->ecc.strength = 1;
> +		break;
> +
> +	case NAND_ECC_SOFT:
> +		if (nand->ecc.algo == NAND_ECC_BCH) {
> +			dev_info(host->dev,
> +				 "Using 4-bit SW BCH ECC scheme\n");
> +			break;
> +		}
> +
> +	case NAND_ECC_ON_DIE:
> +		break;
> +
> +	default:
> +		dev_err(host->dev, "Unsupported ECC mode!\n");
> +		return -ENOTSUPP;
> +	}
> +
> +	/*
> +	 * Don't set layout for BCH4 SW ECC. This will be
> +	 * generated later in nand_bch_init() later.
> +	 */
> +	if (nand->ecc.mode == NAND_ECC_HW) {
> +		switch (mtd->oobsize) {
> +		case 16:
> +		case 64:
> +		case 128:
> +			mtd_set_ooblayout(mtd,
> +					  &fsmc_ecc1_ooblayout_ops);
> +			break;
> +		default:
> +			dev_warn(host->dev,
> +				 "No oob scheme defined for oobsize %d\n",
> +				 mtd->oobsize);
> +			return -EINVAL;
> +		}
> +	}
> +
> +	return 0;
> +}
> +
> +static const struct nand_controller_ops fsmc_nand_controller_ops = {
> +	.attach_chip = fsmc_nand_attach_chip,
> +};
> +
>  /*
>   * fsmc_nand_probe - Probe function
>   * @pdev:       platform device structure
> @@ -1048,76 +1124,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
>  	/*
>  	 * Scan to find existence of the device
>  	 */
> -	ret = nand_scan_ident(mtd, 1, NULL);
> -	if (ret) {
> -		dev_err(&pdev->dev, "No NAND Device found!\n");
> -		goto release_dma_write_chan;
> -	}
> -
> -	if (AMBA_REV_BITS(host->pid) >= 8) {
> -		switch (mtd->oobsize) {
> -		case 16:
> -		case 64:
> -		case 128:
> -		case 224:
> -		case 256:
> -			break;
> -		default:
> -			dev_warn(&pdev->dev, "No oob scheme defined for oobsize %d\n",
> -				 mtd->oobsize);
> -			ret = -EINVAL;
> -			goto release_dma_write_chan;
> -		}
> -
> -		mtd_set_ooblayout(mtd, &fsmc_ecc4_ooblayout_ops);
> -	} else {
> -		switch (nand->ecc.mode) {
> -		case NAND_ECC_HW:
> -			dev_info(&pdev->dev, "Using 1-bit HW ECC scheme\n");
> -			nand->ecc.calculate = fsmc_read_hwecc_ecc1;
> -			nand->ecc.correct = nand_correct_data;
> -			nand->ecc.bytes = 3;
> -			nand->ecc.strength = 1;
> -			break;
> -
> -		case NAND_ECC_SOFT:
> -			if (nand->ecc.algo == NAND_ECC_BCH) {
> -				dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n");
> -				break;
> -			}
> -
> -		case NAND_ECC_ON_DIE:
> -			break;
> -
> -		default:
> -			dev_err(&pdev->dev, "Unsupported ECC mode!\n");
> -			goto release_dma_write_chan;
> -		}
> -
> -		/*
> -		 * Don't set layout for BCH4 SW ECC. This will be
> -		 * generated later in nand_bch_init() later.
> -		 */
> -		if (nand->ecc.mode == NAND_ECC_HW) {
> -			switch (mtd->oobsize) {
> -			case 16:
> -			case 64:
> -			case 128:
> -				mtd_set_ooblayout(mtd,
> -						  &fsmc_ecc1_ooblayout_ops);
> -				break;
> -			default:
> -				dev_warn(&pdev->dev,
> -					 "No oob scheme defined for oobsize %d\n",
> -					 mtd->oobsize);
> -				ret = -EINVAL;
> -				goto release_dma_write_chan;
> -			}
> -		}
> -	}
> -
> -	/* Second stage of scan to fill MTD data-structures */
> -	ret = nand_scan_tail(mtd);
> +	nand->dummy_controller.ops = &fsmc_nand_controller_ops;
> +	ret = nand_scan(mtd, 1);
>  	if (ret)
>  		goto release_dma_write_chan;
>