From: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
To: <vinod.koul@intel.com>, <dan.j.williams@intel.com>,
<michal.simek@xilinx.com>, <appana.durga.rao@xilinx.com>,
<radheys@xilinx.com>, <lars@metafoo.de>
Cc: <dmaengine@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [RFC 2/6] dmaengine: xilinx_dma: Pass AXI4-Stream control words to netdev dma client
Date: Mon, 2 Apr 2018 16:09:02 +0530 [thread overview]
Message-ID: <1522665546-10035-3-git-send-email-radheys@xilinx.com> (raw)
In-Reply-To: <1522665546-10035-1-git-send-email-radheys@xilinx.com>
Read DT property to check if AXI DMA is connected to axithernet.
If connected pass AXI4-Stream control words to netdev dma client.
It is mandatory that netdev dma client reserve initial memory for
max supported control words in callback_param.
Signed-off-by: Radhey Shyam Pandey <radheys@xilinx.com>
---
drivers/dma/xilinx/xilinx_dma.c | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 27b5235..16fee30 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -418,6 +418,7 @@ struct xilinx_dma_config {
* @rxs_clk: DMA s2mm stream clock
* @nr_channels: Number of channels DMA device supports
* @chan_id: DMA channel identifier
+ * @has_axieth_connected: AXI DMA connected to AXI ethernet
*/
struct xilinx_dma_device {
void __iomem *regs;
@@ -437,6 +438,7 @@ struct xilinx_dma_device {
struct clk *rxs_clk;
u32 nr_channels;
u32 chan_id;
+ bool has_axieth_connected;
};
/* Macros */
@@ -809,7 +811,10 @@ static void xilinx_dma_chan_handle_cyclic(struct xilinx_dma_chan *chan,
static void xilinx_dma_chan_desc_cleanup(struct xilinx_dma_chan *chan)
{
struct xilinx_dma_tx_descriptor *desc, *next;
+ struct xilinx_axidma_tx_segment *seg;
+ struct xilinx_axidma_desc_hw *hw;
unsigned long flags;
+ u32 *app_w;
spin_lock_irqsave(&chan->lock, flags);
@@ -821,17 +826,28 @@ static void xilinx_dma_chan_desc_cleanup(struct xilinx_dma_chan *chan)
break;
}
- /* Remove from the list of running transactions */
- list_del(&desc->node);
-
/* Run the link descriptor callback function */
dmaengine_desc_get_callback(&desc->async_tx, &cb);
- if (dmaengine_desc_callback_valid(&cb)) {
- spin_unlock_irqrestore(&chan->lock, flags);
- dmaengine_desc_callback_invoke(&cb, NULL);
- spin_lock_irqsave(&chan->lock, flags);
+
+ if (chan->xdev->has_axieth_connected) {
+ seg = list_first_entry(&desc->segments,
+ struct xilinx_axidma_tx_segment, node);
+ if (cb.callback_param) {
+ app_w = (u32 *) cb.callback_param;
+ hw = &seg->hw;
+ *app_w = hw->status & XILINX_DMA_MAX_TRANS_LEN;
+ memcpy(app_w, hw->app, sizeof(u32) *
+ XILINX_DMA_NUM_APP_WORDS);
+ }
}
+ /* Remove from the list of running transactions */
+ list_del(&desc->node);
+
+ spin_unlock_irqrestore(&chan->lock, flags);
+ dmaengine_desc_callback_invoke(&cb, NULL);
+ spin_lock_irqsave(&chan->lock, flags);
+
/* Run any dependencies, then free the descriptor */
dma_run_dependencies(&desc->async_tx);
xilinx_dma_free_tx_descriptor(chan, desc);
@@ -2602,8 +2618,11 @@ static int xilinx_dma_probe(struct platform_device *pdev)
/* Retrieve the DMA engine properties from the device tree */
xdev->has_sg = of_property_read_bool(node, "xlnx,include-sg");
- if (xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA)
+ if (xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) {
xdev->mcdma = of_property_read_bool(node, "xlnx,mcdma");
+ xdev->has_axieth_connected = of_property_read_bool(node,
+ "xlnx,axieth-connected");
+ }
if (xdev->dma_config->dmatype == XDMA_TYPE_VDMA) {
err = of_property_read_u32(node, "xlnx,num-fstores",
--
1.7.1
next prev parent reply other threads:[~2018-04-02 10:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-02 10:39 [RFC 0/6] Xilinx DMA enhancements and optimization Radhey Shyam Pandey
2018-04-02 10:39 ` [RFC 1/6] dt-bindings: dma: xilinx_dma: Add optional property has_axieth_connected Radhey Shyam Pandey
2018-04-11 9:05 ` Vinod Koul
2018-04-17 10:54 ` Radhey Shyam Pandey
2018-04-02 10:39 ` Radhey Shyam Pandey [this message]
2018-04-11 9:08 ` [RFC 2/6] dmaengine: xilinx_dma: Pass AXI4-Stream control words to netdev dma client Vinod Koul
2018-04-17 11:43 ` Radhey Shyam Pandey
2018-04-17 12:54 ` Lars-Peter Clausen
2018-04-17 13:46 ` Peter Ujfalusi
2018-04-17 13:58 ` Lars-Peter Clausen
2018-04-17 14:53 ` Peter Ujfalusi
2018-04-17 15:54 ` Lars-Peter Clausen
2018-04-18 6:31 ` Peter Ujfalusi
2018-04-18 13:06 ` Lars-Peter Clausen
2018-04-19 11:40 ` Peter Ujfalusi
2018-04-24 3:55 ` Vinod Koul
2018-04-24 9:50 ` Peter Ujfalusi
2018-05-17 6:39 ` Radhey Shyam Pandey
2018-05-29 15:04 ` Peter Ujfalusi
2018-05-30 17:29 ` Radhey Shyam Pandey
2018-06-01 10:17 ` Peter Ujfalusi
2018-06-01 10:24 ` [RFC] dmaengine: Add metadat_ops for dma_async_tx_descriptor Peter Ujfalusi
2018-07-02 6:59 ` Radhey Shyam Pandey
2018-07-10 5:52 ` Vinod
2018-07-18 10:06 ` Peter Ujfalusi
2018-07-19 9:22 ` Vinod
2018-07-20 13:42 ` Peter Ujfalusi
2018-07-24 11:14 ` Vinod
2018-07-30 9:46 ` Peter Ujfalusi
2018-07-31 4:29 ` Vinod
2018-04-17 15:42 ` [RFC 2/6] dmaengine: xilinx_dma: Pass AXI4-Stream control words to netdev dma client Vinod Koul
2018-04-17 15:44 ` Lars-Peter Clausen
2018-04-18 6:39 ` Peter Ujfalusi
2018-04-18 7:03 ` Peter Ujfalusi
2018-04-02 10:39 ` [RFC 3/6] dmaengine: xilinx_dma: Increase AXI DMA transaction segment count Radhey Shyam Pandey
2018-04-02 10:39 ` [RFC 4/6] dmaengine: xilinx_dma: Freeup active list based on descriptor completion bit Radhey Shyam Pandey
2018-04-11 9:11 ` Vinod Koul
2018-04-17 12:28 ` Radhey Shyam Pandey
2018-04-23 5:23 ` Vinod Koul
2018-04-02 10:39 ` [RFC 5/6] dmaengine: xilinx_dma: Program interrupt delay timeout Radhey Shyam Pandey
2018-04-11 9:11 ` Vinod Koul
2018-04-17 12:48 ` Radhey Shyam Pandey
2018-04-02 10:39 ` [RFC 6/6] dmaengine: xilinx_dma: Use tasklet_hi_schedule for timing critical usecase Radhey Shyam Pandey
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=1522665546-10035-3-git-send-email-radheys@xilinx.com \
--to=radhey.shyam.pandey@xilinx.com \
--cc=appana.durga.rao@xilinx.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=radheys@xilinx.com \
--cc=vinod.koul@intel.com \
/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
all inboxes | Powered by JetHome®