提交 9c417a43 编写于 作者: M Mike Frysinger 提交者: Bryan Wu

Blackfin arch: move most dma functions into static inlines

move most dma functions into static inlines since they are vastly 1
liners that get/set a value in a structure
Signed-off-by: NMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: NBryan Wu <cooloney@kernel.org>
上级 4c1ed6a5
...@@ -129,50 +129,126 @@ void blackfin_dma_resume(void); ...@@ -129,50 +129,126 @@ void blackfin_dma_resume(void);
/******************************************************************************* /*******************************************************************************
* DMA API's * DMA API's
*******************************************************************************/ *******************************************************************************/
/* functions to set register mode */ extern struct dma_channel dma_ch[MAX_DMA_CHANNELS];
void set_dma_start_addr(unsigned int channel, unsigned long addr); extern struct dma_register *dma_io_base_addr[MAX_DMA_CHANNELS];
void set_dma_next_desc_addr(unsigned int channel, unsigned long addr); extern int channel2irq(unsigned int channel);
void set_dma_curr_desc_addr(unsigned int channel, unsigned long addr);
void set_dma_x_count(unsigned int channel, unsigned short x_count); static inline void set_dma_start_addr(unsigned int channel, unsigned long addr)
void set_dma_x_modify(unsigned int channel, short x_modify); {
void set_dma_y_count(unsigned int channel, unsigned short y_count); dma_ch[channel].regs->start_addr = addr;
void set_dma_y_modify(unsigned int channel, short y_modify); }
void set_dma_config(unsigned int channel, unsigned short config); static inline void set_dma_next_desc_addr(unsigned int channel, unsigned long addr)
unsigned short set_bfin_dma_config(char direction, char flow_mode, {
char intr_mode, char dma_mode, char width, dma_ch[channel].regs->next_desc_ptr = addr;
char syncmode); }
void set_dma_curr_addr(unsigned int channel, unsigned long addr); static inline void set_dma_curr_desc_addr(unsigned int channel, unsigned long addr)
{
/* get curr status for polling */ dma_ch[channel].regs->curr_desc_ptr = addr;
unsigned short get_dma_curr_irqstat(unsigned int channel); }
unsigned short get_dma_curr_xcount(unsigned int channel); static inline void set_dma_x_count(unsigned int channel, unsigned short x_count)
unsigned short get_dma_curr_ycount(unsigned int channel); {
unsigned long get_dma_next_desc_ptr(unsigned int channel); dma_ch[channel].regs->x_count = x_count;
unsigned long get_dma_curr_desc_ptr(unsigned int channel); }
unsigned long get_dma_curr_addr(unsigned int channel); static inline void set_dma_y_count(unsigned int channel, unsigned short y_count)
{
/* set large DMA mode descriptor */ dma_ch[channel].regs->y_count = y_count;
void set_dma_sg(unsigned int channel, struct dmasg *sg, int nr_sg); }
static inline void set_dma_x_modify(unsigned int channel, short x_modify)
/* check if current channel is in use */ {
int dma_channel_active(unsigned int channel); dma_ch[channel].regs->x_modify = x_modify;
}
/* common functions must be called in any mode */ static inline void set_dma_y_modify(unsigned int channel, short y_modify)
{
dma_ch[channel].regs->y_modify = y_modify;
}
static inline void set_dma_config(unsigned int channel, unsigned short config)
{
dma_ch[channel].regs->cfg = config;
}
static inline void set_dma_curr_addr(unsigned int channel, unsigned long addr)
{
dma_ch[channel].regs->curr_addr_ptr = addr;
}
static inline unsigned short
set_bfin_dma_config(char direction, char flow_mode,
char intr_mode, char dma_mode, char width, char syncmode)
{
return (direction << 1) | (width << 2) | (dma_mode << 4) |
(intr_mode << 6) | (flow_mode << 12) | (syncmode << 5);
}
static inline unsigned short get_dma_curr_irqstat(unsigned int channel)
{
return dma_ch[channel].regs->irq_status;
}
static inline unsigned short get_dma_curr_xcount(unsigned int channel)
{
return dma_ch[channel].regs->curr_x_count;
}
static inline unsigned short get_dma_curr_ycount(unsigned int channel)
{
return dma_ch[channel].regs->curr_y_count;
}
static inline unsigned long get_dma_next_desc_ptr(unsigned int channel)
{
return dma_ch[channel].regs->next_desc_ptr;
}
static inline unsigned long get_dma_curr_desc_ptr(unsigned int channel)
{
return dma_ch[channel].regs->curr_desc_ptr;
}
static inline unsigned long get_dma_curr_addr(unsigned int channel)
{
return dma_ch[channel].regs->curr_addr_ptr;
}
static inline void set_dma_sg(unsigned int channel, struct dmasg *sg, int ndsize)
{
dma_ch[channel].regs->cfg |= ((ndsize & 0x0F) << 8);
dma_ch[channel].regs->next_desc_ptr = (unsigned long)sg;
}
static inline int dma_channel_active(unsigned int channel)
{
if (dma_ch[channel].chan_status == DMA_CHANNEL_FREE)
return 0;
else
return 1;
}
static inline void disable_dma(unsigned int channel)
{
dma_ch[channel].regs->cfg &= ~DMAEN;
SSYNC();
dma_ch[channel].chan_status = DMA_CHANNEL_REQUESTED;
}
static inline void enable_dma(unsigned int channel)
{
dma_ch[channel].regs->curr_x_count = 0;
dma_ch[channel].regs->curr_y_count = 0;
dma_ch[channel].regs->cfg |= DMAEN;
dma_ch[channel].chan_status = DMA_CHANNEL_ENABLED;
}
void free_dma(unsigned int channel); void free_dma(unsigned int channel);
int dma_channel_active(unsigned int channel); /* check if a channel is in use */
void disable_dma(unsigned int channel);
void enable_dma(unsigned int channel);
int request_dma(unsigned int channel, const char *device_id); int request_dma(unsigned int channel, const char *device_id);
int set_dma_callback(unsigned int channel, irq_handler_t callback, int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data);
void *data);
void dma_disable_irq(unsigned int channel); static inline void dma_disable_irq(unsigned int channel)
void dma_enable_irq(unsigned int channel); {
void clear_dma_irqstat(unsigned int channel); disable_irq(dma_ch[channel].irq);
}
static inline void dma_enable_irq(unsigned int channel)
{
enable_irq(dma_ch[channel].irq);
}
static inline void clear_dma_irqstat(unsigned int channel)
{
dma_ch[channel].regs->irq_status = DMA_DONE | DMA_ERR;
}
void *dma_memcpy(void *dest, const void *src, size_t count); void *dma_memcpy(void *dest, const void *src, size_t count);
void *safe_dma_memcpy(void *dest, const void *src, size_t count); void *safe_dma_memcpy(void *dest, const void *src, size_t count);
void blackfin_dma_early_init(void); void blackfin_dma_early_init(void);
extern int channel2irq(unsigned int channel);
extern struct dma_register *dma_io_base_addr[MAX_DMA_CHANNELS];
#endif #endif
/* /*
* bfin_dma_5xx.c - Blackfin DMA implementation * bfin_dma_5xx.c - Blackfin DMA implementation
* *
* Copyright 2004-2006 Analog Devices Inc. * Copyright 2004-2008 Analog Devices Inc.
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
*/ */
...@@ -20,22 +20,8 @@ ...@@ -20,22 +20,8 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/************************************************************************** struct dma_channel dma_ch[MAX_DMA_CHANNELS];
* Global Variables EXPORT_SYMBOL(dma_ch);
***************************************************************************/
static struct dma_channel dma_ch[MAX_DMA_CHANNELS];
/*------------------------------------------------------------------------------
* Set the Buffer Clear bit in the Configuration register of specific DMA
* channel. This will stop the descriptor based DMA operation.
*-----------------------------------------------------------------------------*/
static void clear_dma_buffer(unsigned int channel)
{
dma_ch[channel].regs->cfg |= RESTART;
SSYNC();
dma_ch[channel].regs->cfg &= ~RESTART;
}
static int __init blackfin_dma_init(void) static int __init blackfin_dma_init(void)
{ {
...@@ -92,9 +78,11 @@ static int __init proc_dma_init(void) ...@@ -92,9 +78,11 @@ static int __init proc_dma_init(void)
late_initcall(proc_dma_init); late_initcall(proc_dma_init);
#endif #endif
/*------------------------------------------------------------------------------ /**
* Request the specific DMA channel from the system. * request_dma - request a DMA channel
*-----------------------------------------------------------------------------*/ *
* Request the specific DMA channel from the system if it's available.
*/
int request_dma(unsigned int channel, const char *device_id) int request_dma(unsigned int channel, const char *device_id)
{ {
pr_debug("request_dma() : BEGIN \n"); pr_debug("request_dma() : BEGIN \n");
...@@ -172,6 +160,19 @@ int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data) ...@@ -172,6 +160,19 @@ int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data)
} }
EXPORT_SYMBOL(set_dma_callback); EXPORT_SYMBOL(set_dma_callback);
/**
* clear_dma_buffer - clear DMA fifos for specified channel
*
* Set the Buffer Clear bit in the Configuration register of specific DMA
* channel. This will stop the descriptor based DMA operation.
*/
static void clear_dma_buffer(unsigned int channel)
{
dma_ch[channel].regs->cfg |= RESTART;
SSYNC();
dma_ch[channel].regs->cfg &= ~RESTART;
}
void free_dma(unsigned int channel) void free_dma(unsigned int channel)
{ {
pr_debug("freedma() : BEGIN \n"); pr_debug("freedma() : BEGIN \n");
...@@ -194,198 +195,6 @@ void free_dma(unsigned int channel) ...@@ -194,198 +195,6 @@ void free_dma(unsigned int channel)
} }
EXPORT_SYMBOL(free_dma); EXPORT_SYMBOL(free_dma);
void dma_enable_irq(unsigned int channel)
{
pr_debug("dma_enable_irq() : BEGIN \n");
enable_irq(dma_ch[channel].irq);
}
EXPORT_SYMBOL(dma_enable_irq);
void dma_disable_irq(unsigned int channel)
{
pr_debug("dma_disable_irq() : BEGIN \n");
disable_irq(dma_ch[channel].irq);
}
EXPORT_SYMBOL(dma_disable_irq);
int dma_channel_active(unsigned int channel)
{
if (dma_ch[channel].chan_status == DMA_CHANNEL_FREE) {
return 0;
} else {
return 1;
}
}
EXPORT_SYMBOL(dma_channel_active);
/*------------------------------------------------------------------------------
* stop the specific DMA channel.
*-----------------------------------------------------------------------------*/
void disable_dma(unsigned int channel)
{
pr_debug("stop_dma() : BEGIN \n");
dma_ch[channel].regs->cfg &= ~DMAEN; /* Clean the enable bit */
SSYNC();
dma_ch[channel].chan_status = DMA_CHANNEL_REQUESTED;
/* Needs to be enabled Later */
pr_debug("stop_dma() : END \n");
return;
}
EXPORT_SYMBOL(disable_dma);
void enable_dma(unsigned int channel)
{
pr_debug("enable_dma() : BEGIN \n");
dma_ch[channel].chan_status = DMA_CHANNEL_ENABLED;
dma_ch[channel].regs->curr_x_count = 0;
dma_ch[channel].regs->curr_y_count = 0;
dma_ch[channel].regs->cfg |= DMAEN; /* Set the enable bit */
pr_debug("enable_dma() : END \n");
return;
}
EXPORT_SYMBOL(enable_dma);
/*------------------------------------------------------------------------------
* Set the Start Address register for the specific DMA channel
* This function can be used for register based DMA,
* to setup the start address
* addr: Starting address of the DMA Data to be transferred.
*-----------------------------------------------------------------------------*/
void set_dma_start_addr(unsigned int channel, unsigned long addr)
{
pr_debug("set_dma_start_addr() : BEGIN \n");
dma_ch[channel].regs->start_addr = addr;
pr_debug("set_dma_start_addr() : END\n");
}
EXPORT_SYMBOL(set_dma_start_addr);
void set_dma_next_desc_addr(unsigned int channel, unsigned long addr)
{
pr_debug("set_dma_next_desc_addr() : BEGIN \n");
dma_ch[channel].regs->next_desc_ptr = addr;
pr_debug("set_dma_next_desc_addr() : END\n");
}
EXPORT_SYMBOL(set_dma_next_desc_addr);
void set_dma_curr_desc_addr(unsigned int channel, unsigned long addr)
{
pr_debug("set_dma_curr_desc_addr() : BEGIN \n");
dma_ch[channel].regs->curr_desc_ptr = addr;
pr_debug("set_dma_curr_desc_addr() : END\n");
}
EXPORT_SYMBOL(set_dma_curr_desc_addr);
void set_dma_x_count(unsigned int channel, unsigned short x_count)
{
dma_ch[channel].regs->x_count = x_count;
}
EXPORT_SYMBOL(set_dma_x_count);
void set_dma_y_count(unsigned int channel, unsigned short y_count)
{
dma_ch[channel].regs->y_count = y_count;
}
EXPORT_SYMBOL(set_dma_y_count);
void set_dma_x_modify(unsigned int channel, short x_modify)
{
dma_ch[channel].regs->x_modify = x_modify;
}
EXPORT_SYMBOL(set_dma_x_modify);
void set_dma_y_modify(unsigned int channel, short y_modify)
{
dma_ch[channel].regs->y_modify = y_modify;
}
EXPORT_SYMBOL(set_dma_y_modify);
void set_dma_config(unsigned int channel, unsigned short config)
{
dma_ch[channel].regs->cfg = config;
}
EXPORT_SYMBOL(set_dma_config);
unsigned short
set_bfin_dma_config(char direction, char flow_mode,
char intr_mode, char dma_mode, char width, char syncmode)
{
unsigned short config;
config =
((direction << 1) | (width << 2) | (dma_mode << 4) |
(intr_mode << 6) | (flow_mode << 12) | (syncmode << 5));
return config;
}
EXPORT_SYMBOL(set_bfin_dma_config);
void set_dma_sg(unsigned int channel, struct dmasg *sg, int nr_sg)
{
dma_ch[channel].regs->cfg |= ((nr_sg & 0x0F) << 8);
dma_ch[channel].regs->next_desc_ptr = (unsigned int)sg;
}
EXPORT_SYMBOL(set_dma_sg);
void set_dma_curr_addr(unsigned int channel, unsigned long addr)
{
dma_ch[channel].regs->curr_addr_ptr = addr;
}
EXPORT_SYMBOL(set_dma_curr_addr);
/*------------------------------------------------------------------------------
* Get the DMA status of a specific DMA channel from the system.
*-----------------------------------------------------------------------------*/
unsigned short get_dma_curr_irqstat(unsigned int channel)
{
return dma_ch[channel].regs->irq_status;
}
EXPORT_SYMBOL(get_dma_curr_irqstat);
/*------------------------------------------------------------------------------
* Clear the DMA_DONE bit in DMA status. Stop the DMA completion interrupt.
*-----------------------------------------------------------------------------*/
void clear_dma_irqstat(unsigned int channel)
{
dma_ch[channel].regs->irq_status |= 3;
}
EXPORT_SYMBOL(clear_dma_irqstat);
/*------------------------------------------------------------------------------
* Get current DMA xcount of a specific DMA channel from the system.
*-----------------------------------------------------------------------------*/
unsigned short get_dma_curr_xcount(unsigned int channel)
{
return dma_ch[channel].regs->curr_x_count;
}
EXPORT_SYMBOL(get_dma_curr_xcount);
/*------------------------------------------------------------------------------
* Get current DMA ycount of a specific DMA channel from the system.
*-----------------------------------------------------------------------------*/
unsigned short get_dma_curr_ycount(unsigned int channel)
{
return dma_ch[channel].regs->curr_y_count;
}
EXPORT_SYMBOL(get_dma_curr_ycount);
unsigned long get_dma_next_desc_ptr(unsigned int channel)
{
return dma_ch[channel].regs->next_desc_ptr;
}
EXPORT_SYMBOL(get_dma_next_desc_ptr);
unsigned long get_dma_curr_desc_ptr(unsigned int channel)
{
return dma_ch[channel].regs->curr_desc_ptr;
}
EXPORT_SYMBOL(get_dma_curr_desc_ptr);
unsigned long get_dma_curr_addr(unsigned int channel)
{
return dma_ch[channel].regs->curr_addr_ptr;
}
EXPORT_SYMBOL(get_dma_curr_addr);
#ifdef CONFIG_PM #ifdef CONFIG_PM
# ifndef MAX_DMA_SUSPEND_CHANNELS # ifndef MAX_DMA_SUSPEND_CHANNELS
# define MAX_DMA_SUSPEND_CHANNELS MAX_DMA_CHANNELS # define MAX_DMA_SUSPEND_CHANNELS MAX_DMA_CHANNELS
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册