Re: [PATCH v4 3/9] mtd: nand: add more helpers in nand.h

Marek Vasut
2017-03-23T14:16:46Z

On 03/23/2017 10:43 AM, Peter Pan wrote:
> This commit adds some helpers in nand.h
^^^^^^
patch

> nand_size()
> nand_check_address()
> nand_check_oob_ops()
> nand_oob_ops_across_page()
> nand_check_erase_ops()
>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> ---
> include/linux/mtd/nand.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 62 insertions(+)
>
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
> index 54ded4c..0c52401 100644
> --- a/include/linux/mtd/nand.h
> +++ b/include/linux/mtd/nand.h
> @@ -434,6 +434,68 @@ static inline int nand_neraseblocks(struct nand_device *nand)
> }
>
> /**
> + * nand_size - Get NAND size
> + * @nand: NAND device
> + *
> + * Returns the total size exposed by @nand.
> + */
> +static inline u64 nand_size(struct nand_device *nand)
> +{
> + return nand->memorg.ndies * nand->memorg.diesize;
> +}
> +

kerneldoc missing ... fix globally

> +static inline int nand_check_address(struct nand_device *nand, loff_t addr)
> +{
> + return addr < nand_size(nand) ? 0 : -EINVAL;
> +}
> +
> +static inline int nand_check_oob_ops(struct nand_device *nand, loff_t start,
> + struct mtd_oob_ops *ops)
> +{
> + struct mtd_info *mtd = nand_to_mtd(nand);
> + int ooblen = ops->mode == MTD_OPS_AUTO_OOB ?
> + mtd->oobavail : mtd->oobsize;
> +
> + if ((!!ops->datbuf != !!ops->len) ||
> + (!!ops->oobbuf != !!ops->ooblen))
> + return -EINVAL;
> + if (ops->ooboffs >= ooblen)
> + return -EINVAL;
> + if (ops->ooboffs + ops->ooblen >
> + (nand_len_to_pages(nand, nand_size(nand)) -
> + nand_offs_to_page(nand, start)) * ooblen)

The indent here is wrong and misguiding . I think it might be better to
introduce some variables to avoid 3-line long conditions too.

> + return -EINVAL;
> +
> + return 0;
> +}
> +
> +static inline bool nand_oob_ops_across_page(struct nand_device *nand,
> + struct mtd_oob_ops *ops)
> +{
> + struct mtd_info *mtd = nand_to_mtd(nand);
> + int ooblen = ops->mode == MTD_OPS_AUTO_OOB ?
> + mtd->oobavail : mtd->oobsize;

The ooblen can probably be deduplicated by introducing some function.
Dunno if it's worth it though.

> + return (ops->ooboffs + ops->ooblen) > ooblen;
> +}
> +
> +static inline int nand_check_erase_ops(struct nand_device *nand,
> + struct erase_info *einfo)
> +{
> + /* check address align on block boundary */
> + if (einfo->addr & (nand_eraseblock_size(nand) - 1))
> + return -EINVAL;
> + /* check lendth align on block boundary */
> + if (einfo->len & (nand_eraseblock_size(nand) - 1))
> + return -EINVAL;
> + /* Do not allow erase past end of device */
> + if ((einfo->addr + einfo->len) > nand_size(nand))
> + return -EINVAL;
> +
> + return 0;
> +}
> +
> +/**
> * nand_register - Register a NAND device
> * @nand: NAND device
> *
>

--
Best regards,
Marek Vasut