[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.12,1.13

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv5014

Modified Files:
	vaxlance.c 
Log Message:
Made the diagmem thing a bit cleaner calls to a routine in arch/vax/kernel/cpu_ka43.c now


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vaxlance.c	2001/06/17 11:43:45	1.12
+++ vaxlance.c	2001/07/31 17:47:26	1.13
@@ -953,26 +953,9 @@
 
 		 */
 
-		/* KA43 only.  
-		 *
-		 * The KA43 seems to be nicely fscked up...  All physical memory
-		 * is accessible from 0x00000000 up (as normal) and also from
-		 * 0x28000000 (KA43_DIAGMEM) in IO space.  In order to reliably
-		 * share memory with the LANCE, we _must_ read and write to this
-		 * shared memory via the DIAGMEM region.  Maybe this bypasses
-		 * caches or something...  If you don't do this you get evil
-		 * "memory read parity error" machine checks.
-		 *
-		 */
-
-		/* You MUST remember to clear the DIAGMEM bits in these PTEs
-		   before giving the pages back to free_pages() */
-
-		pte_t *p = GET_SPTE_VIRT(dev->mem_start);
-		for (i=0; i<(65536>>PAGE_SHIFT); i++, p++) {
-			set_pte(p, __pte(pte_val(*p) | (KA43_DIAGMEM >> PAGELET_SHIFT)));
-			__flush_tlb_one(dev->mem_start + i * PAGE_SIZE);
-		}
+		/* KA43 only. */
+	   	ka43_diagmem_remap(dev->mem_start, 65536);
+		 
 	}
 	
 
@@ -1087,7 +1070,11 @@
 	dev->irq=0x94;
 	printk("Using LANCE interrupt vector %d", dev->irq);
 #endif
-	dev->open = &lance_open;
+      /* tmp  atp*/
+	dev->irq=0x94;
+	printk("Using LANCE interrupt vector %d", dev->irq);
+
+        dev->open = &lance_open;
 	dev->stop = &lance_close;
 	dev->hard_start_xmit = &lance_start_xmit;
 	dev->tx_timeout = &lance_tx_timeout;