diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2017-10-03 11:35:38 +0300 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2017-10-12 22:13:48 +0530 |
| commit | 05ec62a106a3b358cdc6ac41025b320dc2dbcb3f (patch) | |
| tree | dea8ab21088f8ff8dc08ff5a7920e4e5666d1460 | |
| parent | dmaengine: edma: Implement protection for invalid max_burst (diff) | |
| download | linux-dev-05ec62a106a3b358cdc6ac41025b320dc2dbcb3f.tar.xz linux-dev-05ec62a106a3b358cdc6ac41025b320dc2dbcb3f.zip | |
dmaengine: omap-dma: Implement protection for invalid max_burst
the device's max_burst to 16777215 (EN is 24bit unsigned value) so
clients can take this into consideration when setting up the transfer.
During slave transfer preparation check if the requested maxburst is valid.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/omap-dma.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 8c1665c8fe33..f6dd849159d8 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -1288,6 +1288,10 @@ static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config 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(&c->cfg, cfg, sizeof(c->cfg)); return 0; @@ -1482,6 +1486,7 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */ od->ddev.dev = &pdev->dev; INIT_LIST_HEAD(&od->ddev.channels); spin_lock_init(&od->lock); |