Merge tag 'dmaengine-4.13-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine updates from Vinod Koul: - removal of AVR32 support in dw driver as AVR32 is gone - new driver for Broadcom stream buffer accelerator (SBA) RAID driver - add support for Faraday Technology FTDMAC020 in amba-pl08x driver - IOMMU support in pl330 driver - updates to bunch of drivers * tag 'dmaengine-4.13-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (36 commits) dmaengine: qcom_hidma: correct API violation for submit dmaengine: zynqmp_dma: Remove max len check in zynqmp_dma_prep_memcpy dmaengine: tegra-apb: Really fix runtime-pm usage dmaengine: fsl_raid: make of_device_ids const. dmaengine: qcom_hidma: allow ACPI/DT parameters to be overridden dmaengine: fsldma: set BWC, DAHTS and SAHTS values correctly dmaengine: Kconfig: Simplify the help text for MXS_DMA dmaengine: pl330: Delete unused functions dmaengine: Replace WARN_TAINT_ONCE() with pr_warn_once() dmaengine: Kconfig: Extend the dependency for MXS_DMA dmaengine: mxs: Use %zu for printing a size_t variable dmaengine: ste_dma40: Cleanup scatterlist layering violations dmaengine: imx-dma: cleanup scatterlist layering violations dmaengine: use proper name for the R-Car SoC dmaengine: imx-sdma: Fix compilation warning. dmaengine: imx-sdma: Handle return value of clk_prepare_enable dmaengine: pl330: Add IOMMU support to slave tranfers dmaengine: DW DMAC: Handle return value of clk_prepare_enable dmaengine: pl08x: use GENMASK() to create bitmasks dmaengine: pl08x: Add support for Faraday Technology FTDMAC020 ...
This commit is contained in:
@@ -144,6 +144,7 @@ struct rcar_dmac_chan_map {
|
||||
* @chan: base DMA channel object
|
||||
* @iomem: channel I/O memory base
|
||||
* @index: index of this channel in the controller
|
||||
* @irq: channel IRQ
|
||||
* @src: slave memory address and size on the source side
|
||||
* @dst: slave memory address and size on the destination side
|
||||
* @mid_rid: hardware MID/RID for the DMA client using this channel
|
||||
@@ -161,6 +162,7 @@ struct rcar_dmac_chan {
|
||||
struct dma_chan chan;
|
||||
void __iomem *iomem;
|
||||
unsigned int index;
|
||||
int irq;
|
||||
|
||||
struct rcar_dmac_chan_slave src;
|
||||
struct rcar_dmac_chan_slave dst;
|
||||
@@ -1008,7 +1010,11 @@ static void rcar_dmac_free_chan_resources(struct dma_chan *chan)
|
||||
rcar_dmac_chan_halt(rchan);
|
||||
spin_unlock_irq(&rchan->lock);
|
||||
|
||||
/* Now no new interrupts will occur */
|
||||
/*
|
||||
* Now no new interrupts will occur, but one might already be
|
||||
* running. Wait for it to finish before freeing resources.
|
||||
*/
|
||||
synchronize_irq(rchan->irq);
|
||||
|
||||
if (rchan->mid_rid >= 0) {
|
||||
/* The caller is holding dma_list_mutex */
|
||||
@@ -1366,6 +1372,13 @@ done:
|
||||
spin_unlock_irqrestore(&rchan->lock, flags);
|
||||
}
|
||||
|
||||
static void rcar_dmac_device_synchronize(struct dma_chan *chan)
|
||||
{
|
||||
struct rcar_dmac_chan *rchan = to_rcar_dmac_chan(chan);
|
||||
|
||||
synchronize_irq(rchan->irq);
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* IRQ handling
|
||||
*/
|
||||
@@ -1650,7 +1663,6 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac,
|
||||
struct dma_chan *chan = &rchan->chan;
|
||||
char pdev_irqname[5];
|
||||
char *irqname;
|
||||
int irq;
|
||||
int ret;
|
||||
|
||||
rchan->index = index;
|
||||
@@ -1667,8 +1679,8 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac,
|
||||
|
||||
/* Request the channel interrupt. */
|
||||
sprintf(pdev_irqname, "ch%u", index);
|
||||
irq = platform_get_irq_byname(pdev, pdev_irqname);
|
||||
if (irq < 0) {
|
||||
rchan->irq = platform_get_irq_byname(pdev, pdev_irqname);
|
||||
if (rchan->irq < 0) {
|
||||
dev_err(dmac->dev, "no IRQ specified for channel %u\n", index);
|
||||
return -ENODEV;
|
||||
}
|
||||
@@ -1678,11 +1690,13 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac,
|
||||
if (!irqname)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = devm_request_threaded_irq(dmac->dev, irq, rcar_dmac_isr_channel,
|
||||
ret = devm_request_threaded_irq(dmac->dev, rchan->irq,
|
||||
rcar_dmac_isr_channel,
|
||||
rcar_dmac_isr_channel_thread, 0,
|
||||
irqname, rchan);
|
||||
if (ret) {
|
||||
dev_err(dmac->dev, "failed to request IRQ %u (%d)\n", irq, ret);
|
||||
dev_err(dmac->dev, "failed to request IRQ %u (%d)\n",
|
||||
rchan->irq, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1846,6 +1860,7 @@ static int rcar_dmac_probe(struct platform_device *pdev)
|
||||
engine->device_terminate_all = rcar_dmac_chan_terminate_all;
|
||||
engine->device_tx_status = rcar_dmac_tx_status;
|
||||
engine->device_issue_pending = rcar_dmac_issue_pending;
|
||||
engine->device_synchronize = rcar_dmac_device_synchronize;
|
||||
|
||||
ret = dma_async_device_register(engine);
|
||||
if (ret < 0)
|
||||
|
Reference in New Issue
Block a user