Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove preprocessor conditional MIPS3_L2CACHE_ABSENT, which was rendered 

superfluous by Tsutsui-san's previous changes.

(this change differs slightly from that posted to port-mips@, as
mips_flushcache_allpvh should be compiled iff MIPS3_PLUS is defined and
MIPS3_L2CACHE_ABSENT should be removed from files.mips as well)
This commit is contained in:
sekiya 2003-12-12 14:55:58 +00:00
parent 119a91826a
commit c0996cb32c
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/mips/conf/files.mips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.mips,v 1.48 2003/10/29 23:41:49 christos Exp $
# $NetBSD: files.mips,v 1.49 2003/12/12 14:55:58 sekiya Exp $
#
defflag opt_cputype.h NOFPU
@ -11,8 +11,7 @@ defflag opt_cputype.h NOFPU
# ENABLE_MIPS_TX3900
# ENABLE_MIPS_R4700
# ENABLE_MIPS_R3NKK
defflag opt_mips_cache.h MIPS3_L2CACHE_ABSENT
MIPS3_NO_PV_UNCACHED
defflag opt_mips_cache.h MIPS3_NO_PV_UNCACHED
ENABLE_MIPS4_CACHE_R10K
file arch/mips/mips/locore_mips1.S mips1

27
sys/arch/mips/mips/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.153 2003/11/01 14:48:16 tsutsui Exp $ */
/* $NetBSD: pmap.c,v 1.154 2003/12/12 14:55:58 sekiya Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.153 2003/11/01 14:48:16 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.154 2003/12/12 14:55:58 sekiya Exp $");
/*
* Manages physical address maps.
@ -260,11 +260,10 @@ struct pool_allocator pmap_pv_page_allocator = {
* Misc. functions.
*/
#ifdef MIPS3_PLUS /* XXX mmu XXX */
#if defined(MIPS3_PLUS) /* XXX mmu XXX */
void mips_dump_segtab(struct proc *);
#endif
static void mips_flushcache_allpvh(paddr_t);
#if defined(MIPS3_L2CACHE_ABSENT)
/*
* Flush virtual addresses associated with a given physical address
*/
@ -288,7 +287,7 @@ mips_flushcache_allpvh(paddr_t pa)
}
#endif
}
#endif /* MIPS3_L2CACHE_ABSENT */
#endif /* MIPS3_PLUS */
/*
* Bootstrap the system enough to run with virtual memory.
@ -1583,7 +1582,7 @@ pmap_zero_page(phys)
mips_pagezero((caddr_t)MIPS_PHYS_TO_KSEG0(phys));
#if defined(MIPS3_PLUS) && defined(MIPS3_L2CACHE_ABSENT) /* XXX mmu XXX */
#if defined(MIPS3_PLUS) /* XXX mmu XXX */
/*
* If we have a virtually-indexed, physically-tagged WB cache,
* and no L2 cache to warn of aliased mappings, we must force a
@ -1595,7 +1594,7 @@ pmap_zero_page(phys)
*/
if (MIPS_HAS_R4K_MMU && mips_sdcache_line_size == 0)
mips_dcache_wbinv_range(MIPS_PHYS_TO_KSEG0(phys), NBPG);
#endif /* MIPS3_PLUS && MIPS3_L2CACHE_ABSENT */
#endif /* MIPS3_PLUS */
}
/*
@ -1616,7 +1615,7 @@ pmap_copy_page(src, dst)
printf("pmap_copy_page(%lx) dst nonphys\n", (u_long)dst);
#endif
#if defined(MIPS3_PLUS) && defined(MIPS3_L2CACHE_ABSENT) /* XXX mmu XXX */
#if defined(MIPS3_PLUS) /* XXX mmu XXX */
/*
* If we have a virtually-indexed, physically-tagged cache,
* and no L2 cache to warn of aliased mappings, we must force an
@ -1635,12 +1634,12 @@ pmap_copy_page(src, dst)
mips_flushcache_allpvh(src);
/* mips_flushcache_allpvh(dst); */
}
#endif /* MIPS3_PLUS && MIPS3_L2CACHE_ABSENT */
#endif /* MIPS3_PLUS */
mips_pagecopy((caddr_t)MIPS_PHYS_TO_KSEG0(dst),
(caddr_t)MIPS_PHYS_TO_KSEG0(src));
#if defined(MIPS3_PLUS) && defined(MIPS3_L2CACHE_ABSENT) /* XXX mmu XXX */
#if defined(MIPS3_PLUS) /* XXX mmu XXX */
/*
* If we have a virtually-indexed, physically-tagged WB cache,
* and no L2 cache to warn of aliased mappings, we must force a
@ -1656,7 +1655,7 @@ pmap_copy_page(src, dst)
mips_dcache_wbinv_range(MIPS_PHYS_TO_KSEG0(src), NBPG);
mips_dcache_wbinv_range(MIPS_PHYS_TO_KSEG0(dst), NBPG);
}
#endif /* MIPS3_PLUS && MIPS3_L2CACHE_ABSENT */
#endif /* MIPS3_PLUS */
}
/*
@ -1882,7 +1881,7 @@ again:
pv->pv_pmap = pmap;
pv->pv_next = NULL;
} else {
#if defined(MIPS3_PLUS) && defined(MIPS3_L2CACHE_ABSENT) /* XXX mmu XXX */
#if defined(MIPS3_PLUS) /* XXX mmu XXX */
if (MIPS_HAS_R4K_MMU && mips_sdcache_line_size == 0) {
/*
* There is at least one other VA mapping this page.
@ -1935,7 +1934,7 @@ again:
}
#endif /* !MIPS3_NO_PV_UNCACHED */
}
#endif /* MIPS3_PLUS && MIPS3_L2CACHE_ABSENT */
#endif /* MIPS3_PLUS */
/*
* There is at least one other VA mapping this page.