Blackfin arch: push bf561 PERIPHERAL_MAP oddity into bf561-specific code
[safe/jmp/linux-2.6] / arch / blackfin / kernel / bfin_dma_5xx.c
index fd5448d..36f78c1 100644 (file)
@@ -29,7 +29,9 @@
 
 #include <linux/errno.h>
 #include <linux/module.h>
+#include <linux/proc_fs.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <asm/dma.h>
 #include <asm/cacheflush.h>
 
-/* Remove unused code not exported by symbol or internally called */
-#define REMOVE_DEAD_CODE
-
 /**************************************************************************
  * Global Variables
 ***************************************************************************/
 
-static struct dma_channel dma_ch[MAX_BLACKFIN_DMA_CHANNEL];
+static struct dma_channel dma_ch[MAX_DMA_CHANNELS];
 
 /*------------------------------------------------------------------------------
  *       Set the Buffer Clear bit in the Configuration register of specific DMA
@@ -56,7 +55,6 @@ static void clear_dma_buffer(unsigned int channel)
        dma_ch[channel].regs->cfg |= RESTART;
        SSYNC();
        dma_ch[channel].regs->cfg &= ~RESTART;
-       SSYNC();
 }
 
 static int __init blackfin_dma_init(void)
@@ -65,31 +63,76 @@ static int __init blackfin_dma_init(void)
 
        printk(KERN_INFO "Blackfin DMA Controller\n");
 
-       for (i = 0; i < MAX_BLACKFIN_DMA_CHANNEL; i++) {
+       for (i = 0; i < MAX_DMA_CHANNELS; i++) {
                dma_ch[i].chan_status = DMA_CHANNEL_FREE;
                dma_ch[i].regs = dma_io_base_addr[i];
                mutex_init(&(dma_ch[i].dmalock));
        }
        /* Mark MEMDMA Channel 0 as requested since we're using it internally */
-       dma_ch[CH_MEM_STREAM0_DEST].chan_status = DMA_CHANNEL_REQUESTED;
-       dma_ch[CH_MEM_STREAM0_SRC].chan_status = DMA_CHANNEL_REQUESTED;
+       request_dma(CH_MEM_STREAM0_DEST, "Blackfin dma_memcpy");
+       request_dma(CH_MEM_STREAM0_SRC, "Blackfin dma_memcpy");
 
 #if defined(CONFIG_DEB_DMA_URGENT)
        bfin_write_EBIU_DDRQUE(bfin_read_EBIU_DDRQUE()
                         | DEB1_URGENT | DEB2_URGENT | DEB3_URGENT);
 #endif
+
        return 0;
 }
-
 arch_initcall(blackfin_dma_init);
 
