From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-mtd@lists.infradead.org
Cc: kernel@pengutronix.de, Richard Weinberger <richard@nod.at>,
Sascha Hauer <s.hauer@pengutronix.de>,
Vinod Koul <vkoul@kernel.org>, NXP Linux Team <linux-imx@nxp.com>,
Fabio Estevam <festevam@gmail.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Han Xu <han.xu@nxp.com>, Shawn Guo <shawnguo@kernel.org>
Subject: [PATCH 13/14] dmaengine: mxs: rename custom flag
Date: Tue, 21 May 2019 09:06:42 +0200 [thread overview]
Message-ID: <20190521070643.6244-14-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190521070643.6244-1-s.hauer@pengutronix.de>
The mxs dma driver uses the flags parameter in dmaengine_prep_slave_sg() for
custom flags, but still uses the dmaengine specific names of the flags.
Do a little bit better and at least give the flag a custom name.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
drivers/dma/mxs-dma.c | 4 ++--
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 17 +++++++++++------
include/linux/dma/mxs-dma.h | 2 ++
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 62ee9328aea1..c622bee7eb12 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -541,7 +541,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
ccw->bits = 0;
ccw->bits |= CCW_IRQ;
ccw->bits |= CCW_DEC_SEM;
- if (flags & DMA_CTRL_ACK)
+ if (flags & MXS_DMA_CTRL_WAIT4END)
ccw->bits |= CCW_WAIT4END;
ccw->bits |= CCW_HALT_ON_TERM;
ccw->bits |= CCW_TERM_FLUSH;
@@ -573,7 +573,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
ccw->bits &= ~CCW_CHAIN;
ccw->bits |= CCW_IRQ;
ccw->bits |= CCW_DEC_SEM;
- if (flags & DMA_CTRL_ACK)
+ if (flags & MXS_DMA_CTRL_WAIT4END)
ccw->bits |= CCW_WAIT4END;
}
}
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 9c44d6d21d04..0ec55c7620e8 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -926,7 +926,8 @@ static int gpmi_send_command(struct gpmi_nand_data *this)
sg_init_one(sgl, this->cmd_buffer, this->command_length);
dma_map_sg(this->dev, sgl, 1, DMA_TO_DEVICE);
desc = dmaengine_prep_slave_sg(channel,
- sgl, 1, DMA_MEM_TO_DEV, DMA_CTRL_ACK);
+ sgl, 1, DMA_MEM_TO_DEV,
+ MXS_DMA_CTRL_WAIT4END);
if (!desc)
return -EINVAL;
@@ -996,7 +997,8 @@ static int gpmi_send_data(struct gpmi_nand_data *this, const void *buf, int len)
/* [2] send DMA request */
prepare_data_dma(this, buf, len, DMA_TO_DEVICE);
desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
- 1, DMA_MEM_TO_DEV, DMA_CTRL_ACK);
+ 1, DMA_MEM_TO_DEV,
+ MXS_DMA_CTRL_WAIT4END);
if (!desc)
return -EINVAL;
@@ -1033,7 +1035,8 @@ static int gpmi_read_data(struct gpmi_nand_data *this, void *buf, int len)
/* [2] : send DMA request */
direct = prepare_data_dma(this, buf, len, DMA_FROM_DEVICE);
desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
- 1, DMA_DEV_TO_MEM, DMA_CTRL_ACK);
+ 1, DMA_DEV_TO_MEM,
+ MXS_DMA_CTRL_WAIT4END);
if (!desc)
return -EINVAL;
@@ -1083,7 +1086,8 @@ static int gpmi_send_page(struct gpmi_nand_data *this, dma_addr_t payload,
pio[5] = auxiliary;
desc = mxs_dmaengine_prep_pio(channel, pio, ARRAY_SIZE(pio),
- DMA_TRANS_NONE, DMA_CTRL_ACK);
+ DMA_TRANS_NONE,
+ MXS_DMA_CTRL_WAIT4END);
if (!desc)
return -EINVAL;
@@ -1140,7 +1144,8 @@ static int gpmi_read_page(struct gpmi_nand_data *this, dma_addr_t payload,
pio[4] = payload;
pio[5] = auxiliary;
desc = mxs_dmaengine_prep_pio(channel, pio, ARRAY_SIZE(pio),
- DMA_TRANS_NONE, DMA_CTRL_ACK);
+ DMA_TRANS_NONE,
+ MXS_DMA_CTRL_WAIT4END);
if (!desc)
return -EINVAL;
@@ -1157,7 +1162,7 @@ static int gpmi_read_page(struct gpmi_nand_data *this, dma_addr_t payload,
pio[1] = 0;
pio[2] = 0; /* clear GPMI_HW_GPMI_ECCCTRL, disable the BCH. */
desc = mxs_dmaengine_prep_pio(channel, pio, 3, DMA_TRANS_NONE,
- DMA_CTRL_ACK);
+ MXS_DMA_CTRL_WAIT4END);
if (!desc)
return -EINVAL;
diff --git a/include/linux/dma/mxs-dma.h b/include/linux/dma/mxs-dma.h
index 092b2a7b92ac..4a33f2c8a682 100644
--- a/include/linux/dma/mxs-dma.h
+++ b/include/linux/dma/mxs-dma.h
@@ -4,6 +4,8 @@
#include <linux/dmaengine.h>
+#define MXS_DMA_CTRL_WAIT4END BIT(31)
+
/*
* The mxs dmaengine can do PIO transfers. We pass a pointer to the PIO words
* in the second argument to dmaengine_prep_slave_sg when the direction is
--
2.20.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-05-21 7:06 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 7:06 [PATCH v4 00/14] Implement exec_op for GPMI nand driver Sascha Hauer
2019-05-21 7:06 ` [PATCH 01/14] mtd: rawnand: export NAND operation tracer Sascha Hauer
2019-06-03 8:04 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 02/14] mtd: rawnand: fsmc: Use nand_op_trace for operation tracing Sascha Hauer
2019-06-03 8:04 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 03/14] mtd: rawnand: gpmi: move all driver code into single file Sascha Hauer
2019-05-21 8:34 ` Sascha Hauer
2019-05-21 8:40 ` Miquel Raynal
2019-06-03 8:04 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 04/14] mtd: rawnand: gpmi: remove unused variable Sascha Hauer
2019-06-03 8:04 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 05/14] mtd: rawnand: gpmi: Remove unnecessary variables Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 06/14] mtd: rawnand: gpmi: read buf in nand_read_page_op Sascha Hauer
2019-05-21 7:06 ` [PATCH 07/14] mtd: rawnand: gpmi: remove unused parameters Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 08/14] mtd: rawnand: gpmi: Drop unnecessary restoring of previous chipselection Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 09/14] mtd: rawnand: gpmi: use runtime PM to manage clocks Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 10/14] dmaengine: mxs: Drop unnecessary flag Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 11/14] mtd: rawnand: gpmi: drop " Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` [PATCH 12/14] dmaengine: mxs: Add header file to be shared with gpmi nand driver Sascha Hauer
2019-06-03 8:03 ` Miquel Raynal
2019-05-21 7:06 ` Sascha Hauer [this message]
2019-06-03 8:03 ` [PATCH 13/14] dmaengine: mxs: rename custom flag Miquel Raynal
2019-05-21 7:06 ` [PATCH 14/14] mtd: rawnand: gpmi: Implement exec_op Sascha Hauer
2019-06-03 8:02 ` Miquel Raynal
2019-05-21 8:19 ` [PATCH v4 00/14] Implement exec_op for GPMI nand driver Sascha Hauer
2019-05-21 8:33 ` Miquel Raynal
-- strict thread matches above, loose matches on Subject: below --
2019-04-25 12:56 [PATCH v3 " Sascha Hauer
2019-04-25 12:56 ` [PATCH 13/14] dmaengine: mxs: rename custom flag Sascha Hauer
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=20190521070643.6244-14-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=festevam@gmail.com \
--cc=han.xu@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=shawnguo@kernel.org \
--cc=vkoul@kernel.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).