patch-2.3.48 linux/arch/mips/jazz/jazzdma.c

• Lines: 74
• Date: Thu Feb 24 22:52:30 2000
• Orig file: v2.3.47/linux/arch/mips/jazz/jazzdma.c
• Orig date: Fri Jun 25 17:40:12 1999

diff -u --recursive --new-file v2.3.47/linux/arch/mips/jazz/jazzdma.c linux/arch/mips/jazz/jazzdma.c
@@ -10,10 +10,11 @@
  * and return the more usual NULL pointer as logical address.
  */
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
+#include <linux/bootmem.h>
 #include <asm/mipsregs.h>
-#include <asm/mipsconfig.h>
 #include <asm/jazz.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -27,7 +28,6 @@
 #define CONF_DEBUG_VDMA 0
 
 static unsigned long vdma_pagetable_start = 0;
-static unsigned long vdma_pagetable_end = 0;
 
 /*
  * Debug stuff
@@ -59,30 +59,31 @@
 /*
  * Initialize the Jazz R4030 dma controller
  */
-unsigned long vdma_init(unsigned long memory_start, unsigned long memory_end)
+void __init vdma_init(void)
 {
-    /*
-     * Allocate 32k of memory for DMA page tables.
-     * This needs to be page aligned and should be
-     * uncached to avoid cache flushing after every
-     * update.
-     */
-    vdma_pagetable_start = KSEG1ADDR((memory_start + 4095) & ~4095);
-    vdma_pagetable_end = vdma_pagetable_start + VDMA_PGTBL_SIZE;
-    flush_cache_all();
-
-    /*
-     * Clear the R4030 translation table
-     */
-    vdma_pgtbl_init();
-
-    r4030_write_reg32(JAZZ_R4030_TRSTBL_BASE,PHYSADDR(vdma_pagetable_start));
-    r4030_write_reg32(JAZZ_R4030_TRSTBL_LIM,VDMA_PGTBL_SIZE);
-    r4030_write_reg32(JAZZ_R4030_TRSTBL_INV,0);
+	/*
+	 * Allocate 32k of memory for DMA page tables.  This needs to be page
+	 * aligned and should be uncached to avoid cache flushing after every
+	 * update.
+	 */
+	vdma_pagetable_start = alloc_bootmem_low_pages(VDMA_PGTBL_SIZE);
+	if (!vdma_pagetable_start)
+		BUG();
+	dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE);
+	vdma_pagetable_start = KSEG1ADDR(vdma_pagetable_start);
+
+	/*
+	 * Clear the R4030 translation table
+	 */
+	vdma_pgtbl_init();
+
+	r4030_write_reg32(JAZZ_R4030_TRSTBL_BASE,PHYSADDR(vdma_pagetable_start));
+	r4030_write_reg32(JAZZ_R4030_TRSTBL_LIM, VDMA_PGTBL_SIZE);
+	r4030_write_reg32(JAZZ_R4030_TRSTBL_INV, 0);
 
-    printk("VDMA: R4030 DMA pagetables initialized.\n");
+	printk("VDMA: R4030 DMA pagetables initialized.\n");
 
-    return KSEG0ADDR(vdma_pagetable_end);
+	return KSEG0ADDR(vdma_pagetable_end);
 }
 
 /*