+#ifdef CONFIG_PROC_FS
+
+static int proc_dma_show(struct seq_file *m, void *v)
+{
+       int i;
+
+       for (i = 0 ; i < MAX_DMA_CHANNELS; ++i)
+               if (dma_ch[i].chan_status != DMA_CHANNEL_FREE)
+                       seq_printf(m, "%2d: %s\n", i, dma_ch[i].device_id);
+
+       return 0;
+}
+
+static int proc_dma_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, proc_dma_show, NULL);
+}
+
+static const struct file_operations proc_dma_operations = {
+       .open           = proc_dma_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static int __init proc_dma_init(void)
+{
+       return proc_create("dma", 0, NULL, &proc_dma_operations) != NULL;
+}
+late_initcall(proc_dma_init);
+#endif
+
 /*------------------------------------------------------------------------------
  *     Request the specific DMA channel from the system.
  *-----------------------------------------------------------------------------*/
-int request_dma(unsigned int channel, char *device_id)
+int request_dma(unsigned int channel, const char *device_id)
 {
-
        pr_debug("request_dma() : BEGIN \n");
+
+       if (device_id == NULL)
+               printk(KERN_WARNING "request_dma(%u): no device_id given\n", channel);
+
+#if defined(CONFIG_BF561) && ANOMALY_05000182
+       if (channel >= CH_IMEM_STREAM0_DEST && channel <= CH_IMEM_STREAM1_DEST) {
+               if (get_cclk() > 500000000) {
+                       printk(KERN_WARNING
+                              "Request IMDMA failed due to ANOMALY 05000182\n");
+                       return -EFAULT;
+               }
+       }
+#endif
+
        mutex_lock(&(dma_ch[channel].dmalock));
 
        if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED)
@@ -106,15 +149,14 @@ int request_dma(unsigned int channel, char *device_id)
 
 #ifdef CONFIG_BF54x
        if (channel >= CH_UART2_RX && channel <= CH_UART3_TX) {
-               if (strncmp(device_id, "BFIN_UART", 9) == 0) {
-                       dma_ch[channel].regs->peripheral_map &= 0x0FFF;
-                       dma_ch[channel].regs->peripheral_map |=
+               unsigned int per_map;
+               per_map = dma_ch[channel].regs->peripheral_map & 0xFFF;
+               if (strncmp(device_id, "BFIN_UART", 9) == 0)
+                       dma_ch[channel].regs->peripheral_map = per_map |
                                ((channel - CH_UART2_RX + 0xC)<<12);
-               } else {
-                       dma_ch[channel].regs->peripheral_map &= 0x0FFF;
-                       dma_ch[channel].regs->peripheral_map |=
+               else
+                       dma_ch[channel].regs->peripheral_map = per_map |
                                ((channel - CH_UART2_RX + 0x6)<<12);
-               }
        }
 #endif
 
@@ -132,19 +174,16 @@ EXPORT_SYMBOL(request_dma);
 
 int set_dma_callback(unsigned int channel, dma_interrupt_t callback, void *data)
 {
-       int ret_irq = 0;
-
        BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
+              && channel < MAX_DMA_CHANNELS));
 
        if (callback != NULL) {
                int ret_val;
-               ret_irq = channel2irq(channel);
-
+               dma_ch[channel].irq = channel2irq(channel);
                dma_ch[channel].data = data;
 
                ret_val =
-                   request_irq(ret_irq, (void *)callback, IRQF_DISABLED,
+                   request_irq(dma_ch[channel].irq, callback, IRQF_DISABLED,
                                dma_ch[channel].device_id, data);
                if (ret_val) {
                        printk(KERN_NOTICE
@@ -159,20 +198,16 @@ EXPORT_SYMBOL(set_dma_callback);
 
 void free_dma(unsigned int channel)
 {
-       int ret_irq;
-
        pr_debug("freedma() : BEGIN \n");
        BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
+              && channel < MAX_DMA_CHANNELS));
 
        /* Halt the DMA */
        disable_dma(channel);
        clear_dma_buffer(channel);
 
-       if (dma_ch[channel].irq_callback != NULL) {
-               ret_irq = channel2irq(channel);
-               free_irq(ret_irq, dma_ch[channel].data);
-       }
+       if (dma_ch[channel].irq_callback != NULL)
+               free_irq(dma_ch[channel].irq, dma_ch[channel].data);
 
        /* Clear the DMA Variable in the Channel */
        mutex_lock(&(dma_ch[channel].dmalock));
@@ -185,27 +220,15 @@ EXPORT_SYMBOL(free_dma);
 
 void dma_enable_irq(unsigned int channel)
 {
-       int ret_irq;
-
        pr_debug("dma_enable_irq() : BEGIN \n");
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
-       ret_irq = channel2irq(channel);
-       enable_irq(ret_irq);
+       enable_irq(dma_ch[channel].irq);
 }
 EXPORT_SYMBOL(dma_enable_irq);
 
 void dma_disable_irq(unsigned int channel)
 {
-       int ret_irq;
-
        pr_debug("dma_disable_irq() : BEGIN \n");
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
-       ret_irq = channel2irq(channel);
-       disable_irq(ret_irq);
+       disable_irq(dma_ch[channel].irq);
 }
 EXPORT_SYMBOL(dma_disable_irq);
 
@@ -225,10 +248,6 @@ EXPORT_SYMBOL(dma_channel_active);
 void disable_dma(unsigned int channel)
 {
        pr_debug("stop_dma() : BEGIN \n");
-
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->cfg &= ~DMAEN;    /* Clean the enable bit */
        SSYNC();
        dma_ch[channel].chan_status = DMA_CHANNEL_REQUESTED;
@@ -241,16 +260,11 @@ EXPORT_SYMBOL(disable_dma);
 void enable_dma(unsigned int channel)
 {
        pr_debug("enable_dma() : BEGIN \n");
-
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        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 */
-       SSYNC();
        pr_debug("enable_dma() : END \n");
        return;
 }
@@ -265,12 +279,7 @@ EXPORT_SYMBOL(enable_dma);
 void set_dma_start_addr(unsigned int channel, unsigned long addr)
 {
        pr_debug("set_dma_start_addr() : BEGIN \n");
-
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->start_addr = addr;
-       SSYNC();
        pr_debug("set_dma_start_addr() : END\n");
 }
 EXPORT_SYMBOL(set_dma_start_addr);
@@ -278,12 +287,7 @@ 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");
-
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->next_desc_ptr = addr;
-       SSYNC();
        pr_debug("set_dma_next_desc_addr() : END\n");
 }
 EXPORT_SYMBOL(set_dma_next_desc_addr);
@@ -291,63 +295,38 @@ 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");
-
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->curr_desc_ptr = addr;
-       SSYNC();
        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)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->x_count = x_count;
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_x_count);
 
 void set_dma_y_count(unsigned int channel, unsigned short y_count)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->y_count = y_count;
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_y_count);
 
 void set_dma_x_modify(unsigned int channel, short x_modify)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->x_modify = x_modify;
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_x_modify);
 
 void set_dma_y_modify(unsigned int channel, short y_modify)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->y_modify = y_modify;
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_y_modify);
 
 void set_dma_config(unsigned int channel, unsigned short config)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->cfg = config;
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_config);
 
