diff options
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/include/cpu.h | 5 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka43.c | 19 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka46.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka48.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka49.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka53.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka650.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka680.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/vax/pmap.c | 6 | ||||
| -rw-r--r-- | sys/arch/vax/vax/vxt.c | 8 |
10 files changed, 35 insertions, 47 deletions
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h index 4dc1b5a8654..19bd039089a 100644 --- a/sys/arch/vax/include/cpu.h +++ b/sys/arch/vax/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.27 2008/07/18 23:43:31 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.28 2008/08/15 22:38:20 miod Exp $ */ /* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */ /* @@ -69,7 +69,7 @@ extern struct cpu_info cpu_info_store; * struct for the current cpu is set up in locore.c. */ struct cpu_dep { - void (*cpu_steal_pages)(void); /* pmap init before mm is on */ + void (*cpu_init)(void); /* pmap init before mm is on */ int (*cpu_mchk)(caddr_t); /* Machine check handling */ void (*cpu_memerr)(void); /* Memory subsystem errors */ /* Autoconfiguration */ @@ -97,7 +97,6 @@ extern int bootdev; #define setsoftnet() mtpr(IPL_SOFTNET,PR_SIRR) #define setsoftclock() mtpr(IPL_SOFTCLOCK,PR_SIRR) -#define todr() mfpr(PR_TODR) /* * Preempt the current process if in interrupt from user mode, * or after the current trap/syscall if in system mode. diff --git a/sys/arch/vax/vax/ka43.c b/sys/arch/vax/vax/ka43.c index a01d2352047..a148e97f80d 100644 --- a/sys/arch/vax/vax/ka43.c +++ b/sys/arch/vax/vax/ka43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka43.c,v 1.10 2006/06/30 16:14:31 miod Exp $ */ +/* $OpenBSD: ka43.c,v 1.11 2008/08/15 22:38:23 miod Exp $ */ /* $NetBSD: ka43.c,v 1.19 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -53,7 +53,7 @@ #include <machine/clock.h> static void ka43_conf(void); -static void ka43_steal_pages(void); +static void ka43_init(void); static int ka43_mchk(caddr_t); static void ka43_memerr(void); @@ -71,7 +71,7 @@ static void ka43_clrf(void); struct cpu_dep ka43_calls = { - ka43_steal_pages, + ka43_init, ka43_mchk, ka43_memerr, ka43_conf, @@ -84,11 +84,6 @@ struct cpu_dep ka43_calls = { ka43_clrf, }; -/* - * ka43_steal_pages() is called with MMU disabled, after that call MMU gets - * enabled. Thus we initialize these four pointers with physical addresses, - * but before leving ka43_steal_pages() we reset them to virtual addresses. - */ static volatile struct ka43_cpu *ka43_cpu = (void *)KA43_CPU_BASE; static volatile u_int *ka43_creg = (void *)KA43_CH2_CREG; static volatile u_int *ka43_ctag = (void *)KA43_CT2_BASE; @@ -320,14 +315,8 @@ ka43_conf() } -/* - * The interface for communication with the LANCE ethernet controller - * is setup in the xxx_steal_pages() routine. We decrease highest - * available address by 64K and use this area as communication buffer. - */ - void -ka43_steal_pages() +ka43_init() { int val; diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c index 5d250bb38cf..318eee29b83 100644 --- a/sys/arch/vax/vax/ka46.c +++ b/sys/arch/vax/vax/ka46.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka46.c,v 1.7 2002/07/21 19:28:50 hugh Exp $ */ +/* $OpenBSD: ka46.c,v 1.8 2008/08/15 22:38:23 miod Exp $ */ /* $NetBSD: ka46.c,v 1.12 2000/03/04 07:27:49 matt Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -55,7 +55,7 @@ #include <machine/vsbus.h> static void ka46_conf(void); -static void ka46_steal_pages(void); +static void ka46_init(void); static void ka46_memerr(void); static int ka46_mchk(caddr_t); static void ka46_halt(void); @@ -68,7 +68,7 @@ struct vs_cpu *ka46_cpu; * Declaration of 46-specific calls. */ struct cpu_dep ka46_calls = { - ka46_steal_pages, + ka46_init, ka46_mchk, ka46_memerr, ka46_conf, @@ -153,7 +153,7 @@ ka46_mchk(addr) } void -ka46_steal_pages() +ka46_init() { /* Turn on caches (to speed up execution a bit) */ diff --git a/sys/arch/vax/vax/ka48.c b/sys/arch/vax/vax/ka48.c index 88655fbb655..6d633bf0ebd 100644 --- a/sys/arch/vax/vax/ka48.c +++ b/sys/arch/vax/vax/ka48.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka48.c,v 1.8 2002/07/21 19:28:51 hugh Exp $ */ +/* $OpenBSD: ka48.c,v 1.9 2008/08/15 22:38:23 miod Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -56,7 +56,7 @@ #include <machine/vsbus.h> static void ka48_conf(void); -static void ka48_steal_pages(void); +static void ka48_init(void); static void ka48_memerr(void); static int ka48_mchk(caddr_t); static void ka48_halt(void); @@ -69,7 +69,7 @@ struct vs_cpu *ka48_cpu; * Declaration of 48-specific calls. */ struct cpu_dep ka48_calls = { - ka48_steal_pages, + ka48_init, ka48_mchk, ka48_memerr, ka48_conf, @@ -145,7 +145,7 @@ ka48_mchk(addr) } void -ka48_steal_pages() +ka48_init() { /* Turn on caches (to speed up execution a bit) */ ka48_cache_enable(); diff --git a/sys/arch/vax/vax/ka49.c b/sys/arch/vax/vax/ka49.c index 728ffd723b5..29889c95080 100644 --- a/sys/arch/vax/vax/ka49.c +++ b/sys/arch/vax/vax/ka49.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka49.c,v 1.7 2002/07/21 19:28:51 hugh Exp $ */ +/* $OpenBSD: ka49.c,v 1.8 2008/08/15 22:38:23 miod Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -46,7 +46,7 @@ static void ka49_halt(void); static void ka49_reboot(int); static void ka49_softmem(void *); static void ka49_hardmem(void *); -static void ka49_steal_pages(void); +static void ka49_init(void); static void ka49_cache_enable(void); static void ka49_halt(void); @@ -54,7 +54,7 @@ static void ka49_halt(void); * Declaration of 49-specific calls. */ struct cpu_dep ka49_calls = { - ka49_steal_pages, + ka49_init, ka49_mchk, ka49_memerr, ka49_conf, @@ -209,7 +209,7 @@ ka49_mchk(addr) } void -ka49_steal_pages() +ka49_init() { /* * Get the soft and hard memory error vectors now. diff --git a/sys/arch/vax/vax/ka53.c b/sys/arch/vax/vax/ka53.c index c9c7720aa9a..16bcd73bf6c 100644 --- a/sys/arch/vax/vax/ka53.c +++ b/sys/arch/vax/vax/ka53.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka53.c,v 1.5 2002/09/21 13:42:43 hugh Exp $ */ +/* $OpenBSD: ka53.c,v 1.6 2008/08/15 22:38:23 miod Exp $ */ /* $NetBSD: ka53.c,v 1.2 2000/06/04 02:19:27 matt Exp $ */ /* * Copyright (c) 2002 Hugh Graham. @@ -48,14 +48,14 @@ static void ka53_memerr(void); static int ka53_mchk(caddr_t); static void ka53_softmem(void *); static void ka53_hardmem(void *); -static void ka53_steal_pages(void); +static void ka53_init(void); static void ka53_cache_enable(void); /* * Declaration of 680-specific calls. */ struct cpu_dep ka53_calls = { - ka53_steal_pages, + ka53_init, ka53_mchk, ka53_memerr, ka53_conf, @@ -221,7 +221,7 @@ ka53_mchk(caddr_t addr) } void -ka53_steal_pages() +ka53_init() { /* diff --git a/sys/arch/vax/vax/ka650.c b/sys/arch/vax/vax/ka650.c index e9cbec591b0..2169c529e64 100644 --- a/sys/arch/vax/vax/ka650.c +++ b/sys/arch/vax/vax/ka650.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka650.c,v 1.14 2008/08/14 11:41:30 martin Exp $ */ +/* $OpenBSD: ka650.c,v 1.15 2008/08/15 22:38:23 miod Exp $ */ /* $NetBSD: ka650.c,v 1.25 2001/04/27 15:02:37 ragge Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -69,7 +69,7 @@ static void uvaxIII_memerr(void); static int uvaxIII_mchk(caddr_t); struct cpu_dep ka650_calls = { - 0, /* No special page stealing anymore */ + NULL, uvaxIII_mchk, uvaxIII_memerr, uvaxIII_conf, diff --git a/sys/arch/vax/vax/ka680.c b/sys/arch/vax/vax/ka680.c index 7eeaa3e7fef..08b8af1503c 100644 --- a/sys/arch/vax/vax/ka680.c +++ b/sys/arch/vax/vax/ka680.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka680.c,v 1.10 2002/09/21 13:42:43 hugh Exp $ */ +/* $OpenBSD: ka680.c,v 1.11 2008/08/15 22:38:23 miod Exp $ */ /* $NetBSD: ka680.c,v 1.3 2001/01/28 21:01:53 ragge Exp $ */ /* * Copyright (c) 2002 Hugh Graham. @@ -55,7 +55,7 @@ static void ka680_conf(void); static void ka680_cache_enable(void); static void ka680_softmem(void *); static void ka680_hardmem(void *); -static void ka680_steal_pages(void); +static void ka680_init(void); static void ka680_memerr(void); static int ka680_mchk(caddr_t); @@ -87,7 +87,7 @@ static int ka680_mchk(caddr_t); * Declaration of KA680-specific calls. */ struct cpu_dep ka680_calls = { - ka680_steal_pages, + ka680_init, ka680_mchk, ka680_memerr, ka680_conf, @@ -264,7 +264,7 @@ ka680_softmem(void *arg) } void -ka680_steal_pages() +ka680_init() { /* * Get the soft and hard memory error vectors now. diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c index fab3009d1d2..24b71bf7980 100644 --- a/sys/arch/vax/vax/pmap.c +++ b/sys/arch/vax/vax/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.45 2008/08/14 11:41:30 martin Exp $ */ +/* $OpenBSD: pmap.c,v 1.46 2008/08/15 22:38:23 miod Exp $ */ /* $NetBSD: pmap.c,v 1.74 1999/11/13 21:32:25 matt Exp $ */ /* * Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden. @@ -211,8 +211,8 @@ pmap_bootstrap() avail_start = scb_init(avail_start); bcopy((caddr_t)proc0paddr + REDZONEADDR, 0, sizeof(struct rpb)); - if (dep_call->cpu_steal_pages) - (*dep_call->cpu_steal_pages)(); + if (dep_call->cpu_init) + (*dep_call->cpu_init)(); avail_start = ROUND_PAGE(avail_start); virtual_avail = ROUND_PAGE(virtual_avail); diff --git a/sys/arch/vax/vax/vxt.c b/sys/arch/vax/vax/vxt.c index fd18a73a06a..7b0df8ba156 100644 --- a/sys/arch/vax/vax/vxt.c +++ b/sys/arch/vax/vax/vxt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vxt.c,v 1.1 2006/08/27 16:55:41 miod Exp $ */ +/* $OpenBSD: vxt.c,v 1.2 2008/08/15 22:38:23 miod Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -48,7 +48,7 @@ #include <machine/clock.h> static void vxt_conf(void); -static void vxt_steal_pages(void); +static void vxt_init(void); static void vxt_memerr(void); static int vxt_mchk(caddr_t); static void vxt_halt(void); @@ -62,7 +62,7 @@ struct vs_cpu *vxt_cpu; */ struct cpu_dep vxt_calls = { - vxt_steal_pages, + vxt_init, vxt_mchk, vxt_memerr, vxt_conf, @@ -117,7 +117,7 @@ vxt_mchk(addr) } void -vxt_steal_pages() +vxt_init() { /* Turn on caches (to speed up execution a bit) */ vxt_cache_enable(); |