diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-08 21:58:55 +0100 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-14 14:10:51 +0100 |
commit | 7d7aa2fd924c27829ec25f825481554dd81bce97 (patch) | |
tree | 658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0688-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch | |
parent | e7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff) | |
download | upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2 upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip |
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using
the common notation based on SoC/CPU ID (which is used internally
anyway), bcmXXXX instead of brcmXXXX.
This is even used for target TITLE in make menuconfig already,
only the short target name used brcm so far.
Despite, since subtargets range from bcm2708 to bcm2711, it seems
appropriate to use bcm27xx instead of bcm2708 (again, as already done
for BOARDNAME).
This also renames the packages brcm2708-userland and brcm2708-gpu-fw.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0688-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-4.19/950-0688-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0688-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch b/target/linux/bcm27xx/patches-4.19/950-0688-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch new file mode 100644 index 0000000000..0a14126fbd --- /dev/null +++ b/target/linux/bcm27xx/patches-4.19/950-0688-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch @@ -0,0 +1,46 @@ +From f8554985b77df2dac55f2d7c85e0f0cc3497a1fd Mon Sep 17 00:00:00 2001 +From: Yaroslav Rosomakho <yaroslavros@gmail.com> +Date: Fri, 23 Aug 2019 11:05:51 +0200 +Subject: [PATCH] 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 +@@ -345,16 +345,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); +@@ -540,6 +541,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); + } + + } |