Merge tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[mirror_ubuntu-bionic-kernel.git] / drivers / dma / edma.c

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index a7ea20e7b8e94cd9527d73785578abd599e5029d..9364a3ed345a21de9c4c9ce617efedb5d02e4639 100644 (file)
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -891,6 +891,10 @@ static int edma_slave_config(struct dma_chan *chan,
            cfg->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES)
                return -EINVAL;
 
+       if (cfg->src_maxburst > chan->device->max_burst ||
+           cfg->dst_maxburst > chan->device->max_burst)
+               return -EINVAL;
+
        memcpy(&echan->cfg, cfg, sizeof(echan->cfg));
 
        return 0;
@@ -1868,6 +1872,7 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode)
        s_ddev->dst_addr_widths = EDMA_DMA_BUSWIDTHS;
        s_ddev->directions |= (BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV));
        s_ddev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
+       s_ddev->max_burst = SZ_32K - 1; /* CIDX: 16bit signed */
 
        s_ddev->dev = ecc->dev;
        INIT_LIST_HEAD(&s_ddev->channels);