Commit 9938ee9c authored by Tony Lindgren's avatar Tony Lindgren

dmaengine: ti: omap-dma: Configure global priority register directly

We can move the global priority register configuration to the dmaengine
driver and configure it based on the of_device_id match data.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Vinod Koul <vkoul@kernel.org>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4c74ecf7
...@@ -557,38 +557,6 @@ void omap_free_dma(int lch) ...@@ -557,38 +557,6 @@ void omap_free_dma(int lch)
} }
EXPORT_SYMBOL(omap_free_dma); EXPORT_SYMBOL(omap_free_dma);
/**
* @brief omap_dma_set_global_params : Set global priority settings for dma
*
* @param arb_rate
* @param max_fifo_depth
* @param tparams - Number of threads to reserve : DMA_THREAD_RESERVE_NORM
* DMA_THREAD_RESERVE_ONET
* DMA_THREAD_RESERVE_TWOT
* DMA_THREAD_RESERVE_THREET
*/
static void
omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
{
u32 reg;
if (dma_omap1()) {
printk(KERN_ERR "FIXME: no %s on 15xx/16xx\n", __func__);
return;
}
if (max_fifo_depth == 0)
max_fifo_depth = 1;
if (arb_rate == 0)
arb_rate = 1;
reg = 0xff & max_fifo_depth;
reg |= (0x3 & tparams) << 12;
reg |= (arb_rate & 0xff) << 16;
p->dma_write(reg, GCR, 0);
}
/* /*
* Clears any DMA state so the DMA engine is ready to restart with new buffers * Clears any DMA state so the DMA engine is ready to restart with new buffers
* through omap_start_dma(). Any buffers in flight are discarded. * through omap_start_dma(). Any buffers in flight are discarded.
...@@ -969,10 +937,6 @@ static int omap_system_dma_probe(struct platform_device *pdev) ...@@ -969,10 +937,6 @@ static int omap_system_dma_probe(struct platform_device *pdev)
} }
} }
if (d->dev_caps & IS_RW_PRIORITY)
omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE,
DMA_DEFAULT_FIFO_DEPTH, 0);
/* reserve dma channels 0 and 1 in high security devices on 34xx */ /* reserve dma channels 0 and 1 in high security devices on 34xx */
if (d->dev_caps & HS_CHANNELS_RESERVED) { if (d->dev_caps & HS_CHANNELS_RESERVED) {
pr_info("Reserving DMA channels 0 and 1 for HS ROM code\n"); pr_info("Reserving DMA channels 0 and 1 for HS ROM code\n");
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
struct omap_dma_config { struct omap_dma_config {
int lch_end; int lch_end;
unsigned int rw_priority:1;
unsigned int may_lose_context:1; unsigned int may_lose_context:1;
}; };
...@@ -1536,6 +1537,27 @@ static int omap_dma_context_notifier(struct notifier_block *nb, ...@@ -1536,6 +1537,27 @@ static int omap_dma_context_notifier(struct notifier_block *nb,
return NOTIFY_OK; return NOTIFY_OK;
} }
static void omap_dma_init_gcr(struct omap_dmadev *od, int arb_rate,
int max_fifo_depth, int tparams)
{
u32 val;
/* Set only for omap2430 and later */
if (!od->cfg->rw_priority)
return;
if (max_fifo_depth == 0)
max_fifo_depth = 1;
if (arb_rate == 0)
arb_rate = 1;
val = 0xff & max_fifo_depth;
val |= (0x3 & tparams) << 12;
val |= (arb_rate & 0xff) << 16;
omap_dma_glbl_write(od, GCR, val);
}
#define OMAP_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ #define OMAP_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
BIT(DMA_SLAVE_BUSWIDTH_4_BYTES)) BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
...@@ -1701,6 +1723,8 @@ static int omap_dma_probe(struct platform_device *pdev) ...@@ -1701,6 +1723,8 @@ static int omap_dma_probe(struct platform_device *pdev)
} }
} }
omap_dma_init_gcr(od, DMA_DEFAULT_ARB_RATE, DMA_DEFAULT_FIFO_DEPTH, 0);
if (od->cfg->may_lose_context) { if (od->cfg->may_lose_context) {
od->nb.notifier_call = omap_dma_context_notifier; od->nb.notifier_call = omap_dma_context_notifier;
cpu_pm_register_notifier(&od->nb); cpu_pm_register_notifier(&od->nb);
...@@ -1743,24 +1767,29 @@ static int omap_dma_remove(struct platform_device *pdev) ...@@ -1743,24 +1767,29 @@ static int omap_dma_remove(struct platform_device *pdev)
static const struct omap_dma_config omap2420_data = { static const struct omap_dma_config omap2420_data = {
.lch_end = CCFN, .lch_end = CCFN,
.rw_priority = true,
}; };
static const struct omap_dma_config omap2430_data = { static const struct omap_dma_config omap2430_data = {
.lch_end = CCFN, .lch_end = CCFN,
.rw_priority = true,
}; };
static const struct omap_dma_config omap3430_data = { static const struct omap_dma_config omap3430_data = {
.lch_end = CCFN, .lch_end = CCFN,
.rw_priority = true,
.may_lose_context = true, .may_lose_context = true,
}; };
static const struct omap_dma_config omap3630_data = { static const struct omap_dma_config omap3630_data = {
.lch_end = CCDN, .lch_end = CCDN,
.rw_priority = true,
.may_lose_context = true, .may_lose_context = true,
}; };
static const struct omap_dma_config omap4_data = { static const struct omap_dma_config omap4_data = {
.lch_end = CCDN, .lch_end = CCDN,
.rw_priority = true,
}; };
static const struct of_device_id omap_dma_match[] = { static const struct of_device_id omap_dma_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment