On Fri, 24 Apr 2020 19:36:24 +0200
Miquel Raynal <miquel.raynal@xxxxxxxxxxx> wrote:
> NAND controller drivers can set the NAND_USE_BOUNCE_BUFFER flag to a
> chip 'option' field. With this flag, the core is responsible of
> providing DMA-able buffers.
>
> The current behavior is to not force the use of a bounce buffer when
> the core thinks this is not needed. So in the end the name is a bit
> misleading, because in theory we will always have a DMA buffer but in
> practice it will not always be a bounce buffer.
>
> Rename this flag NAND_USE_DMA_BUFFER to be more accurate.
I would suggest renaming it NAND_CONTROLLER_NEEDS_DMAABLE_BUFFER or
NAND_CONTROLLER_USES_DMA, and maybe we should introduce NAND controller
flags (nand_controller.flags) instead of hijacking the NAND chip flags.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
> ---
> drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +-
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +-
> drivers/mtd/nand/raw/denali.c | 2 +-
> drivers/mtd/nand/raw/meson_nand.c | 2 +-
> drivers/mtd/nand/raw/mtk_nand.c | 2 +-
> drivers/mtd/nand/raw/nand_base.c | 4 ++--
> drivers/mtd/nand/raw/qcom_nandc.c | 2 +-
> drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 +-
> drivers/mtd/nand/raw/sunxi_nand.c | 2 +-
> drivers/mtd/nand/raw/tango_nand.c | 2 +-
> drivers/mtd/nand/raw/tegra_nand.c | 2 +-
> include/linux/mtd/rawnand.h | 2 +-
> 12 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
> index 3ba17a98df4d..95d106fdb54f 100644
> --- a/drivers/mtd/nand/raw/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
> @@ -1494,7 +1494,7 @@ static void atmel_nand_init(struct atmel_nand_controller *nc,
> * suitable for DMA.
> */
> if (nc->dmac)
> - chip->options |= NAND_USE_BOUNCE_BUFFER;
> + chip->options |= NAND_USE_DMA_BUFFER;
>
> /* Default to HW ECC if pmecc is available. */
> if (nc->pmecc)
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index e4e3ceeac38f..6bb927c512a9 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -2577,7 +2577,7 @@ static int brcmnand_attach_chip(struct nand_chip *chip)
> * to/from, and have nand_base pass us a bounce buffer instead, as
> * needed.
> */
> - chip->options |= NAND_USE_BOUNCE_BUFFER;
> + chip->options |= NAND_USE_DMA_BUFFER;
>
> if (chip->bbt_options & NAND_BBT_USE_FLASH)
> chip->bbt_options |= NAND_BBT_NO_OOB;
> diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
> index 6a6c919b2569..4d199fbae800 100644
> --- a/drivers/mtd/nand/raw/denali.c
> +++ b/drivers/mtd/nand/raw/denali.c
> @@ -1203,7 +1203,7 @@ int denali_chip_init(struct denali_controller *denali,
> mtd->name = "denali-nand";
>
> if (denali->dma_avail) {
> - chip->options |= NAND_USE_BOUNCE_BUFFER;
> + chip->options |= NAND_USE_DMA_BUFFER;
> chip->buf_align = 16;
> }
>
> diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
> index e961f7bebf0a..69af30cdb6eb 100644
> --- a/drivers/mtd/nand/raw/meson_nand.c
> +++ b/drivers/mtd/nand/raw/meson_nand.c
> @@ -1269,7 +1269,7 @@ meson_nfc_nand_chip_init(struct device *dev,
> nand_set_flash_node(nand, np);
> nand_set_controller_data(nand, nfc);
>
> - nand->options |= NAND_USE_BOUNCE_BUFFER;
> + nand->options |= NAND_USE_DMA_BUFFER;
> mtd = nand_to_mtd(nand);
> mtd->owner = THIS_MODULE;
> mtd->dev.parent = dev;
> diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
> index ef149e8b26d0..b02377ec12f2 100644
> --- a/drivers/mtd/nand/raw/mtk_nand.c
> +++ b/drivers/mtd/nand/raw/mtk_nand.c
> @@ -1380,7 +1380,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc,
> nand_set_flash_node(nand, np);
> nand_set_controller_data(nand, nfc);
>
> - nand->options |= NAND_USE_BOUNCE_BUFFER | NAND_SUBPAGE_READ;
> + nand->options |= NAND_USE_DMA_BUFFER | NAND_SUBPAGE_READ;
> nand->legacy.dev_ready = mtk_nfc_dev_ready;
> nand->legacy.select_chip = mtk_nfc_select_chip;
> nand->legacy.write_byte = mtk_nfc_write_byte;
> diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
> index 27ed6189f227..db2745cf4f15 100644
> --- a/drivers/mtd/nand/raw/nand_base.c
> +++ b/drivers/mtd/nand/raw/nand_base.c
> @@ -3191,7 +3191,7 @@ static int nand_do_read_ops(struct nand_chip *chip, loff_t from,
>
> if (!aligned)
> use_bufpoi = 1;
> - else if (chip->options & NAND_USE_BOUNCE_BUFFER)
> + else if (chip->options & NAND_USE_DMA_BUFFER)
> use_bufpoi = !virt_addr_valid(buf) ||
> !IS_ALIGNED((unsigned long)buf,
> chip->buf_align);
> @@ -4017,7 +4017,7 @@ static int nand_do_write_ops(struct nand_chip *chip, loff_t to,
>
> if (part_pagewr)
> use_bufpoi = 1;
> - else if (chip->options & NAND_USE_BOUNCE_BUFFER)
> + else if (chip->options & NAND_USE_DMA_BUFFER)
> use_bufpoi = !virt_addr_valid(buf) ||
> !IS_ALIGNED((unsigned long)buf,
> chip->buf_align);
> diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
> index 5b11c7061497..9be1bd719da4 100644
> --- a/drivers/mtd/nand/raw/qcom_nandc.c
> +++ b/drivers/mtd/nand/raw/qcom_nandc.c
> @@ -2836,7 +2836,7 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc,
> chip->legacy.block_markbad = qcom_nandc_block_markbad;
>
> chip->controller = &nandc->controller;
> - chip->options |= NAND_NO_SUBPAGE_WRITE | NAND_USE_BOUNCE_BUFFER |
> + chip->options |= NAND_NO_SUBPAGE_WRITE | NAND_USE_DMA_BUFFER |
> NAND_SKIP_BBTSCAN;
>
> /* set up initial status value */
> diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
> index 46b7d04e2c87..496bac45c695 100644
> --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
> +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
> @@ -1987,7 +1987,7 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
>
> chip->controller = &fmc2->base;
> chip->options |= NAND_BUSWIDTH_AUTO | NAND_NO_SUBPAGE_WRITE |
> - NAND_USE_BOUNCE_BUFFER;
> + NAND_USE_DMA_BUFFER;
>
> /* Default ECC settings */
> chip->ecc.mode = NAND_ECC_HW;
> diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
> index 18ac0b36abfa..3eaf5526628b 100644
> --- a/drivers/mtd/nand/raw/sunxi_nand.c
> +++ b/drivers/mtd/nand/raw/sunxi_nand.c
> @@ -1698,7 +1698,7 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
> ecc->read_page = sunxi_nfc_hw_ecc_read_page_dma;
> ecc->read_subpage = sunxi_nfc_hw_ecc_read_subpage_dma;
> ecc->write_page = sunxi_nfc_hw_ecc_write_page_dma;
> - nand->options |= NAND_USE_BOUNCE_BUFFER;
> + nand->options |= NAND_USE_DMA_BUFFER;
> } else {
> ecc->read_page = sunxi_nfc_hw_ecc_read_page;
> ecc->read_subpage = sunxi_nfc_hw_ecc_read_subpage;
> diff --git a/drivers/mtd/nand/raw/tango_nand.c b/drivers/mtd/nand/raw/tango_nand.c
> index 9acf2de37ee0..026db1be2cba 100644
> --- a/drivers/mtd/nand/raw/tango_nand.c
> +++ b/drivers/mtd/nand/raw/tango_nand.c
> @@ -568,7 +568,7 @@ static int chip_init(struct device *dev, struct device_node *np)
> chip->legacy.select_chip = tango_select_chip;
> chip->legacy.cmd_ctrl = tango_cmd_ctrl;
> chip->legacy.dev_ready = tango_dev_ready;
> - chip->options = NAND_USE_BOUNCE_BUFFER |
> + chip->options = NAND_USE_DMA_BUFFER |
> NAND_NO_SUBPAGE_WRITE |
> NAND_WAIT_TCCS;
> chip->controller = &nfc->hw;
> diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
> index 6a255ba0f288..1b9ea0225047 100644
> --- a/drivers/mtd/nand/raw/tegra_nand.c
> +++ b/drivers/mtd/nand/raw/tegra_nand.c
> @@ -1115,7 +1115,7 @@ static int tegra_nand_chips_init(struct device *dev,
> if (!mtd->name)
> mtd->name = "tegra_nand";
>
> - chip->options = NAND_NO_SUBPAGE_WRITE | NAND_USE_BOUNCE_BUFFER;
> + chip->options = NAND_NO_SUBPAGE_WRITE | NAND_USE_DMA_BUFFER;
>
> ret = nand_scan(chip, 1);
> if (ret)
> diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
> index dee4578d2389..21753b83d536 100644
> --- a/include/linux/mtd/rawnand.h
> +++ b/include/linux/mtd/rawnand.h
> @@ -201,7 +201,7 @@ enum nand_ecc_algo {
> * This option could be defined by controller drivers to protect against
> * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
> */
> -#define NAND_USE_BOUNCE_BUFFER BIT(22)
> +#define NAND_USE_DMA_BUFFER BIT(22)
>
> /*
> * Do not try to tweak the timings at runtime. This is needed when the
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
- From: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
- Date: Sat, 25 Apr 2020 10:39:56 +0200
- Cc: Michal Simek <monstr@xxxxxxxxx>, Vignesh Raghavendra <vigneshr@xxxxxx>, Tudor Ambarus <Tudor.Ambarus@xxxxxxxxxxxxx>, Richard Weinberger <richard@xxxxxx>, linux-mtd@xxxxxxxxxxxxxxxxxxx, Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx>, Naga Sureshkumar Relli <nagasure@xxxxxxxxxx>
- In-reply-to: <20200424173631.14311-4-miquel.raynal@bootlin.com>
- Organization: Collabora
- References: <20200424173631.14311-1-miquel.raynal@bootlin.com> <20200424173631.14311-4-miquel.raynal@bootlin.com>
- Follow-Ups:
- Re: [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
- From: Miquel Raynal
- Re: [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
- References:
- [PATCH 00/10] Supporting restricted NAND controllers
- From: Miquel Raynal
- [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
- From: Miquel Raynal
- [PATCH 00/10] Supporting restricted NAND controllers
- Prev by Date: Re: [PATCH 02/10] mtd: rawnand: Reorder the nand_chip->options flags
- Next by Date: Re: [PATCH 04/10] mtd: rawnand: Fix comments about the use of bufpoi
- Previous by thread: [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
- Next by thread: Re: [PATCH 03/10] mtd: rawnand: Rename a NAND chip option
- Index(es):
 |