patch-2.4.0-test5 linux/arch/arm/kernel/dma-arc.c

Next file: linux/arch/arm/kernel/dma-dummy.c
Previous file: linux/arch/arm/kernel/dma-a5k.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/arch/arm/kernel/dma-arc.c linux/arch/arm/kernel/dma-arc.c
@@ -3,148 +3,200 @@
  *
  * Copyright (C) 1998-1999 Dave Gilbert / Russell King
  *
- * DMA functions specific to Archimedes architecture
+ * DMA functions specific to Archimedes and A5000 architecture
  */
 #include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/init.h>
 
 #include <asm/dma.h>
+#include <asm/fiq.h>
 #include <asm/io.h>
 #include <asm/hardware.h>
 
 #include "dma.h"
 
-#define DEBUG
+#define DPRINTK(x...) printk(KERN_DEBUG x)
 
-int arch_request_dma(dmach_t channel, dma_t *dma, const char * dev_id)
+#if defined(CONFIG_BLK_DEV_FD1772) || defined(CONFIG_BLK_DEV_FD1772_MODULE)
+static void arc_floppy_data_enable_dma(dmach_t channel, dma_t *dma)
 {
-  printk("arch_request_dma channel=%d F0=%d F1=%d\n",channel,DMA_VIRTUAL_FLOPPY0,DMA_VIRTUAL_FLOPPY1);
-	if (channel == DMA_VIRTUAL_FLOPPY0 ||
-	    channel == DMA_VIRTUAL_FLOPPY1)
-		return 0;
-	else
-		return -EINVAL;
-}
-
-void arch_free_dma(dmach_t channel, dma_t *dma)
-{
-}
-
-void arch_enable_dma(dmach_t channel, dma_t *dma)
-{
-  printk("arch_enable_dma channel=%d F0=%d F1=%d\n",channel,DMA_VIRTUAL_FLOPPY0,DMA_VIRTUAL_FLOPPY1);
-	switch (channel) {
-#ifdef CONFIG_BLK_DEV_FD1772
-	case DMA_VIRTUAL_FLOPPY0: { /* Data DMA */
-		switch (dma->dma_mode) {
-		case DMA_MODE_READ: /* read */
-    	    	{
-			extern unsigned char fdc1772_dma_read, fdc1772_dma_read_end;
-			extern void fdc1772_setupdma(unsigned int count,unsigned int addr);
-			unsigned long flags;
-#ifdef DEBUG
-			printk("enable_dma fdc1772 data read\n");
-#endif
-			save_flags(flags);
-			cliIF();
+	DPRINTK("arc_floppy_data_enable_dma\n");
+	switch (dma->dma_mode) {
+	case DMA_MODE_READ: { /* read */
+		extern unsigned char fdc1772_dma_read, fdc1772_dma_read_end;
+		extern void fdc1772_setupdma(unsigned int count,unsigned int addr);
+		unsigned long flags;
+		DPRINTK("enable_dma fdc1772 data read\n");
+		save_flags(flags);
+		cliIF();
 			
-			memcpy ((void *)0x1c, (void *)&fdc1772_dma_read,
-				&fdc1772_dma_read_end - &fdc1772_dma_read);
-			fdc1772_setupdma(dma->buf.length, __bus_to_virt(dma->buf.address)); /* Sets data pointer up */
-			enable_irq (64);
-			restore_flags(flags);
-		}
-		break;
-
-		case DMA_MODE_WRITE: /* write */
-	        {
-			extern unsigned char fdc1772_dma_write, fdc1772_dma_write_end;
-			extern void fdc1772_setupdma(unsigned int count,unsigned int addr);
-			unsigned long flags;
-
-#ifdef DEBUG
-			printk("enable_dma fdc1772 data write\n");
-#endif
-			save_flags(flags);
-			cliIF();
-			memcpy ((void *)0x1c, (void *)&fdc1772_dma_write,
-				&fdc1772_dma_write_end - &fdc1772_dma_write);
-			fdc1772_setupdma(dma->buf.length, __bus_to_virt(dma->buf.address)); /* Sets data pointer up */
-			enable_irq (64);
-
-			restore_flags(flags);
-		}
-		break;
-    		default:
-			printk ("enable_dma: dma%d not initialised\n", channel);
-			return;
-		}
-	}
-	break;
+		memcpy ((void *)0x1c, (void *)&fdc1772_dma_read,
+			&fdc1772_dma_read_end - &fdc1772_dma_read);
+		fdc1772_setupdma(dma->buf.length, __bus_to_virt(dma->buf.address)); /* Sets data pointer up */
+		enable_irq (64);
+		restore_flags(flags);
+	   }
+	   break;
 
-	case DMA_VIRTUAL_FLOPPY1: { /* Command end FIQ - actually just sets a flag */
-		/* Need to build a branch at the FIQ address */
-		extern void fdc1772_comendhandler(void);
+	case DMA_MODE_WRITE: { /* write */
+		extern unsigned char fdc1772_dma_write, fdc1772_dma_write_end;
+		extern void fdc1772_setupdma(unsigned int count,unsigned int addr);
 		unsigned long flags;
-
-		/*printk("enable_dma fdc1772 command end FIQ\n");*/
+		DPRINTK("enable_dma fdc1772 data write\n");
 		save_flags(flags);
 		cliIF();
-	
-		*((unsigned int *)0x1c)=0xea000000 | (((unsigned int)fdc1772_comendhandler-(0x1c+8))/4); /* B fdc1772_comendhandler */
+		memcpy ((void *)0x1c, (void *)&fdc1772_dma_write,
+			&fdc1772_dma_write_end - &fdc1772_dma_write);
+		fdc1772_setupdma(dma->buf.length, __bus_to_virt(dma->buf.address)); /* Sets data pointer up */
+		enable_irq (64);
 
 		restore_flags(flags);
-	}
-	break;
-#endif
+	    }
+	    break;
+	default:
+		printk ("enable_dma: dma%d not initialised\n", channel);
 	}
 }
 
-int arch_get_dma_residue(dmach_t channel, dma_t *dma)
+static int arc_floppy_data_get_dma_residue(dmach_t channel, dma_t *dma)
 {
-  switch (channel) {
-#ifdef CONFIG_BLK_DEV_FD1772
-    case DMA_VIRTUAL_FLOPPY0: { /* Data DMA */
-        extern unsigned int fdc1772_bytestogo;
-
-        /* 10/1/1999 DAG - I presume its the number of bytes left? */
-        return fdc1772_bytestogo;
-      };
-      break;
-
-    case DMA_VIRTUAL_FLOPPY1: { /* Command completed */
-        /* 10/1/1999 DAG - Presume whether there is an outstanding command? */
-        extern unsigned int fdc1772_fdc_int_done;
-
-        return (fdc1772_fdc_int_done==0)?1:0; /* Explicit! If the int done is 0 then 1 int to go */
-      };
-      break;
+	extern unsigned int fdc1772_bytestogo;
 
-#endif
+	/* 10/1/1999 DAG - I presume its the number of bytes left? */
+	return fdc1772_bytestogo;
+}
 
-    default:
-      printk("dma-arc.c:arch_get_dma_residue called with unknown/unconfigured DMA channel\n");
-      return 0;
-  };
+static void arc_floppy_cmdend_enable_dma(dmach_t channel, dma_t *dma)
+{
+	/* Need to build a branch at the FIQ address */
+	extern void fdc1772_comendhandler(void);
+	unsigned long flags;
+
+	DPRINTK("arc_floppy_cmdend_enable_dma\n");
+	/*printk("enable_dma fdc1772 command end FIQ\n");*/
+	save_flags(flags);
+	cliIF();
+	
+	/* B fdc1772_comendhandler */
+	*((unsigned int *)0x1c)=0xea000000 |
+			(((unsigned int)fdc1772_comendhandler-(0x1c+8))/4);
+
+	restore_flags(flags);
+}
+
+static int arc_floppy_cmdend_get_dma_residue(dmach_t channel, dma_t *dma)
+{
+	/* 10/1/1999 DAG - Presume whether there is an outstanding command? */
+	extern unsigned int fdc1772_fdc_int_done;
+
+	* Explicit! If the int done is 0 then 1 int to go */
+	return (fdc1772_fdc_int_done==0)?1:0;
 }
 
-void arch_disable_dma(dmach_t channel, dma_t *dma)
+static void arc_disable_dma(dmach_t channel, dma_t *dma)
 {
-	if (channel != DMA_VIRTUAL_FLOPPY0 &&
-	    channel != DMA_VIRTUAL_FLOPPY1)
-		printk("arch_disable_dma: invalid channel %d\n", channel);
-	else
-		disable_irq(dma->dma_irq);
+	disable_irq(dma->dma_irq);
 }
 
-int arch_set_dma_speed(dmach_t channel, dma_t *dma, int cycle_ns)
+static struct dma_ops arc_floppy_data_dma_ops = {
+	type:		"FIQDMA",
+	enable:		arc_floppy_data_enable_dma,
+	disable:	arc_disable_dma,
+	residue:	arc_floppy_data_get_dma_residue,
+};
+
+static struct dma_ops arc_floppy_cmdend_dma_ops = {
+	type:		"FIQCMD",
+	enable:		arc_floppy_cmdend_enable_dma,
+	disable:	arc_disable_dma,
+	residue:	arc_floppy_cmdend_get_dma_residue,
+};
+#endif
+
+#ifdef CONFIG_ARCH_A5K
+static struct fiq_handler fh = {
+	name:	"floppydata"
+};
+
+static int a5k_floppy_get_dma_residue(dmach_t channel, dma_t *dma)
+{
+	struct pt_regs regs;
+	get_fiq_regs(&regs);
+	return regs.ARM_r9;
+}
+
+static void a5k_floppy_enable_dma(dmach_t channel, dma_t *dma)
+{
+	struct pt_regs regs;
+	void *fiqhandler_start;
+	unsigned int fiqhandler_length;
+	extern void floppy_fiqsetup(unsigned long len, unsigned long addr,
+				     unsigned long port);
+
+	if (dma->dma_mode == DMA_MODE_READ) {
+		extern unsigned char floppy_fiqin_start, floppy_fiqin_end;
+		fiqhandler_start = &floppy_fiqin_start;
+		fiqhandler_length = &floppy_fiqin_end - &floppy_fiqin_start;
+	} else {
+		extern unsigned char floppy_fiqout_start, floppy_fiqout_end;
+		fiqhandler_start = &floppy_fiqout_start;
+		fiqhandler_length = &floppy_fiqout_end - &floppy_fiqout_start;
+	}
+	if (claim_fiq(&fh)) {
+		printk("floppydma: couldn't claim FIQ.\n");
+		return;
+	}
+	memcpy((void *)0x1c, fiqhandler_start, fiqhandler_length);
+	regs.ARM_r9 = dma->buf.length;
+	regs.ARM_r10 = __bus_to_virt(dma->buf.address);
+	regs.ARM_fp = (int)PCIO_FLOPPYDMABASE;
+	set_fiq_regs(&regs);
+	enable_irq(dma->dma_irq);
+}
+
+static void a5k_floppy_disable_dma(dmach_t channel, dma_t *dma)
+{
+	disable_irq(dma->dma_irq);
+	release_fiq(&fh);
+}
+
+static struct dma_ops a5k_floppy_dma_ops = {
+	type:		"FIQDMA",
+	enable:		a5k_floppy_enable_dma,
+	disable:	a5k_floppy_disable_dma,
+	residue:	a5k_floppy_get_dma_residue,
+};
+#endif
+
+/*
+ * This is virtual DMA - we don't need anything here
+ */
+static int sound_enable_disable_dma(dmach_t channel, dma_t *dma)
 {
-	return 0;
 }
 
+static struct dma_ops sound_dma_ops = {
+	type:		"VIRTUAL",
+	enable:		sound_enable_disable_dma,
+	disable:	sound_enable_disable_dma,
+};
+
 void __init arch_dma_init(dma_t *dma)
 {
-	dma[DMA_VIRTUAL_FLOPPY0].dma_irq = 64;
-	dma[DMA_VIRTUAL_FLOPPY1].dma_irq = 65;
+#if defined(CONFIG_BLK_DEV_FD1772) || defined(CONFIG_BLK_DEV_FD1772_MODULE)
+	if (machine_is_arc()) {
+		dma[DMA_VIRTUAL_FLOPPY0].dma_irq = 64;
+		dma[DMA_VIRTUAL_FLOPPY0].d_ops   = &arc_floppy_data_dma_ops;
+		dma[DMA_VIRTUAL_FLOPPY1].dma_irq = 65;
+		dma[DMA_VIRTUAL_FLOPPY1].d_ops   = &arc_floppy_cmdend_dma_ops;
+	}
+#endif
+#ifdef CONFIG_ARCH_A5K
+	if (machine_is_a5k()) {
+		dma[DMA_VIRTUAL_FLOPPY].dma_irq = 64;
+		dma[DMA_VIRTUAL_FLOPPY].d_ops   = &a5k_floppy_dma_ops;
+	}
+#endif
+	dma[DMA_VIRTUAL_SOUND].d_ops = &sound_dma_ops;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)