Commit 89ac2233 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine fixes from Vinod Koul:
 "We have few odd driver fixes and one email update change for you this
  time:

   - Driver fixes for k3dma (off by one), pl330 (burst residue
     granularity) and omap-dma (incorrect residue_granularity)

   - Sinan's email update"

* tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
  dmaengine: pl330: report BURST residue granularity
  MAINTAINERS: Update email-id of Sinan Kaya
  dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity
parents ea9561cf c4c2b764

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11835,7 +11835,7 @@ S: Supported 
F:	arch/hexagon/



QUALCOMM HIDMA DRIVER

M:	Sinan Kaya <okaya@codeaurora.org>

M:	Sinan Kaya <okaya@kernel.org>

L:	linux-arm-kernel@lists.infradead.org

L:	linux-arm-msm@vger.kernel.org

L:	dmaengine@vger.kernel.org

drivers/dma/k3dma.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static struct dma_chan *k3_of_dma_simple_xlate(struct of_phandle_args *dma_spec, 
	struct k3_dma_dev *d = ofdma->of_dma_data;

	unsigned int request = dma_spec->args[0];



	if (request > d->dma_requests)

	if (request >= d->dma_requests)

		return NULL;



	return dma_get_slave_channel(&(d->chans[request].vc.chan));

drivers/dma/pl330.c

+1 −1
Original line number Diff line number Diff line
@@ -3033,7 +3033,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
	pd->src_addr_widths = PL330_DMA_BUSWIDTHS;

	pd->dst_addr_widths = PL330_DMA_BUSWIDTHS;

	pd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	pd->residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;

	pd->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;

	pd->max_burst = ((pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP) ?

			 1 : PL330_MAX_BURST);

drivers/dma/ti/omap-dma.c

+5 −1
Original line number Diff line number Diff line
@@ -1485,6 +1485,10 @@ static int omap_dma_probe(struct platform_device *pdev) 
	od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS;

	od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS;

	od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	if (__dma_omap15xx(od->plat->dma_attr))

		od->ddev.residue_granularity =

				DMA_RESIDUE_GRANULARITY_DESCRIPTOR;

	else

		od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;

	od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */

	od->ddev.dev = &pdev->dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE