svn commit: r195511 - projects/mips/sys/mips/mips
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Thu Jul 9 19:02:18 UTC 2009
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,
More information about the svn-src-projects
mailing list