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

Get rid of get_maxctx() - it doesn't work on newer cpus and we will have 

to find a better way for (some) sun4v machines - all sun4u use 13 bit
contexts anyway.
This commit is contained in:
martin 2008-12-09 21:01:02 +00:00
parent a6139afb88
commit f915c7039b
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/sparc64/sparc64/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.286 2008/10/30 12:29:45 nakayama Exp $ */
/* $NetBSD: locore.s,v 1.287 2008/12/09 21:01:02 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@ -5242,24 +5242,6 @@ cpu_mp_startup_end:
ENTRY(get_romtba)
retl
rdpr %tba, %o0
/*
* int get_maxctx(void)
*
* Get number of available contexts.
*
*/
.align 8
ENTRY(get_maxctx)
set CTX_SECONDARY, %o1 ! Store -1 in the context register
mov -1, %o2
stxa %o2, [%o1] ASI_DMMU
membar #Sync
ldxa [%o1] ASI_DMMU, %o0 ! then read it back
membar #Sync
stxa %g0, [%o1] ASI_DMMU
membar #Sync
retl
inc %o0
/*
* openfirmware(cell* param);

13
sys/arch/sparc64/sparc64/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.227 2008/12/09 20:45:45 pooka Exp $ */
/* $NetBSD: pmap.c,v 1.228 2008/12/09 21:01:02 martin Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.227 2008/12/09 20:45:45 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.228 2008/12/09 21:01:02 martin Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@ -1196,16 +1196,19 @@ cpu_pmap_prepare(struct cpu_info *ci, bool initial)
/*
* Initialize the per CPU parts for the cpu running this code (despite the
* passed cpuinfo) - get_maxctx() only works on the local cpu.
* passed cpuinfo).
*/
void
cpu_pmap_init(struct cpu_info *ci)
{
extern int get_maxctx(void);
size_t ctxsize;
ci->ci_pmap_next_ctx = 1;
ci->ci_numctx = get_maxctx();
#ifdef SUN4V
#error find out if we have 16 or 13 bit context ids
#else
ci->ci_numctx = 0x2000; /* all SUN4U use 13 bit contexts */
#endif
ctxsize = sizeof(paddr_t)*ci->ci_numctx;
ci->ci_ctxbusy = (paddr_t *)kdata_alloc(ctxsize, sizeof(uint64_t));
memset(ci->ci_ctxbusy, 0, ctxsize);