diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:01:23 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:02:48 +0200 |
commit | 662394fb30fdbcc89ec387918714aebee6868a9f (patch) | |
tree | c308c5f1a650abf9d9ccbb2a1747469a0d8570c0 /target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch | |
parent | 99a5e285887c4a10aaf06d8e01fae0707995da00 (diff) | |
download | upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.gz upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.bz2 upstream-662394fb30fdbcc89ec387918714aebee6868a9f.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch b/target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch new file mode 100644 index 0000000000..86ef75fd11 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch @@ -0,0 +1,42 @@ +From 1bee80161e0c19402988933d2197dd99e50662d5 Mon Sep 17 00:00:00 2001 +From: Lukas Wunner <lukas@wunner.de> +Date: Wed, 16 Jan 2019 12:22:32 +0100 +Subject: [PATCH 382/782] bcm2835-mmc: Fix DMA channel leak + +The BCM2835 MMC host driver requests a DMA channel on probe but neglects +to release the channel in the probe error path and on driver unbind. + +I'm seeing this happen on every boot of the Compute Module 3: On first +driver probe, DMA channel 2 is allocated and then leaked with a "could +not get clk, deferring probe" message. On second driver probe, channel 4 +is allocated. + +Fix it. + +Signed-off-by: Lukas Wunner <lukas@wunner.de> +Cc: Frank Pavlic <f.pavlic@kunbus.de> +--- + drivers/mmc/host/bcm2835-mmc.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/mmc/host/bcm2835-mmc.c ++++ b/drivers/mmc/host/bcm2835-mmc.c +@@ -1503,6 +1503,8 @@ static int bcm2835_mmc_probe(struct plat + + return 0; + err: ++ if (host->dma_chan_rxtx) ++ dma_release_channel(host->dma_chan_rxtx); + mmc_free_host(mmc); + + return ret; +@@ -1548,6 +1550,9 @@ static int bcm2835_mmc_remove(struct pla + + tasklet_kill(&host->finish_tasklet); + ++ if (host->dma_chan_rxtx) ++ dma_release_channel(host->dma_chan_rxtx); ++ + mmc_free_host(host->mmc); + platform_set_drvdata(pdev, NULL); + |