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

Compute c_totalsize for split caches correctly: it's max, not sum (and

Browse Source 
we even have that documented in cache.h).  Initialize c_nlines for
split caches.

This should fix srmmu cache flush routines for split I/D caches that
has been broken since cache.c revision 1.79 started using c_nlines.
This commit is contained in:
uwe 2005-10-25 22:12:07 +00:00
parent c2ec5cfaef
commit 0e0096c441
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/sparc/sparc/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.192 2005/06/19 20:00:28 thorpej Exp $ */
/* $NetBSD: cpu.c,v 1.193 2005/10/25 22:12:07 uwe Exp $ */
/*
* Copyright (c) 1996
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.192 2005/06/19 20:00:28 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.193 2005/10/25 22:12:07 uwe Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@ -1335,7 +1335,8 @@ getcacheinfo_obp(sc, node)
ci->c_l2linesize = min(ci->ic_l2linesize, ci->dc_l2linesize);
ci->c_linesize = min(ci->ic_linesize, ci->dc_linesize);
ci->c_totalsize = ci->ic_totalsize + ci->dc_totalsize;
ci->c_totalsize = max(ci->ic_totalsize, ci->dc_totalsize);
ci->c_nlines = ci->c_totalsize >> ci->c_l2linesize;
} else {
/* unified I/D cache */
ci->c_nlines = prom_getpropint(node, "cache-nlines", 128);
@ -1856,7 +1857,8 @@ getcacheinfo_sun4d(sc, node)
ci->c_l2linesize = min(ci->ic_l2linesize, ci->dc_l2linesize);
ci->c_linesize = min(ci->ic_linesize, ci->dc_linesize);
ci->c_totalsize = ci->ic_totalsize + ci->dc_totalsize;
ci->c_totalsize = max(ci->ic_totalsize, ci->dc_totalsize);
ci->c_nlines = ci->c_totalsize >> ci->c_l2linesize;
if (node_has_property(node, "ecache-nlines")) {
/* we have a L2 "e"xternal cache */