mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +00:00
2876709fb7
Add patches from https://github.com/raspberrypi/linux/pull/3164 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 51487e55ceabd24572bdd12ed7fd45e20676f399 Mon Sep 17 00:00:00 2001
|
|
From: Yaroslav Rosomakho <yaroslavros@gmail.com>
|
|
Date: Fri, 23 Aug 2019 11:05:51 +0200
|
|
Subject: [PATCH 1/2] Add missing dma_unmap_sg calls to free relevant swiotlb
|
|
bounce buffers. This prevents DMA leaks.
|
|
|
|
Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
|
|
---
|
|
drivers/mmc/host/bcm2835-mmc.c | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/bcm2835-mmc.c
|
|
+++ b/drivers/mmc/host/bcm2835-mmc.c
|
|
@@ -344,16 +344,17 @@ static void bcm2835_mmc_dma_complete(voi
|
|
|
|
host->use_dma = false;
|
|
|
|
- if (host->data && !(host->data->flags & MMC_DATA_WRITE)) {
|
|
- /* otherwise handled in SDHCI IRQ */
|
|
+ if (host->data) {
|
|
dma_chan = host->dma_chan_rxtx;
|
|
- dir_data = DMA_FROM_DEVICE;
|
|
-
|
|
+ if (host->data->flags & MMC_DATA_WRITE)
|
|
+ dir_data = DMA_TO_DEVICE;
|
|
+ else
|
|
+ dir_data = DMA_FROM_DEVICE;
|
|
dma_unmap_sg(dma_chan->device->dev,
|
|
host->data->sg, host->data->sg_len,
|
|
dir_data);
|
|
-
|
|
- bcm2835_mmc_finish_data(host);
|
|
+ if (! (host->data->flags & MMC_DATA_WRITE))
|
|
+ bcm2835_mmc_finish_data(host);
|
|
} else if (host->wait_for_dma) {
|
|
host->wait_for_dma = false;
|
|
tasklet_schedule(&host->finish_tasklet);
|
|
@@ -539,6 +540,8 @@ static void bcm2835_mmc_transfer_dma(str
|
|
spin_unlock_irqrestore(&host->lock, flags);
|
|
dmaengine_submit(desc);
|
|
dma_async_issue_pending(dma_chan);
|
|
+ } else {
|
|
+ dma_unmap_sg(dma_chan->device->dev, host->data->sg, len, dir_data);
|
|
}
|
|
|
|
}
|