|
@@ -24,6 +24,7 @@
|
|
|
#include <linux/spinlock.h>
|
|
|
#include <linux/device.h>
|
|
|
#include <linux/dma-mapping.h>
|
|
|
+#include <linux/dmapool.h>
|
|
|
#include <linux/firmware.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/platform_device.h>
|
|
@@ -343,6 +344,7 @@ struct sdma_channel {
|
|
|
u32 shp_addr, per_addr;
|
|
|
enum dma_status status;
|
|
|
struct imx_dma_data data;
|
|
|
+ struct dma_pool *bd_pool;
|
|
|
};
|
|
|
|
|
|
#define IMX_DMA_SG_LOOP BIT(0)
|
|
@@ -1153,11 +1155,10 @@ out:
|
|
|
|
|
|
static int sdma_alloc_bd(struct sdma_desc *desc)
|
|
|
{
|
|
|
- u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
|
|
|
int ret = 0;
|
|
|
|
|
|
- desc->bd = dma_zalloc_coherent(NULL, bd_size, &desc->bd_phys,
|
|
|
- GFP_ATOMIC);
|
|
|
+ desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_ATOMIC,
|
|
|
+ &desc->bd_phys);
|
|
|
if (!desc->bd) {
|
|
|
ret = -ENOMEM;
|
|
|
goto out;
|
|
@@ -1168,9 +1169,7 @@ out:
|
|
|
|
|
|
static void sdma_free_bd(struct sdma_desc *desc)
|
|
|
{
|
|
|
- u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
|
|
|
-
|
|
|
- dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys);
|
|
|
+ dma_pool_free(desc->sdmac->bd_pool, desc->bd, desc->bd_phys);
|
|
|
}
|
|
|
|
|
|
static void sdma_desc_free(struct virt_dma_desc *vd)
|
|
@@ -1218,6 +1217,10 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
|
|
|
if (ret)
|
|
|
goto disable_clk_ahb;
|
|
|
|
|
|
+ sdmac->bd_pool = dma_pool_create("bd_pool", chan->device->dev,
|
|
|
+ sizeof(struct sdma_buffer_descriptor),
|
|
|
+ 32, 0);
|
|
|
+
|
|
|
return 0;
|
|
|
|
|
|
disable_clk_ahb:
|
|
@@ -1246,6 +1249,9 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
|
|
|
|
|
|
clk_disable(sdma->clk_ipg);
|
|
|
clk_disable(sdma->clk_ahb);
|
|
|
+
|
|
|
+ dma_pool_destroy(sdmac->bd_pool);
|
|
|
+ sdmac->bd_pool = NULL;
|
|
|
}
|
|
|
|
|
|
static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
|