diff options
Diffstat (limited to 'sys/arch/powerpc/include')
| -rw-r--r-- | sys/arch/powerpc/include/bat.h | 7 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/cpu.h | 12 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/pmap.h | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/sys/arch/powerpc/include/bat.h b/sys/arch/powerpc/include/bat.h index d2601d9a2bd..030cc56a330 100644 --- a/sys/arch/powerpc/include/bat.h +++ b/sys/arch/powerpc/include/bat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bat.h,v 1.5 2014/10/27 21:56:57 kettenis Exp $ */ +/* $OpenBSD: bat.h,v 1.6 2015/03/31 16:00:38 mpi Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -59,6 +59,11 @@ struct bat { #define BAT_BL_64M 0x000007fc #define BAT_BL_128M 0x00000ffc #define BAT_BL_256M 0x00001ffc +/* Extended Block Lengths (7455+) */ +#define BAT_BL_512M 0x00003ffc +#define BAT_BL_1G 0x00007ffc +#define BAT_BL_2G 0x0000fffc +#define BAT_BL_4G 0x0001fffc #ifdef _KERNEL extern struct bat battable[16]; diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h index 11cc4cc5670..b41167ceefa 100644 --- a/sys/arch/powerpc/include/cpu.h +++ b/sys/arch/powerpc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.60 2015/02/11 07:05:39 dlg Exp $ */ +/* $OpenBSD: cpu.h,v 1.61 2015/03/31 16:00:38 mpi Exp $ */ /* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */ /* @@ -150,7 +150,12 @@ extern struct cpu_info cpu_info[PPC_MAXPROCS]; #define CLKF_PC(frame) ((frame)->srr0) #define CLKF_INTR(frame) ((frame)->depth != 0) -extern int ppc_cpuidle; +extern int ppc_cpuidle; +extern int ppc_proc_is_64b; +extern int ppc_nobat; + +void cpu_bootstrap(void); + /* * This is used during profiling to integrate system time. */ @@ -385,8 +390,6 @@ ppc_intr_disable(void) } int ppc_cpuspeed(int *); -void ppc_check_procid(void); -extern int ppc_proc_is_64b; /* * PowerPC CPU types @@ -409,6 +412,7 @@ extern int ppc_proc_is_64b; #define PPC_CPU_MPC7450 0x8000 #define PPC_CPU_MPC7455 0x8001 #define PPC_CPU_MPC7457 0x8002 +#define PPC_CPU_MPC83xx 0x8083 /* * This needs to be included late since it relies on definitions higher diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h index ba66701637c..d422f56c249 100644 --- a/sys/arch/powerpc/include/pmap.h +++ b/sys/arch/powerpc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.55 2015/02/15 21:34:33 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.56 2015/03/31 16:00:38 mpi Exp $ */ /* $NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $ */ /*- @@ -134,6 +134,7 @@ boolean_t pteclrbits(struct vm_page *pg, u_int mask, u_int clear); #define __HAVE_PMAP_DIRECT void pmap_bootstrap(u_int kernelstart, u_int kernelend); +void pmap_enable_mmu(); void pmap_pinit(struct pmap *); void pmap_release(struct pmap *); |