linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/2] mmc: atmel-mci: restore dma on AVR32
@ 2016-01-09 12:45 Mans Rullgard
  2016-01-09 12:45 ` [PATCH v2 2/2] mmc: atmel: get rid of struct mci_dma_data Mans Rullgard
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Mans Rullgard @ 2016-01-09 12:45 UTC (permalink / raw)
  To: Haavard Skinnemoen, Hans-Christian Egtvedt, Ludovic Desroches,
	Ulf Hansson, Arnd Bergmann, Andy Shevchenko, linux-kernel,
	linux-mmc

Commit ecb89f2f5f3e7 ("mmc: atmel-mci: remove compat for non DT board
when requesting dma chan") broke dma on AVR32 and any other boards not
using DT.  This restores a fallback mechanism for such cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
---
Changes:
- rebase onto v4.4-rc8: no change to this patch
---
 arch/avr32/mach-at32ap/at32ap700x.c | 16 ++++++++++++++++
 drivers/mmc/host/atmel-mci.c        | 17 +++++++++++++++++
 include/linux/atmel-mci.h           |  2 ++
 3 files changed, 35 insertions(+)

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index b4cb3bd89d8a..6e906172dc33 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1321,6 +1321,21 @@ static struct clk atmel_mci0_pclk = {
 	.index		= 9,
 };
 
+static bool at32_mci_dma_filter(struct dma_chan *chan, void *pdata)
+{
+	struct mci_dma_data *sl = pdata;
+
+	if (!sl)
+		return false;
+
+	if (find_slave_dev(sl) == chan->device->dev) {
+		chan->private = slave_data_ptr(sl);
+		return true;
+	}
+
+	return false;
+}
+
 struct platform_device *__init
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
@@ -1355,6 +1370,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 	slave->sdata.dst_master = 0;
 
 	data->dma_slave = slave;
+	data->dma_filter = at32_mci_dma_filter;
 
 	if (platform_device_add_data(pdev, data,
 				sizeof(struct mci_platform_data)))
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index bf62e429f7fc..070dffc4699e 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2280,6 +2280,23 @@ static int atmci_configure_dma(struct atmel_mci *host)
 {
 	host->dma.chan = dma_request_slave_channel_reason(&host->pdev->dev,
 							"rxtx");
+
+	if (PTR_ERR(host->dma.chan) == -ENODEV) {
+		struct mci_platform_data *pdata = host->pdev->dev.platform_data;
+		dma_cap_mask_t mask;
+
+		if (!pdata->dma_filter)
+			return -ENODEV;
+
+		dma_cap_zero(mask);
+		dma_cap_set(DMA_SLAVE, mask);
+
+		host->dma.chan = dma_request_channel(mask, pdata->dma_filter,
+						     pdata->dma_slave);
+		if (!host->dma.chan)
+			host->dma.chan = ERR_PTR(-ENODEV);
+	}
+
 	if (IS_ERR(host->dma.chan))
 		return PTR_ERR(host->dma.chan);
 
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 9177947bf032..e753062b9355 100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -2,6 +2,7 @@
 #define __LINUX_ATMEL_MCI_H
 
 #include <linux/types.h>
+#include <linux/dmaengine.h>
 
 #define ATMCI_MAX_NR_SLOTS	2
 
@@ -37,6 +38,7 @@ struct mci_slot_pdata {
  */
 struct mci_platform_data {
 	struct mci_dma_data	*dma_slave;
+	dma_filter_fn		dma_filter;
 	struct mci_slot_pdata	slot[ATMCI_MAX_NR_SLOTS];
 };
 
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-01-14 13:29 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-09 12:45 [PATCH v2 1/2] mmc: atmel-mci: restore dma on AVR32 Mans Rullgard
2016-01-09 12:45 ` [PATCH v2 2/2] mmc: atmel: get rid of struct mci_dma_data Mans Rullgard
2016-01-09 19:32   ` Hans-Christian Noren Egtvedt
2016-01-14 12:10     ` Ulf Hansson
2016-01-11 14:23   ` Ludovic Desroches
2016-01-09 19:32 ` [PATCH v2 1/2] mmc: atmel-mci: restore dma on AVR32 Hans-Christian Noren Egtvedt
2016-01-14 12:07   ` Ulf Hansson
2016-01-14 12:43     ` Hans-Christian Noren Egtvedt
2016-01-14 13:29       ` Ulf Hansson
2016-01-11 14:22 ` Ludovic Desroches

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).