* [PATCH 1/2] mmc: atmel-mci: restore dma on AVR32
@ 2016-01-09 1:22 Mans Rullgard
2016-01-09 1:22 ` [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data Mans Rullgard
0 siblings, 1 reply; 5+ messages in thread
From: Mans Rullgard @ 2016-01-09 1:22 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>
---
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 c425a5564c27..f433c7220fff 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1338,6 +1338,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)
{
@@ -1372,6 +1387,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
slave->sdata.p_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] 5+ messages in thread
* [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data
2016-01-09 1:22 [PATCH 1/2] mmc: atmel-mci: restore dma on AVR32 Mans Rullgard
@ 2016-01-09 1:22 ` Mans Rullgard
2016-01-09 12:10 ` Andy Shevchenko
0 siblings, 1 reply; 5+ messages in thread
From: Mans Rullgard @ 2016-01-09 1:22 UTC (permalink / raw)
To: Haavard Skinnemoen, Hans-Christian Egtvedt, Ludovic Desroches,
Ulf Hansson, Arnd Bergmann, Andy Shevchenko, linux-kernel,
linux-mmc
As struct mci_dma_data is now only used by AVR32, it is nothing but
pointless indirection. Replace it with struct dw_dma_slave in the
AVR32 platform code and with a void pointer elsewhere.
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
arch/avr32/mach-at32ap/at32ap700x.c | 21 ++++++++++-----------
drivers/mmc/host/atmel-mci.c | 1 -
include/linux/atmel-mci.h | 2 +-
include/linux/platform_data/mmc-atmel-mci.h | 22 ----------------------
4 files changed, 11 insertions(+), 35 deletions(-)
delete mode 100644 include/linux/platform_data/mmc-atmel-mci.h
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index f433c7220fff..ec5244c1bb1e 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -17,7 +17,6 @@
#include <linux/spi/spi.h>
#include <linux/usb/atmel_usba_udc.h>
-#include <linux/platform_data/mmc-atmel-mci.h>
#include <linux/atmel-mci.h>
#include <asm/io.h>
@@ -1340,13 +1339,13 @@ static struct clk atmel_mci0_pclk = {
static bool at32_mci_dma_filter(struct dma_chan *chan, void *pdata)
{
- struct mci_dma_data *sl = pdata;
+ struct dw_dma_slave *sl = pdata;
if (!sl)
return false;
- if (find_slave_dev(sl) == chan->device->dev) {
- chan->private = slave_data_ptr(sl);
+ if (sl->dma_dev == chan->device->dev) {
+ chan->private = sl;
return true;
}
@@ -1357,7 +1356,7 @@ struct platform_device *__init
at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
{
struct platform_device *pdev;
- struct mci_dma_data *slave;
+ struct dw_dma_slave *slave;
u32 pioa_mask;
u32 piob_mask;
@@ -1376,15 +1375,15 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
ARRAY_SIZE(atmel_mci0_resource)))
goto fail;
- slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
+ slave = kzalloc(sizeof(*slave), GFP_KERNEL);
if (!slave)
goto fail;
- slave->sdata.dma_dev = &dw_dmac0_device.dev;
- slave->sdata.src_id = 0;
- slave->sdata.dst_id = 1;
- slave->sdata.m_master = 1;
- slave->sdata.p_master = 0;
+ slave->dma_dev = &dw_dmac0_device.dev;
+ slave->src_id = 0;
+ slave->dst_id = 1;
+ slave->m_master = 1;
+ slave->p_master = 0;
data->dma_slave = slave;
data->dma_filter = at32_mci_dma_filter;
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 070dffc4699e..97af84d4cdf0 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -29,7 +29,6 @@
#include <linux/slab.h>
#include <linux/stat.h>
#include <linux/types.h>
-#include <linux/platform_data/mmc-atmel-mci.h>
#include <linux/mmc/host.h>
#include <linux/mmc/sdio.h>
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index e753062b9355..42a9e1884842 100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -37,7 +37,7 @@ struct mci_slot_pdata {
* @slot: Per-slot configuration data.
*/
struct mci_platform_data {
- struct mci_dma_data *dma_slave;
+ void *dma_slave;
dma_filter_fn dma_filter;
struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS];
};
diff --git a/include/linux/platform_data/mmc-atmel-mci.h b/include/linux/platform_data/mmc-atmel-mci.h
deleted file mode 100644
index 399a2d5a14bd..000000000000
--- a/include/linux/platform_data/mmc-atmel-mci.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __MMC_ATMEL_MCI_H
-#define __MMC_ATMEL_MCI_H
-
-#include <linux/platform_data/dma-atmel.h>
-#include <linux/platform_data/dma-dw.h>
-
-/**
- * struct mci_dma_data - DMA data for MCI interface
- */
-struct mci_dma_data {
-#ifdef CONFIG_ARM
- struct at_dma_slave sdata;
-#else
- struct dw_dma_slave sdata;
-#endif
-};
-
-/* accessor macros */
-#define slave_data_ptr(s) (&(s)->sdata)
-#define find_slave_dev(s) ((s)->sdata.dma_dev)
-
-#endif /* __MMC_ATMEL_MCI_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data
2016-01-09 1:22 ` [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data Mans Rullgard
@ 2016-01-09 12:10 ` Andy Shevchenko
2016-01-09 12:13 ` Måns Rullgård
0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2016-01-09 12:10 UTC (permalink / raw)
To: Mans Rullgard
Cc: Haavard Skinnemoen, Hans-Christian Egtvedt, Ludovic Desroches,
Ulf Hansson, Arnd Bergmann, Andy Shevchenko, linux-kernel,
linux-mmc
On Sat, Jan 9, 2016 at 3:22 AM, Mans Rullgard <mans@mansr.com> wrote:
> As struct mci_dma_data is now only used by AVR32, it is nothing but
> pointless indirection. Replace it with struct dw_dma_slave in the
> AVR32 platform code and with a void pointer elsewhere.
>
> Signed-off-by: Mans Rullgard <mans@mansr.com>
> @@ -1376,15 +1375,15 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
> ARRAY_SIZE(atmel_mci0_resource)))
> goto fail;
>
> - slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
> + slave = kzalloc(sizeof(*slave), GFP_KERNEL);
> if (!slave)
> goto fail;
>
> - slave->sdata.dma_dev = &dw_dmac0_device.dev;
> - slave->sdata.src_id = 0;
> - slave->sdata.dst_id = 1;
> - slave->sdata.m_master = 1;
> - slave->sdata.p_master = 0;
Seems you based this on top of our non-submitted yet patches.
> + slave->dma_dev = &dw_dmac0_device.dev;
> + slave->src_id = 0;
> + slave->dst_id = 1;
> + slave->m_master = 1;
> + slave->p_master = 0;
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data
2016-01-09 12:10 ` Andy Shevchenko
@ 2016-01-09 12:13 ` Måns Rullgård
0 siblings, 0 replies; 5+ messages in thread
From: Måns Rullgård @ 2016-01-09 12:13 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Haavard Skinnemoen, Hans-Christian Egtvedt, Ludovic Desroches,
Ulf Hansson, Arnd Bergmann, Andy Shevchenko, linux-kernel,
linux-mmc
Andy Shevchenko <andy.shevchenko@gmail.com> writes:
> On Sat, Jan 9, 2016 at 3:22 AM, Mans Rullgard <mans@mansr.com> wrote:
>> As struct mci_dma_data is now only used by AVR32, it is nothing but
>> pointless indirection. Replace it with struct dw_dma_slave in the
>> AVR32 platform code and with a void pointer elsewhere.
>>
>> Signed-off-by: Mans Rullgard <mans@mansr.com>
>
>> @@ -1376,15 +1375,15 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
>> ARRAY_SIZE(atmel_mci0_resource)))
>> goto fail;
>>
>> - slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
>> + slave = kzalloc(sizeof(*slave), GFP_KERNEL);
>> if (!slave)
>> goto fail;
>>
>> - slave->sdata.dma_dev = &dw_dmac0_device.dev;
>> - slave->sdata.src_id = 0;
>> - slave->sdata.dst_id = 1;
>> - slave->sdata.m_master = 1;
>> - slave->sdata.p_master = 0;
>
> Seems you based this on top of our non-submitted yet patches.
You're right. I didn't realise this file had been touched by those
patches, and I didn't read the code all that carefully when making this
change.
>> + slave->dma_dev = &dw_dmac0_device.dev;
>> + slave->src_id = 0;
>> + slave->dst_id = 1;
>> + slave->m_master = 1;
>> + slave->p_master = 0;
>
> --
> With Best Regards,
> Andy Shevchenko
--
Måns Rullgård
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data
@ 2016-01-09 12:13 ` Måns Rullgård
0 siblings, 0 replies; 5+ messages in thread
From: Måns Rullgård @ 2016-01-09 12:13 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Haavard Skinnemoen, Hans-Christian Egtvedt, Ludovic Desroches,
Ulf Hansson, Arnd Bergmann, Andy Shevchenko, linux-kernel,
linux-mmc
Andy Shevchenko <andy.shevchenko@gmail.com> writes:
> On Sat, Jan 9, 2016 at 3:22 AM, Mans Rullgard <mans@mansr.com> wrote:
>> As struct mci_dma_data is now only used by AVR32, it is nothing but
>> pointless indirection. Replace it with struct dw_dma_slave in the
>> AVR32 platform code and with a void pointer elsewhere.
>>
>> Signed-off-by: Mans Rullgard <mans@mansr.com>
>
>> @@ -1376,15 +1375,15 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
>> ARRAY_SIZE(atmel_mci0_resource)))
>> goto fail;
>>
>> - slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
>> + slave = kzalloc(sizeof(*slave), GFP_KERNEL);
>> if (!slave)
>> goto fail;
>>
>> - slave->sdata.dma_dev = &dw_dmac0_device.dev;
>> - slave->sdata.src_id = 0;
>> - slave->sdata.dst_id = 1;
>> - slave->sdata.m_master = 1;
>> - slave->sdata.p_master = 0;
>
> Seems you based this on top of our non-submitted yet patches.
You're right. I didn't realise this file had been touched by those
patches, and I didn't read the code all that carefully when making this
change.
>> + slave->dma_dev = &dw_dmac0_device.dev;
>> + slave->src_id = 0;
>> + slave->dst_id = 1;
>> + slave->m_master = 1;
>> + slave->p_master = 0;
>
> --
> With Best Regards,
> Andy Shevchenko
--
Måns Rullgård
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-09 12:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-09 1:22 [PATCH 1/2] mmc: atmel-mci: restore dma on AVR32 Mans Rullgard
2016-01-09 1:22 ` [PATCH 2/2] mmc: atmel: get rid of struct mci_dma_data Mans Rullgard
2016-01-09 12:10 ` Andy Shevchenko
2016-01-09 12:13 ` Måns Rullgård
2016-01-09 12:13 ` Måns Rullgård
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.