Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 9 Jul 2009 19:02:17 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r195511 - projects/mips/sys/mips/mips
Message-ID:  <200907091902.n69J2Hek094314@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gonzo
Date: Thu Jul  9 19:02:17 2009
New Revision: 195511
URL: http://svn.freebsd.org/changeset/base/195511

Log:
  - Ooops, this debug code wasn't supposed to get into
       final commit. My appologises.

Modified:
  projects/mips/sys/mips/mips/busdma_machdep.c

Modified: projects/mips/sys/mips/mips/busdma_machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/busdma_machdep.c	Thu Jul  9 19:00:29 2009	(r195510)
+++ projects/mips/sys/mips/mips/busdma_machdep.c	Thu Jul  9 19:02:17 2009	(r195511)
@@ -611,32 +611,18 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
 
 	if (flags & BUS_DMA_COHERENT) {
 		void *tmpaddr = (void *)*vaddr;
-		unsigned char *buf1 = (void *)*vaddr;
 
 		if (tmpaddr) {
-			int gi;
 			tmpaddr = (void *)MIPS_PHYS_TO_KSEG1(vtophys(tmpaddr));
-			unsigned char *buf2 = tmpaddr;
-			unsigned char *buf3 = (void
-			    *)MIPS_PHYS_TO_KSEG0(vtophys(tmpaddr));
 			newmap->origbuffer = *vaddr;
 			newmap->allocbuffer = tmpaddr;
 			mips_dcache_wbinv_range((vm_offset_t)*vaddr,
 			    dmat->maxsize);
 			*vaddr = tmpaddr;
-			for (gi = 0; gi < dmat->maxsize; gi++) {
-				if (buf1[gi] != buf2[gi])
-					panic("cache fucked up\n");
-
-				if (buf1[gi] != buf3[gi])
-					panic("cache fucked up2\n");
-			}
 		} else
 			newmap->origbuffer = newmap->allocbuffer = NULL;
-	} else {
-		unsigned char *buf1 = (void *)*vaddr;
+	} else
 		newmap->origbuffer = newmap->allocbuffer = NULL;
-	}
 
         return (0);
 }
@@ -807,8 +793,6 @@ segdone:
 
 	*segp = seg;
 	*lastaddrp = lastaddr;
-	if (map->flags & DMAMAP_COHERENT)
-		panic("not coherent\n");
 
 	/*
 	 * Did we fit?
@@ -1065,7 +1049,6 @@ _bus_dmamap_sync_bp(bus_dma_tag_t dmat, 
 {
 	struct bounce_page *bpage;
 
-	panic("sync bp");
 	STAILQ_FOREACH(bpage, &map->bpages, links) {
 		if (op & BUS_DMASYNC_PREWRITE) {
 			bcopy((void *)bpage->datavaddr,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907091902.n69J2Hek094314>