[PATCH] Bug fix in kernel nand driver code for ONFI flash with unconfigured buswidth

[pekon]

Hi Willem,

On Friday 26 June 2015 05:16 AM, Willem Atsma wrote:
> Previously, when ONFI configuration succeeds the driver configuration might
> still fail in the calling function nand_get_flash_type() if the
> chip->options was not configured for the detected busw (8 or 16bit). With
> ONFI present the hardware driver does not need to be configured. However
> downstream the driver uses the chip->options field, so this patch updates
> the bits when ONFI detection succeeds.
>
> This fixes nand driver configuration on the overo-earth platform with
> micron nand flash.
>
> Signed-off-by: Willem Atsma <willem.atsma at tanglebridge.com>
> ---
>   drivers/mtd/nand/nand_base.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index ceb68ca..7b20471 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -3218,6 +3218,11 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
>   	else
>   		*busw = 0;
>
> +	/* Set the chip option here since ONFI succeeded and non-ONFI config may
> +	 * be incomplete:
> +	 */
> +	chip->options |= *busw;
> +
>   	if (p->ecc_bits != 0xff) {
>   		chip->ecc_strength_ds = p->ecc_bits;
>   		chip->ecc_step_ds = 512;
>
This patch actually causes a false-pass to the following check when 
Hardware driver incorrectly configures NAND-device width.

nand_base.c @@nand_get_flash_type(...)
------------------------------------------------------
} else if (busw != (chip->options & NAND_BUSWIDTH_16)) {
		/*
		 * Check, if buswidth is correct. Hardware drivers should set
		 * chip correct!
		 */
		pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
			*maf_id, *dev_id);
		pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, mtd->name);
		pr_warn("bus width %d instead %d bit\n",
			   (chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
			   busw ? 16 : 8);
		return ERR_PTR(-EINVAL);
	}
------------------------------------------------------

This check was added to find out if there is any mis-match because 
driver's bus-width and actual device's bus-width
(a) Driver setting (from DT or platform-data) is in chip->options
(b) Actual NAND device-width as detected from ONFI params is in *busw.

This check was explicitly added as some controllers like GPMC need to be 
pre-configured via DT or platform-data with correct bus-width even 
before the nand_probe(). So nand_probe() should check that both (a) and 
(b) are matching.

Hence, updating chip->options just after ONFI detection is not correct. 
Anyways NAND driver is not doing any other access apart from ONFI reads 
so existing implementation should be okay.

Also, as per spec all ONFI reads should work at x8 bus-width. Refer
	commit 64b37b2a63eb2f80b65c7185f0013f8ffc637ae3
	Author:     Matthieu CASTET <matthieu.castet at parrot.com>
	mtd: nand: add NAND_BUSWIDTH_AUTO to autodetect bus width


with regards, pekon