openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM/dmaengine: edma: Move of_dma_controller_register to the dmaengine driver 

If the of_dma_controller is registered in the non dmaengine driver we could
have race condition:
the of_dma_controller has been registered, but the dmaengine driver is not
yet probed. Drivers requesting DMA channels during this window will fail
since we do not yet have dmaengine drivers registered.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Peter Ujfalusi 2015-10-14 14:42:47 +03:00 committed by Vinod Koul
parent d4cb7f4042
commit dc9b60552f
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/common/edma.c
View File

@ -29,7 +29,6 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_dma.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
@ -1191,10 +1190,6 @@ static int edma_of_parse_dt(struct device *dev,
return ret; return ret;
} }
static struct of_dma_filter_info edma_filter_info = {
.filter_fn = edma_filter_fn,
};
static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev, static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev,
struct device_node *node) struct device_node *node)
{ {
@ -1209,11 +1204,6 @@ static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev,
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
dma_cap_set(DMA_SLAVE, edma_filter_info.dma_cap);
dma_cap_set(DMA_CYCLIC, edma_filter_info.dma_cap);
of_dma_controller_register(dev->of_node, of_dma_simple_xlate,
&edma_filter_info);
return info; return info;
} }
#else #else

16
drivers/dma/edma.c
View File

@ -25,6 +25,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_dma.h>
#include <linux/platform_data/edma.h> #include <linux/platform_data/edma.h>
@ -987,9 +988,14 @@ static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma,
INIT_LIST_HEAD(&dma->channels); INIT_LIST_HEAD(&dma->channels);
} }
static struct of_dma_filter_info edma_filter_info = {
.filter_fn = edma_filter_fn,
};
static int edma_probe(struct platform_device *pdev) static int edma_probe(struct platform_device *pdev)
{ {
struct edma_cc *ecc; struct edma_cc *ecc;
struct device_node *parent_node = pdev->dev.parent->of_node;
int ret; int ret;
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
@ -1024,6 +1030,13 @@ static int edma_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ecc); platform_set_drvdata(pdev, ecc);
if (parent_node) {
dma_cap_set(DMA_SLAVE, edma_filter_info.dma_cap);
dma_cap_set(DMA_CYCLIC, edma_filter_info.dma_cap);
of_dma_controller_register(parent_node, of_dma_simple_xlate,
&edma_filter_info);
}
dev_info(&pdev->dev, "TI EDMA DMA engine driver\n"); dev_info(&pdev->dev, "TI EDMA DMA engine driver\n");
return 0; return 0;
@ -1037,7 +1050,10 @@ static int edma_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct edma_cc *ecc = dev_get_drvdata(dev); struct edma_cc *ecc = dev_get_drvdata(dev);
struct device_node *parent_node = pdev->dev.parent->of_node;
if (parent_node)
of_dma_controller_free(parent_node);
dma_async_device_unregister(&ecc->dma_slave); dma_async_device_unregister(&ecc->dma_slave);
edma_free_slot(ecc->dummy_slot); edma_free_slot(ecc->dummy_slot);