@@ -366,24 +345,14 @@ EXPORT_SYMBOL(set_bfin_dma_config);
 
 void set_dma_sg(unsigned int channel, struct dmasg *sg, int nr_sg)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->cfg |= ((nr_sg & 0x0F) << 8);
-
        dma_ch[channel].regs->next_desc_ptr = (unsigned int)sg;
-
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_sg);
 
 void set_dma_curr_addr(unsigned int channel, unsigned long addr)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        dma_ch[channel].regs->curr_addr_ptr = addr;
-       SSYNC();
 }
 EXPORT_SYMBOL(set_dma_curr_addr);
 
@@ -392,9 +361,6 @@ EXPORT_SYMBOL(set_dma_curr_addr);
  *-----------------------------------------------------------------------------*/
 unsigned short get_dma_curr_irqstat(unsigned int channel)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        return dma_ch[channel].regs->irq_status;
 }
 EXPORT_SYMBOL(get_dma_curr_irqstat);
@@ -404,8 +370,6 @@ EXPORT_SYMBOL(get_dma_curr_irqstat);
  *-----------------------------------------------------------------------------*/
 void clear_dma_irqstat(unsigned int channel)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
        dma_ch[channel].regs->irq_status |= 3;
 }
 EXPORT_SYMBOL(clear_dma_irqstat);
@@ -415,9 +379,6 @@ EXPORT_SYMBOL(clear_dma_irqstat);
  *-----------------------------------------------------------------------------*/
 unsigned short get_dma_curr_xcount(unsigned int channel)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        return dma_ch[channel].regs->curr_x_count;
 }
 EXPORT_SYMBOL(get_dma_curr_xcount);
@@ -427,40 +388,56 @@ EXPORT_SYMBOL(get_dma_curr_xcount);
  *-----------------------------------------------------------------------------*/
 unsigned short get_dma_curr_ycount(unsigned int channel)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-              && channel < MAX_BLACKFIN_DMA_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)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-             && channel < MAX_BLACKFIN_DMA_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)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-             && channel < MAX_BLACKFIN_DMA_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)
 {
-       BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
-             && channel < MAX_BLACKFIN_DMA_CHANNEL));
-
        return dma_ch[channel].regs->curr_addr_ptr;
 }
 EXPORT_SYMBOL(get_dma_curr_addr);
 
+#ifdef CONFIG_PM
+# ifndef MAX_DMA_SUSPEND_CHANNELS
+#  define MAX_DMA_SUSPEND_CHANNELS MAX_DMA_CHANNELS
+# endif
+int blackfin_dma_suspend(void)
+{
+       int i;
+
+       for (i = 0; i < MAX_DMA_SUSPEND_CHANNELS; ++i) {
+               if (dma_ch[i].chan_status == DMA_CHANNEL_ENABLED) {
+                       printk(KERN_ERR "DMA Channel %d failed to suspend\n", i);
+                       return -EBUSY;
+               }
+
+               dma_ch[i].saved_peripheral_map = dma_ch[i].regs->peripheral_map;
+       }
+
+       return 0;
+}
+
+void blackfin_dma_resume(void)
+{
+       int i;
+       for (i = 0; i < MAX_DMA_SUSPEND_CHANNELS; ++i)
+               dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map;
+}
+#endif
+
 static void *__dma_memcpy(void *dest, const void *src, size_t size)
 {
        int direction;  /* 1 - address decrease, 0 - address increase */
@@ -614,8 +591,8 @@ void *dma_memcpy(void *dest, const void *src, size_t size)
        rest = size - bulk;
        if (bulk)
                __dma_memcpy(dest, src, bulk);
-       addr = __dma_memcpy(dest+bulk, src+bulk, rest);
-       return addr;
+       __dma_memcpy(dest+bulk, src+bulk, rest);
+       return dest;
 }
 EXPORT_SYMBOL(dma_memcpy);