Date: Wed, 2 Jan 2008 08:46:37 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 132296 for review Message-ID: <200801020846.m028kbL9019216@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132296 Change 132296 by imp@imp_paco-paco on 2008/01/02 08:45:38 Resolve conflict between PG_CACHED in vm system and bits that are defined for the MIPS PTE that gets stuck into the tlb. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#3 (text+ko) ==== @@ -107,7 +107,7 @@ #define PG_RW PG_M #define PG_ATTR 0x0000003f #define PG_UNCACHED 0x00000010 -#define PG_CACHED 0x00000018 +#define PG_CACHE 0x00000018 #define PG_CACHEMODE 0x00000038 #define PG_ROPAGE (PG_V | PG_RO | PG_CACHED) /* Write protected */ #define PG_RWPAGE (PG_V | PG_M | PG_CACHED) /* Not wr-prot not clean */ ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#3 (text+ko) ==== @@ -584,7 +584,7 @@ npte = mips_paddr_to_tlbpfn(pa) | PG_RW | PG_V | PG_G | PG_W; if (is_cacheable_mem(pa)) - npte |= PG_CACHED; + npte |= PG_CACHE; else npte |= PG_UNCACHED; @@ -769,7 +769,7 @@ fp->state = TRUE; kva = fp->kva; - npte = mips_paddr_to_tlbpfn(pa) | PG_RW | PG_V | PG_G | PG_W | PG_CACHED; + npte = mips_paddr_to_tlbpfn(pa) | PG_RW | PG_V | PG_G | PG_W | PG_CACHE; pte = pmap_pte(kernel_pmap, kva); *pte = npte; @@ -1703,7 +1703,7 @@ newpte = mips_paddr_to_tlbpfn(pa) | rw | PG_V; if (is_cacheable_mem(pa)) - newpte |= PG_CACHED; + newpte |= PG_CACHE; else newpte |= PG_UNCACHED; @@ -1858,7 +1858,7 @@ *pte = mips_paddr_to_tlbpfn(pa) | PG_V; if (is_cacheable_mem(pa)) - *pte |= PG_CACHED; + *pte |= PG_CACHE; else *pte |= PG_UNCACHED;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801020846.m028kbL9019216>