Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: i.MX SDMA: Fix burstsize settings ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only dma: sh_dma: not all SH DMAC implementations support MEMCPY at_hdmac: bugfix for enabling channel irq dmaengine: fix missing 'cnt' in ?: in dmatest
This commit is contained in:
commit
4554c135a0
|
@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = {
|
||||||
.dmaor_is_32bit = 1,
|
.dmaor_is_32bit = 1,
|
||||||
.needs_tend_set = 1,
|
.needs_tend_set = 1,
|
||||||
.no_dmars = 1,
|
.no_dmars = 1,
|
||||||
|
.slave_only = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct resource sh7372_usb_dmae0_resources[] = {
|
static struct resource sh7372_usb_dmae0_resources[] = {
|
||||||
|
@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = {
|
||||||
.dmaor_is_32bit = 1,
|
.dmaor_is_32bit = 1,
|
||||||
.needs_tend_set = 1,
|
.needs_tend_set = 1,
|
||||||
.no_dmars = 1,
|
.no_dmars = 1,
|
||||||
|
.slave_only = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct resource sh7372_usb_dmae1_resources[] = {
|
static struct resource sh7372_usb_dmae1_resources[] = {
|
||||||
|
|
|
@ -1343,7 +1343,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
tasklet_init(&atchan->tasklet, atc_tasklet,
|
tasklet_init(&atchan->tasklet, atc_tasklet,
|
||||||
(unsigned long)atchan);
|
(unsigned long)atchan);
|
||||||
atc_enable_irq(atchan);
|
atc_enable_chan_irq(atdma, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set base routines */
|
/* set base routines */
|
||||||
|
@ -1410,7 +1410,7 @@ static int __exit at_dma_remove(struct platform_device *pdev)
|
||||||
struct at_dma_chan *atchan = to_at_dma_chan(chan);
|
struct at_dma_chan *atchan = to_at_dma_chan(chan);
|
||||||
|
|
||||||
/* Disable interrupts */
|
/* Disable interrupts */
|
||||||
atc_disable_irq(atchan);
|
atc_disable_chan_irq(atdma, chan->chan_id);
|
||||||
tasklet_disable(&atchan->tasklet);
|
tasklet_disable(&atchan->tasklet);
|
||||||
|
|
||||||
tasklet_kill(&atchan->tasklet);
|
tasklet_kill(&atchan->tasklet);
|
||||||
|
|
|
@ -327,28 +327,27 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void atc_setup_irq(struct at_dma_chan *atchan, int on)
|
static void atc_setup_irq(struct at_dma *atdma, int chan_id, int on)
|
||||||
{
|
{
|
||||||
struct at_dma *atdma = to_at_dma(atchan->chan_common.device);
|
|
||||||
u32 ebci;
|
u32 ebci;
|
||||||
|
|
||||||
/* enable interrupts on buffer transfer completion & error */
|
/* enable interrupts on buffer transfer completion & error */
|
||||||
ebci = AT_DMA_BTC(atchan->chan_common.chan_id)
|
ebci = AT_DMA_BTC(chan_id)
|
||||||
| AT_DMA_ERR(atchan->chan_common.chan_id);
|
| AT_DMA_ERR(chan_id);
|
||||||
if (on)
|
if (on)
|
||||||
dma_writel(atdma, EBCIER, ebci);
|
dma_writel(atdma, EBCIER, ebci);
|
||||||
else
|
else
|
||||||
dma_writel(atdma, EBCIDR, ebci);
|
dma_writel(atdma, EBCIDR, ebci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void atc_enable_irq(struct at_dma_chan *atchan)
|
static void atc_enable_chan_irq(struct at_dma *atdma, int chan_id)
|
||||||
{
|
{
|
||||||
atc_setup_irq(atchan, 1);
|
atc_setup_irq(atdma, chan_id, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void atc_disable_irq(struct at_dma_chan *atchan)
|
static void atc_disable_chan_irq(struct at_dma *atdma, int chan_id)
|
||||||
{
|
{
|
||||||
atc_setup_irq(atchan, 0);
|
atc_setup_irq(atdma, chan_id, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -599,7 +599,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
|
||||||
}
|
}
|
||||||
if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
|
if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
|
||||||
cnt = dmatest_add_threads(dtc, DMA_PQ);
|
cnt = dmatest_add_threads(dtc, DMA_PQ);
|
||||||
thread_count += cnt > 0 ?: 0;
|
thread_count += cnt > 0 ? cnt : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pr_info("dmatest: Started %u threads using %s\n",
|
pr_info("dmatest: Started %u threads using %s\n",
|
||||||
|
|
|
@ -1102,11 +1102,13 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
|
||||||
case DMA_SLAVE_CONFIG:
|
case DMA_SLAVE_CONFIG:
|
||||||
if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
|
if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
|
||||||
sdmac->per_address = dmaengine_cfg->src_addr;
|
sdmac->per_address = dmaengine_cfg->src_addr;
|
||||||
sdmac->watermark_level = dmaengine_cfg->src_maxburst;
|
sdmac->watermark_level = dmaengine_cfg->src_maxburst *
|
||||||
|
dmaengine_cfg->src_addr_width;
|
||||||
sdmac->word_size = dmaengine_cfg->src_addr_width;
|
sdmac->word_size = dmaengine_cfg->src_addr_width;
|
||||||
} else {
|
} else {
|
||||||
sdmac->per_address = dmaengine_cfg->dst_addr;
|
sdmac->per_address = dmaengine_cfg->dst_addr;
|
||||||
sdmac->watermark_level = dmaengine_cfg->dst_maxburst;
|
sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
|
||||||
|
dmaengine_cfg->dst_addr_width;
|
||||||
sdmac->word_size = dmaengine_cfg->dst_addr_width;
|
sdmac->word_size = dmaengine_cfg->dst_addr_width;
|
||||||
}
|
}
|
||||||
sdmac->direction = dmaengine_cfg->direction;
|
sdmac->direction = dmaengine_cfg->direction;
|
||||||
|
|
|
@ -1262,6 +1262,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
INIT_LIST_HEAD(&shdev->common.channels);
|
INIT_LIST_HEAD(&shdev->common.channels);
|
||||||
|
|
||||||
|
if (!pdata->slave_only)
|
||||||
dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
|
dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
|
||||||
if (pdata->slave && pdata->slave_num)
|
if (pdata->slave && pdata->slave_num)
|
||||||
dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
|
dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
|
||||||
|
|
|
@ -70,6 +70,7 @@ struct sh_dmae_pdata {
|
||||||
unsigned int needs_tend_set:1;
|
unsigned int needs_tend_set:1;
|
||||||
unsigned int no_dmars:1;
|
unsigned int no_dmars:1;
|
||||||
unsigned int chclr_present:1;
|
unsigned int chclr_present:1;
|
||||||
|
unsigned int slave_only:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* DMA register */
|
/* DMA register */
|
||||||
|
|
Loading…
Reference in New Issue