From: boris.brezillon@free-electrons.com (Boris Brezillon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mtd: nand: tango: Enforce DMA direction type
Date: Mon, 20 Feb 2017 13:35:47 +0100 [thread overview]
Message-ID: <20170220133547.06c17a12@bbrezillon> (raw)
In-Reply-To: <aebe65d0-19c9-e1a7-b98a-c25ff616dad0@sigmadesigns.com>
On Mon, 20 Feb 2017 13:30:25 +0100
Marc Gonzalez <marc_gonzalez@sigmadesigns.com> wrote:
> On 13/02/2017 10:45, Boris Brezillon wrote:
>
> > do_dma() use an integer to pass the DMA data direction information and
> > pass the same value to dmaengine_prep_slave_sg().
> >
> > Currently, DMA_{FROM,TO}_DEVICE match DMA_{DEV_TO_MEM,MEM_TO_DEV}
> > definitions so it works fine, but assuming this will always be the case
> > is not safe.
> >
> > Enforce enum dma_data_direction type in the function prototype and make
> > the enum dma_data_direction -> enum dma_transfer_direction conversion
> > explicit.
> >
> > Reported-by: Richard Weinberger <richard@nod.at>
> > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> > ---
> > drivers/mtd/nand/tango_nand.c | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
> > index 4a5e948c62df..9a0e2f85d865 100644
> > --- a/drivers/mtd/nand/tango_nand.c
> > +++ b/drivers/mtd/nand/tango_nand.c
> > @@ -223,8 +223,8 @@ static void tango_dma_callback(void *arg)
> > complete(arg);
> > }
> >
> > -static int do_dma(struct tango_nfc *nfc, int dir, int cmd, const void *buf,
> > - int len, int page)
> > +static int do_dma(struct tango_nfc *nfc, enum dma_data_direction dir, int cmd,
> > + const void *buf, int len, int page)
> > {
> > void __iomem *addr = nfc->reg_base + NFC_STATUS;
> > struct dma_chan *chan = nfc->chan;
> > @@ -238,7 +238,10 @@ static int do_dma(struct tango_nfc *nfc, int dir, int cmd, const void *buf,
> > if (dma_map_sg(chan->device->dev, &sg, 1, dir) != 1)
> > return -EIO;
> >
> > - desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir, DMA_PREP_INTERRUPT);
> > + desc = dmaengine_prep_slave_sg(chan, &sg, 1,
> > + dir == DMA_FROM_DEVICE ?
> > + DMA_DEV_TO_MEM : DMA_MEM_TO_DEV,
> > + DMA_PREP_INTERRUPT);
> > if (!desc)
> > goto dma_unmap;
> >
> >
>
> How about evaluating the ternary conditional into a temp var?
Works for me.
>
> diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
> index 4a5e948c62df..c3f145528f1d 100644
> --- a/drivers/mtd/nand/tango_nand.c
> +++ b/drivers/mtd/nand/tango_nand.c
> @@ -231,6 +231,7 @@ static int do_dma(struct tango_nfc *nfc, int dir, int cmd, const void *buf,
> struct dma_async_tx_descriptor *desc;
> struct scatterlist sg;
> struct completion tx_done;
> + int xdir = dir == DMA_TO_DEVICE ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
> int err = -EIO;
> u32 res, val;
>
> @@ -238,7 +239,7 @@ static int do_dma(struct tango_nfc *nfc, int dir, int cmd, const void *buf,
> if (dma_map_sg(chan->device->dev, &sg, 1, dir) != 1)
> return -EIO;
>
> - desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir, DMA_PREP_INTERRUPT);
> + desc = dmaengine_prep_slave_sg(chan, &sg, 1, xdir, DMA_PREP_INTERRUPT);
> if (!desc)
> goto dma_unmap;
>
next prev parent reply other threads:[~2017-02-20 12:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-13 9:45 [PATCH] mtd: nand: tango: Enforce DMA direction type Boris Brezillon
2017-02-13 10:54 ` Richard Weinberger
2017-02-20 12:30 ` Marc Gonzalez
2017-02-20 12:35 ` Boris Brezillon [this message]
2017-02-20 13:10 ` [PATCH v2] " Marc Gonzalez
2017-03-16 9:27 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170220133547.06c17a12@bbrezillon \
--to=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).