CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Tue Feb 12 23:02:58 UTC 2013 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: The file needs opt_multiprocessor to get the CR_CURCPU define. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.70 src/sys/arch/hp700/include/cpu.h:1.71 --- src/sys/arch/hp700/include/cpu.h:1.70 Wed May 23 16:11:37 2012 +++ src/sys/arch/hp700/include/cpu.h Tue Feb 12 23:02:58 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.70 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.71 2013/02/12 23:02:58 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -55,6 +55,7 @@ #ifdef _KERNEL_OPT #include "opt_cputype.h" +#include "opt_multiprocessor.h" #endif #include
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Thu Apr 5 20:17:24 UTC 2012 Modified Files: src/sys/arch/hp700/include: intr.h Log Message: Add the IPI routinte prototypes. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/intr.h diff -u src/sys/arch/hp700/include/intr.h:1.19 src/sys/arch/hp700/include/intr.h:1.20 --- src/sys/arch/hp700/include/intr.h:1.19 Tue Nov 16 08:59:30 2010 +++ src/sys/arch/hp700/include/intr.h Thu Apr 5 20:17:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.19 2010/11/16 08:59:30 uebayasi Exp $ */ +/* $NetBSD: intr.h,v 1.20 2012/04/05 20:17:24 skrll Exp $ */ /* $OpenBSD: intr.h,v 1.26 2009/12/29 13:11:40 jsing Exp $ */ /*- @@ -93,6 +93,13 @@ splraiseipl(ipl_cookie_t icookie) #define setsoftast(l) ((l)->l_md.md_astpending = 1) +#ifdef MULTIPROCESSOR +void hppa_ipi_init(struct cpu_info *); +int hppa_ipi_intr(void *arg); +int hppa_ipi_send(struct cpu_info *, u_long); +int hppa_ipi_broadcast(u_long); +#endif + #endif /* !_LOCORE */ #endif /* !_HP700_INTR_H_ */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Thu Jan 26 08:11:07 UTC 2012 Modified Files: src/sys/arch/hp700/include: pdc.h Log Message: Typo in comment To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/include/pdc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/pdc.h diff -u src/sys/arch/hp700/include/pdc.h:1.19 src/sys/arch/hp700/include/pdc.h:1.20 --- src/sys/arch/hp700/include/pdc.h:1.19 Thu Jun 30 20:09:30 2011 +++ src/sys/arch/hp700/include/pdc.h Thu Jan 26 08:11:06 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.19 2011/06/30 20:09:30 wiz Exp $ */ +/* $NetBSD: pdc.h,v 1.20 2012/01/26 08:11:06 skrll Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -126,7 +126,7 @@ #define PDC_MODEL_ENSPEC 4 /* enable product-specific instrs */ #define PDC_MODEL_DISPEC 5 /* disable product-specific instrs */ #define PDC_MODEL_CPUID 6 /* return CPU versions */ -#define PDC_MODEL_CAPABILITIES 7 /* return capabilites */ +#define PDC_MODEL_CAPABILITIES 7 /* return capabilities */ #define PDC_MODEL_GETBOOTSTOPTS 8 /* return boot test options */ #define PDC_MODEL_SETBOOTSTOPTS 9 /* set boot test options */
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Fri Jan 20 06:51:19 UTC 2012
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.67 src/sys/arch/hp700/include/cpu.h:1.68
--- src/sys/arch/hp700/include/cpu.h:1.67 Fri Jan 20 06:50:00 2012
+++ src/sys/arch/hp700/include/cpu.h Fri Jan 20 06:51:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.67 2012/01/20 06:50:00 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.68 2012/01/20 06:51:19 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -274,7 +274,7 @@ struct cpu_info {
u_long ci_itmr;
#if defined(MULTIPROCESSOR)
- struct lwp *ci_curlwp; /* CPU owner */
+ struct lwp *ci_curlwp; /* CPU owner */
paddr_t ci_stack; /* stack for spin up */
volatile int ci_flags; /* CPU status flags */
#define CPUF_PRIMARY 0x0001 /* ... is monarch/primary */
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Fri Jan 20 06:50:01 UTC 2012
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Add a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.66 src/sys/arch/hp700/include/cpu.h:1.67
--- src/sys/arch/hp700/include/cpu.h:1.66 Mon Feb 7 12:19:35 2011
+++ src/sys/arch/hp700/include/cpu.h Fri Jan 20 06:50:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.66 2011/02/07 12:19:35 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.67 2012/01/20 06:50:00 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -253,6 +253,7 @@ int clock_intr(void *);
* entry within the cpu_info struct.
*/
struct cpu_info {
+ /* Keep this first to simplify the trap handlers */
register_t ci_trapsave[16];/* the "phys" part of frame */
struct cpu_data ci_data; /* MI per-cpu data */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: dyoung Date: Sun Jul 17 23:32:21 UTC 2011 Modified Files: src/sys/arch/hp700/include: Makefile types.h Removed Files: src/sys/arch/hp700/include: bus.h Log Message: Switch to new-style . hp700 releases are unbuildable for reasons not related to my changes here, so I'm not 100% that a release build will run to completion with these changes in place. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp700/include/Makefile \ src/sys/arch/hp700/include/types.h cvs rdiff -u -r1.16 -r0 src/sys/arch/hp700/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/Makefile diff -u src/sys/arch/hp700/include/Makefile:1.11 src/sys/arch/hp700/include/Makefile:1.12 --- src/sys/arch/hp700/include/Makefile:1.11 Sun Jul 17 20:54:40 2011 +++ src/sys/arch/hp700/include/Makefile Sun Jul 17 23:32:21 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2011/07/17 20:54:40 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2011/07/17 23:32:21 dyoung Exp $ INCSDIR= /usr/include/hp700 INCS= ansi.h aout_machdep.h asm.h autoconf.h \ - bswap.h bus.h byte_swap.h \ + bswap.h byte_swap.h \ cdefs.h cpu.h cpufunc.h \ disklabel.h \ eisa_machdep.h elf_machdep.h endian.h endian_machdep.h exec.h \ Index: src/sys/arch/hp700/include/types.h diff -u src/sys/arch/hp700/include/types.h:1.11 src/sys/arch/hp700/include/types.h:1.12 --- src/sys/arch/hp700/include/types.h:1.11 Sun Jun 12 03:35:41 2011 +++ src/sys/arch/hp700/include/types.h Sun Jul 17 23:32:21 2011 @@ -1,11 +1,11 @@ -/* $NetBSD: types.h,v 1.11 2011/06/12 03:35:41 rmind Exp $ */ +/* $NetBSD: types.h,v 1.12 2011/07/17 23:32:21 dyoung Exp $ */ #ifndef _HP700_TYPES_H_ #define _HP700_TYPES_H_ #include -#define __HAVE_DEVICE_REGISTER +#define __HAVE_NEW_STYLE_BUS_H #define __HAVE_MM_MD_DIRECT_MAPPED_PHYS #define __HAVE_MM_MD_KERNACC
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Mon Jan 31 18:21:33 UTC 2011 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Fix CPU_INFO_FOREACH. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.64 src/sys/arch/hp700/include/cpu.h:1.65 --- src/sys/arch/hp700/include/cpu.h:1.64 Mon Jan 31 14:11:02 2011 +++ src/sys/arch/hp700/include/cpu.h Mon Jan 31 18:21:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.64 2011/01/31 14:11:02 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.65 2011/01/31 18:21:33 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -305,7 +305,7 @@ #define CPU_IS_PRIMARY(ci) ((ci)->ci_cpuid == 0) #define CPU_INFO_ITERATOR int -#define CPU_INFO_FOREACH(cii, ci) cii = 0; ci = &cpus[0], cii < hppa_ncpu; cii++, ci++ +#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = &cpus[0]; cii < hppa_ncpu; cii++, ci++ void cpu_boot_secondary_processors(void);
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Tue Jan 25 21:27:48 UTC 2011 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.62 src/sys/arch/hp700/include/cpu.h:1.63 --- src/sys/arch/hp700/include/cpu.h:1.62 Tue Jan 25 21:27:11 2011 +++ src/sys/arch/hp700/include/cpu.h Tue Jan 25 21:27:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.62 2011/01/25 21:27:11 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.63 2011/01/25 21:27:48 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -402,7 +402,7 @@ */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_BOOTED_KERNEL 2 /* string: booted kernel name */ -#define CPU_LCD_BLINK 3 /* int: twiddle heartbeat LED/LCD */ +#define CPU_LCD_BLINK 3 /* int: twiddle heartbeat LED/LCD */ #define CPU_MAXID 4 /* number of valid machdep ids */ #ifdef _KERNEL
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Tue Jan 25 21:27:12 UTC 2011 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: define To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.61 src/sys/arch/hp700/include/cpu.h:1.62 --- src/sys/arch/hp700/include/cpu.h:1.61 Mon Jan 24 07:44:16 2011 +++ src/sys/arch/hp700/include/cpu.h Tue Jan 25 21:27:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.61 2011/01/24 07:44:16 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.62 2011/01/25 21:27:11 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -402,7 +402,7 @@ */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_BOOTED_KERNEL 2 /* string: booted kernel name */ -#define CPU_LCD_BLINK 3 /* int: twiddle heartbeat LED/LCD */ +#define CPU_LCD_BLINK 3 /* int: twiddle heartbeat LED/LCD */ #define CPU_MAXID 4 /* number of valid machdep ids */ #ifdef _KERNEL
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Mon Jan 24 07:44:16 UTC 2011 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Provide LWP_PC To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.60 src/sys/arch/hp700/include/cpu.h:1.61 --- src/sys/arch/hp700/include/cpu.h:1.60 Sun Jan 23 21:53:40 2011 +++ src/sys/arch/hp700/include/cpu.h Mon Jan 24 07:44:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.60 2011/01/23 21:53:40 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.61 2011/01/24 07:44:16 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -233,6 +233,11 @@ int clock_intr(void *); +/* + * LWP_PC: the program counter for the given lwp. + */ +#define LWP_PC(l) ((l)->l_md.md_regs->tf_iioq_head) + #define cpu_signotify(l) (setsoftast(l)) #define cpu_need_proftick(l) ((l)->l_pflag |= LP_OWEUPC, setsoftast(l))
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Thu Jan 20 19:47:40 UTC 2011 Modified Files: src/sys/arch/hp700/include: autoconf.h cpu.h Log Message: Move the clock_intr declaration. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp700/include/autoconf.h cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/autoconf.h diff -u src/sys/arch/hp700/include/autoconf.h:1.17 src/sys/arch/hp700/include/autoconf.h:1.18 --- src/sys/arch/hp700/include/autoconf.h:1.17 Thu Jan 13 21:15:16 2011 +++ src/sys/arch/hp700/include/autoconf.h Thu Jan 20 19:47:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.h,v 1.17 2011/01/13 21:15:16 skrll Exp $ */ +/* $NetBSD: autoconf.h,v 1.18 2011/01/20 19:47:40 skrll Exp $ */ /* $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $ */ @@ -91,6 +91,4 @@ int mbprint(void *, const char *); int mbsubmatch(device_t, struct cfdata *, const int *, void *); -int clock_intr(void *); - void dumpconf(void); Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.56 src/sys/arch/hp700/include/cpu.h:1.57 --- src/sys/arch/hp700/include/cpu.h:1.56 Mon Jan 17 12:42:41 2011 +++ src/sys/arch/hp700/include/cpu.h Thu Jan 20 19:47:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.56 2011/01/17 12:42:41 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.57 2011/01/20 19:47:40 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -212,6 +212,8 @@ #define CLKF_INTR(framep) ((framep)->cf_flags & TFF_INTR) #define CLKF_USERMODE(framep) ((framep)->cf_flags & T_USER) +int clock_intr(void *); + #define cpu_signotify(l) (setsoftast(l)) #define cpu_need_proftick(l) ((l)->l_pflag |= LP_OWEUPC, setsoftast(l))
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Mon Jan 17 12:42:41 UTC 2011 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.55 src/sys/arch/hp700/include/cpu.h:1.56 --- src/sys/arch/hp700/include/cpu.h:1.55 Sun Dec 26 21:05:34 2010 +++ src/sys/arch/hp700/include/cpu.h Mon Jan 17 12:42:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.55 2010/12/26 21:05:34 he Exp $ */ +/* $NetBSD: cpu.h,v 1.56 2011/01/17 12:42:41 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -338,7 +338,7 @@ void hppa_ras(struct lwp *); int spcopy(pa_space_t, const void *, pa_space_t, void *, size_t); int spstrcpy(pa_space_t, const void *, pa_space_t, void *, size_t, - size_t *); +size_t *); int copy_on_fault(void); void lwp_trampoline(void); void setfunc_trampoline(void);
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Wed Jan 5 07:40:16 UTC 2011 Modified Files: src/sys/arch/hp700/include: autoconf.h Log Message: Unwrap short line. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/include/autoconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/autoconf.h diff -u src/sys/arch/hp700/include/autoconf.h:1.15 src/sys/arch/hp700/include/autoconf.h:1.16 --- src/sys/arch/hp700/include/autoconf.h:1.15 Tue Jan 4 10:42:34 2011 +++ src/sys/arch/hp700/include/autoconf.h Wed Jan 5 07:40:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.h,v 1.15 2011/01/04 10:42:34 skrll Exp $ */ +/* $NetBSD: autoconf.h,v 1.16 2011/01/05 07:40:16 skrll Exp $ */ /* $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $ */ @@ -86,8 +86,8 @@ void (*)(device_t, struct confargs *)); int mbprint(void *, const char *); -int mbsubmatch(device_t, struct cfdata *, - const int *, void *); +int mbsubmatch(device_t, struct cfdata *, const int *, void *); + int clock_intr(void *); void dumpconf(void);
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Mon Jan 3 19:20:12 UTC 2011
Modified Files:
src/sys/arch/hp700/include: autoconf.h
Log Message:
Reformat comment.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/include/autoconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/autoconf.h
diff -u src/sys/arch/hp700/include/autoconf.h:1.13 src/sys/arch/hp700/include/autoconf.h:1.14
--- src/sys/arch/hp700/include/autoconf.h:1.13 Tue Nov 3 05:07:25 2009
+++ src/sys/arch/hp700/include/autoconf.h Mon Jan 3 19:20:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.13 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: autoconf.h,v 1.14 2011/01/03 19:20:11 skrll Exp $ */
/* $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $ */
@@ -56,9 +56,9 @@
#define HP700CF_IRQ_UNDEF (-1)
#define hp700cf_irq cf_loc[GEDOENSCF_IRQ]
-/* this is used for hppa_knownmodules table
- * describing known to this port modules,
- * system boards, cpus, fpus and busses
+/*
+ * This is used for hppa_knownmodules table describing known to this port
+ * modules, system boards, cpus, fpus and busses.
*/
struct hppa_mod_info {
int mi_type;
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: he Date: Sun Dec 26 21:05:35 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Expose parts of struct cpu_info if _KMEMUSER is defined, for the benefit of e.g. vmstat. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.54 src/sys/arch/hp700/include/cpu.h:1.55 --- src/sys/arch/hp700/include/cpu.h:1.54 Fri Dec 24 16:00:13 2010 +++ src/sys/arch/hp700/include/cpu.h Sun Dec 26 21:05:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.54 2010/12/24 16:00:13 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.55 2010/12/26 21:05:34 he Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -215,6 +215,10 @@ #define cpu_signotify(l) (setsoftast(l)) #define cpu_need_proftick(l) ((l)->l_pflag |= LP_OWEUPC, setsoftast(l)) +#endif /* _KERNEL */ + +#if defined(_KERNEL) || defined(_KMEMUSER) + #include /* @@ -227,6 +231,7 @@ struct cpu_data ci_data; /* MI per-cpu data */ +#ifndef _KMEMUSER #ifdef MULTIPROCESSOR struct lwp *ci_curlwp; /* CPU owner */ #endif @@ -238,8 +243,12 @@ volatile int ci_cpl; volatile int ci_ipending; /* The pending interrupts. */ u_int ci_intr_depth; /* Nonzero iff running an interrupt. */ +#endif /* !_KMEMUSER */ } __aligned(64); +#endif /* _KERNEL || _KMEMUSER */ + +#if defined(_KERNEL) /* * definitions of cpu-dependent requirements
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Fri Dec 24 16:00:13 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: LOCKDEBUG is not referenced in this file anymore. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.53 src/sys/arch/hp700/include/cpu.h:1.54 --- src/sys/arch/hp700/include/cpu.h:1.53 Sun Dec 12 08:23:15 2010 +++ src/sys/arch/hp700/include/cpu.h Fri Dec 24 16:00:13 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.53 2010/12/12 08:23:15 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.54 2010/12/24 16:00:13 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -190,10 +190,6 @@ #ifndef _LOCORE #ifdef _KERNEL -#if defined(_KERNEL_OPT) -#include "opt_lockdebug.h" -#endif - /* * External definitions unique to PA-RISC cpu support. * These are the "public" declarations - those needed in
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Sat Dec 4 16:04:45 UTC 2010 Modified Files: src/sys/arch/hp700/include: pdc.h Log Message: Remove trailing whitespace from previous. Today is not my day. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/include/pdc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/pdc.h diff -u src/sys/arch/hp700/include/pdc.h:1.14 src/sys/arch/hp700/include/pdc.h:1.15 --- src/sys/arch/hp700/include/pdc.h:1.14 Sat Dec 4 16:02:55 2010 +++ src/sys/arch/hp700/include/pdc.h Sat Dec 4 16:04:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.14 2010/12/04 16:02:55 skrll Exp $ */ +/* $NetBSD: pdc.h,v 1.15 2010/12/04 16:04:45 skrll Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -299,7 +299,7 @@ #define PDC_ERR_NOPROC -1 /* no such procedure */ #define PDC_ERR_NOPT -2 /* no such option */ #define PDC_ERR_COMPL -3 /* unable to complete w/o error */ -#define PDC_ERR_NMOD -5 /* module not found */ +#define PDC_ERR_NMOD -5 /* module not found */ #define PDC_ERR_EOD -9 /* end of device list */ #define PDC_ERR_INVAL -10 /* invalid argument */ #define PDC_ERR_PFAIL -12 /* aborted by powerfail */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Sat Dec 4 16:02:55 UTC 2010 Modified Files: src/sys/arch/hp700/include: pdc.h Log Message: Define PDC_ERR_NMOD To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/include/pdc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/pdc.h diff -u src/sys/arch/hp700/include/pdc.h:1.13 src/sys/arch/hp700/include/pdc.h:1.14 --- src/sys/arch/hp700/include/pdc.h:1.13 Sat Dec 4 16:01:42 2010 +++ src/sys/arch/hp700/include/pdc.h Sat Dec 4 16:02:55 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.13 2010/12/04 16:01:42 skrll Exp $ */ +/* $NetBSD: pdc.h,v 1.14 2010/12/04 16:02:55 skrll Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -299,6 +299,7 @@ #define PDC_ERR_NOPROC -1 /* no such procedure */ #define PDC_ERR_NOPT -2 /* no such option */ #define PDC_ERR_COMPL -3 /* unable to complete w/o error */ +#define PDC_ERR_NMOD -5 /* module not found */ #define PDC_ERR_EOD -9 /* end of device list */ #define PDC_ERR_INVAL -10 /* invalid argument */ #define PDC_ERR_PFAIL -12 /* aborted by powerfail */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Sat Dec 4 16:01:43 UTC 2010 Modified Files: src/sys/arch/hp700/include: pdc.h Log Message: Get capabilities right THIS time. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp700/include/pdc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/pdc.h diff -u src/sys/arch/hp700/include/pdc.h:1.12 src/sys/arch/hp700/include/pdc.h:1.13 --- src/sys/arch/hp700/include/pdc.h:1.12 Sat Dec 4 15:58:52 2010 +++ src/sys/arch/hp700/include/pdc.h Sat Dec 4 16:01:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.12 2010/12/04 15:58:52 skrll Exp $ */ +/* $NetBSD: pdc.h,v 1.13 2010/12/04 16:01:42 skrll Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -126,7 +126,7 @@ #define PDC_MODEL_ENSPEC 4 /* enable product-specific instrs */ #define PDC_MODEL_DISPEC 5 /* disable product-specific instrs */ #define PDC_MODEL_CPUID 6 /* return CPU versions */ -#define PDC_MODEL_CAPABILITES 7 /* return capabilites */ +#define PDC_MODEL_CAPABILITIES 7 /* return capabilites */ #define PDC_MODEL_GETBOOTSTOPTS 8 /* return boot test options */ #define PDC_MODEL_SETBOOTSTOPTS 9 /* set boot test options */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Sat Dec 4 15:58:52 UTC 2010 Modified Files: src/sys/arch/hp700/include: pdc.h Log Message: Spell capabilities correctly in PDC_MODEL_CAPABILITES. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp700/include/pdc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/pdc.h diff -u src/sys/arch/hp700/include/pdc.h:1.11 src/sys/arch/hp700/include/pdc.h:1.12 --- src/sys/arch/hp700/include/pdc.h:1.11 Thu Nov 19 19:28:14 2009 +++ src/sys/arch/hp700/include/pdc.h Sat Dec 4 15:58:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.11 2009/11/19 19:28:14 skrll Exp $ */ +/* $NetBSD: pdc.h,v 1.12 2010/12/04 15:58:52 skrll Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -126,7 +126,7 @@ #define PDC_MODEL_ENSPEC 4 /* enable product-specific instrs */ #define PDC_MODEL_DISPEC 5 /* disable product-specific instrs */ #define PDC_MODEL_CPUID 6 /* return CPU versions */ -#define PDC_MODEL_CPBALITIES 7 /* return capabilites */ +#define PDC_MODEL_CAPABILITES 7 /* return capabilites */ #define PDC_MODEL_GETBOOTSTOPTS 8 /* return boot test options */ #define PDC_MODEL_SETBOOTSTOPTS 9 /* set boot test options */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: uebayasi Date: Tue Nov 16 08:59:30 UTC 2010 Modified Files: src/sys/arch/hp700/include: intr.h Log Message: Don't expose spl* symbols to userland. Should fix build. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/intr.h diff -u src/sys/arch/hp700/include/intr.h:1.18 src/sys/arch/hp700/include/intr.h:1.19 --- src/sys/arch/hp700/include/intr.h:1.18 Tue Apr 6 07:47:48 2010 +++ src/sys/arch/hp700/include/intr.h Tue Nov 16 08:59:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.18 2010/04/06 07:47:48 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.19 2010/11/16 08:59:30 uebayasi Exp $ */ /* $OpenBSD: intr.h,v 1.26 2009/12/29 13:11:40 jsing Exp $ */ /*- @@ -54,6 +54,8 @@ #ifndef _LOCORE +#ifdef _KERNEL + /* The priority level masks. */ extern int imask[NIPL]; @@ -87,6 +89,7 @@ } #include +#endif #define setsoftast(l) ((l)->l_md.md_astpending = 1)
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Sun Jun 6 10:22:43 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Fix CPU_INFO_FOREACH in previous. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.50 src/sys/arch/hp700/include/cpu.h:1.51 --- src/sys/arch/hp700/include/cpu.h:1.50 Sun Jun 6 10:15:51 2010 +++ src/sys/arch/hp700/include/cpu.h Sun Jun 6 10:22:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.50 2010/06/06 10:15:51 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.51 2010/06/06 10:22:43 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -257,7 +257,7 @@ #define CPU_IS_PRIMARY(ci) ((ci)->ci_cpuid == 0) #define CPU_INFO_ITERATOR int -#define CPU_INFO_FOREACH(cii, ci) cii = 0; ci = &cpu_info[0], cii < ncpus; cii++, ci++ +#define CPU_INFO_FOREACH(cii, ci) cii = 0; ci = &cpus[0], cii < ncpus; cii++, ci++ void cpu_boot_secondary_processors(void); #else /* MULTIPROCESSOR */
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Fri Jun 4 06:39:38 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Remove unncessary cast.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.48 src/sys/arch/hp700/include/cpu.h:1.49
--- src/sys/arch/hp700/include/cpu.h:1.48 Fri Jun 4 06:36:34 2010
+++ src/sys/arch/hp700/include/cpu.h Fri Jun 4 06:39:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.48 2010/06/04 06:36:34 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.49 2010/06/04 06:39:38 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -270,7 +270,7 @@
__asm volatile("mfctl %1, %0" : "=r" (l): "i" (CR_CURLWP));
- return (struct lwp *)l;
+ return l;
}
#define curlwphppa_curlwp()
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Fri Jun 4 06:36:34 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Change struct cpu_info layout to improve cache footprint. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.47 src/sys/arch/hp700/include/cpu.h:1.48
--- src/sys/arch/hp700/include/cpu.h:1.47 Tue Jun 1 10:20:29 2010
+++ src/sys/arch/hp700/include/cpu.h Fri Jun 4 06:36:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.47 2010/06/01 10:20:29 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.48 2010/06/04 06:36:34 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -220,7 +220,15 @@
#define cpu_need_proftick(l) ((l)->l_pflag |= LP_OWEUPC, setsoftast(l))
#include
+
+/*
+ * Note that the alignment of ci_trap_save is important since we want to keep
+ * it within a single cache line. As a result, it must be kept as the first
+ * entry within the cpu_info struct.
+ */
struct cpu_info {
+ register_t ci_trapsave[16];/* the "phys" part of frame */
+
struct cpu_data ci_data; /* MI per-cpu data */
struct lwp *ci_curlwp; /* CPU owner */
@@ -232,9 +240,7 @@
volatile int ci_cpl;
volatile int ci_ipending; /* The pending interrupts. */
u_int ci_intr_depth; /* Nonzero iff running an interrupt. */
-
- register_t ci_trapsave[16];/* the "phys" part of frame */
-};
+} __aligned(64);
extern struct cpu_info cpu_info_store;
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: ahoka Date: Mon May 17 09:13:03 UTC 2010 Modified Files: src/sys/arch/hp700/include: elf_machdep.h Log Message: Handle the HAVE_NBTOOL_CONFIG_H case. Fixes hp700 build with objdir. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp700/include/elf_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/elf_machdep.h diff -u src/sys/arch/hp700/include/elf_machdep.h:1.1 src/sys/arch/hp700/include/elf_machdep.h:1.2 --- src/sys/arch/hp700/include/elf_machdep.h:1.1 Thu Jun 6 19:48:07 2002 +++ src/sys/arch/hp700/include/elf_machdep.h Mon May 17 09:13:03 2010 @@ -1,3 +1,7 @@ -/* $NetBSD: elf_machdep.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.2 2010/05/17 09:13:03 ahoka Exp $ */ +#if HAVE_NBTOOL_CONFIG_H +#include +#else #include +#endif
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Mon Apr 26 15:25:24 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Provide hppa_cpu_hastlbu_p
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.45 src/sys/arch/hp700/include/cpu.h:1.46
--- src/sys/arch/hp700/include/cpu.h:1.45 Tue Apr 6 07:58:31 2010
+++ src/sys/arch/hp700/include/cpu.h Mon Apr 26 15:25:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.45 2010/04/06 07:58:31 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.46 2010/04/26 15:25:24 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -289,6 +289,13 @@
return (hppa_cpu_info->hci_features & HPPA_FTRS_W32B) != 0;
}
+static __inline bool
+hppa_cpu_hastlbu_p(void)
+{
+
+ return (hppa_cpu_info->hci_features & HPPA_FTRS_TLBU) != 0;
+}
+
void delay(u_int);
void hppa_init(paddr_t, void *);
void trap(int, struct trapframe *);
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Tue Apr 6 07:58:31 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Add hppa_cpu_ispa20_p
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.44 src/sys/arch/hp700/include/cpu.h:1.45
--- src/sys/arch/hp700/include/cpu.h:1.44 Sat Apr 3 07:46:01 2010
+++ src/sys/arch/hp700/include/cpu.h Tue Apr 6 07:58:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.44 2010/04/03 07:46:01 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.45 2010/04/06 07:58:31 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -282,6 +282,13 @@
extern int (*cpu_desidhash)(void);
+static __inline bool
+hppa_cpu_ispa20_p(void)
+{
+
+ return (hppa_cpu_info->hci_features & HPPA_FTRS_W32B) != 0;
+}
+
void delay(u_int);
void hppa_init(paddr_t, void *);
void trap(int, struct trapframe *);
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Tue Apr 6 07:47:48 UTC 2010 Modified Files: src/sys/arch/hp700/include: intr.h Log Message: G/C setsoftnet and hp700_intr_schedule prototype. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp700/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/intr.h diff -u src/sys/arch/hp700/include/intr.h:1.17 src/sys/arch/hp700/include/intr.h:1.18 --- src/sys/arch/hp700/include/intr.h:1.17 Sat Apr 3 07:46:01 2010 +++ src/sys/arch/hp700/include/intr.h Tue Apr 6 07:47:48 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.17 2010/04/03 07:46:01 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.18 2010/04/06 07:47:48 skrll Exp $ */ /* $OpenBSD: intr.h,v 1.26 2009/12/29 13:11:40 jsing Exp $ */ /*- @@ -89,9 +89,6 @@ #include #define setsoftast(l) ((l)->l_md.md_astpending = 1) -#define setsoftnet() hp700_intr_schedule(softnetmask) - -void hp700_intr_schedule(int); #endif /* !_LOCORE */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Wed Mar 31 06:35:12 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: #define To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.40 src/sys/arch/hp700/include/cpu.h:1.41 --- src/sys/arch/hp700/include/cpu.h:1.40 Tue Mar 30 19:54:28 2010 +++ src/sys/arch/hp700/include/cpu.h Wed Mar 31 06:35:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.40 2010/03/30 19:54:28 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.41 2010/03/31 06:35:12 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -242,7 +242,7 @@ #define curcpu() (&cpu_info_store) #define cpu_number() 0 -#define cpu_proc_fork(p1, p2) +#define cpu_proc_fork(p1, p2) #ifdef MULTIPROCESSOR #define CPU_IS_PRIMARY(ci) 1 @@ -264,7 +264,7 @@ #define curlwphppa_curlwp() -#define DELAY(x) delay(x) +#define DELAY(x) delay(x) static __inline paddr_t kvtop(const void *va)
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Tue Mar 30 19:54:28 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Comments against #endifs. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.39 src/sys/arch/hp700/include/cpu.h:1.40 --- src/sys/arch/hp700/include/cpu.h:1.39 Sun Mar 7 08:44:28 2010 +++ src/sys/arch/hp700/include/cpu.h Tue Mar 30 19:54:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.39 2010/03/07 08:44:28 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.40 2010/03/30 19:54:28 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -250,7 +250,7 @@ #define CPU_INFO_FOREACH(cii, ci) cii = 0; ci = curcpu(), cii < 1; cii++ void cpu_boot_secondary_processors(void); -#endif +#endif /* MULTIPROCESSOR */ static __inline struct lwp * hppa_curlwp(void) @@ -289,7 +289,7 @@ void setfunc_trampoline(void); int cpu_dumpsize(void); int cpu_dump(void); -#endif +#endif /* _KERNEL */ /* * Boot arguments stuff @@ -305,6 +305,6 @@ #define CPU_BOOTED_KERNEL 2 /* string: booted kernel name */ #define CPU_MAXID 3 /* number of valid machdep ids */ -#endif +#endif /* !_LOCORE */ #endif /* _MACHINE_CPU_H_ */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Wed Feb 17 11:33:51 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Add some comments. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.36 src/sys/arch/hp700/include/cpu.h:1.37 --- src/sys/arch/hp700/include/cpu.h:1.36 Wed Feb 17 11:21:24 2010 +++ src/sys/arch/hp700/include/cpu.h Wed Feb 17 11:33:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.36 2010/02/17 11:21:24 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.37 2010/02/17 11:33:51 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -153,16 +153,18 @@ */ #if defined(HP8000_CPU) || defined(HP8200_CPU) || \ defined(HP8500_CPU) || defined(HP8600_CPU) +/* PA2.0 aliases */ #define HPPA_PGALIAS 0x0040 -#define HPPA_PGAMASK 0xffc0 +#define HPPA_PGAMASK 0xffc0 /* PA bits 0-9 not used in index */ #define HPPA_PGAOFF 0x003f #else +/* PA1.x aliases */ #define HPPA_PGALIAS 0x0010 -#define HPPA_PGAMASK 0xfff0 +#define HPPA_PGAMASK 0xfff0 /* PA bits 0-11 not used in index */ #define HPPA_PGAOFF 0x000f #endif -#define HPPA_SPAMASK 0xf0f0f000 +#define HPPA_SPAMASK 0xf0f0f000 /* PA bits 0-3,8-11,16-19 not used */ #define HPPA_IOSPACE 0xf000 #define HPPA_IOLEN 0x1000
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Wed Feb 17 11:21:24 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.35 src/sys/arch/hp700/include/cpu.h:1.36 --- src/sys/arch/hp700/include/cpu.h:1.35 Wed Feb 17 11:14:10 2010 +++ src/sys/arch/hp700/include/cpu.h Wed Feb 17 11:21:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.35 2010/02/17 11:14:10 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.36 2010/02/17 11:21:24 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -57,7 +57,6 @@ #include #include - #ifndef _LOCORE /* types */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Wed Feb 17 11:14:10 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Add aliasing defines for PA2.0 cpus. They will cause unnecessary non-equiv alias handling on PA1.x machines if PA2.0 cpu support is compiled into the kernel. GENERIC currently doesn't have this support enabled. The performance hit of this needs testing. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.34 src/sys/arch/hp700/include/cpu.h:1.35 --- src/sys/arch/hp700/include/cpu.h:1.34 Wed Jun 3 21:08:51 2009 +++ src/sys/arch/hp700/include/cpu.h Wed Feb 17 11:14:10 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.34 2009/06/03 21:08:51 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.35 2010/02/17 11:14:10 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -152,10 +152,17 @@ * definitions of cpu-dependent requirements * referenced in generic code */ - +#if defined(HP8000_CPU) || defined(HP8200_CPU) || \ +defined(HP8500_CPU) || defined(HP8600_CPU) +#define HPPA_PGALIAS 0x0040 +#define HPPA_PGAMASK 0xffc0 +#define HPPA_PGAOFF 0x003f +#else #define HPPA_PGALIAS 0x0010 #define HPPA_PGAMASK 0xfff0 #define HPPA_PGAOFF 0x000f +#endif + #define HPPA_SPAMASK 0xf0f0f000 #define HPPA_IOSPACE 0xf000
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Sat Jan 16 13:49:11 UTC 2010 Modified Files: src/sys/arch/hp700/include: param.h Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp700/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/param.h diff -u src/sys/arch/hp700/include/param.h:1.3 src/sys/arch/hp700/include/param.h:1.4 --- src/sys/arch/hp700/include/param.h:1.3 Fri May 8 09:33:58 2009 +++ src/sys/arch/hp700/include/param.h Sat Jan 16 13:49:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.3 2009/05/08 09:33:58 skrll Exp $ */ +/* $NetBSD: param.h,v 1.4 2010/01/16 13:49:11 skrll Exp $ */ /* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */ @@ -25,9 +25,7 @@ * Utah $Hdr: param.h 1.18 94/12/16$ */ -#include - -#if defined(_NETBSD_SOURCE) +#ifdef _KERNEL #include #endif
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Thu Nov 19 19:28:14 UTC 2009
Modified Files:
src/sys/arch/hp700/include: pdc.h
Log Message:
Fix itlb_cf and dtlb_cf.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp700/include/pdc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/pdc.h
diff -u src/sys/arch/hp700/include/pdc.h:1.10 src/sys/arch/hp700/include/pdc.h:1.11
--- src/sys/arch/hp700/include/pdc.h:1.10 Sun May 24 06:53:35 2009
+++ src/sys/arch/hp700/include/pdc.h Thu Nov 19 19:28:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.h,v 1.10 2009/05/24 06:53:35 skrll Exp $ */
+/* $NetBSD: pdc.h,v 1.11 2009/11/19 19:28:14 skrll Exp $ */
/* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */
@@ -389,14 +389,25 @@
cc_hvers: 2; /* H-VERSION dependent */
};
-struct tlb_cf { /* PDC_CACHE (for "struct pdc_cache") */
+struct itlb_cf { /* PDC_CACHE (for "struct pdc_cache") */
u_int tc_resv1:12, /* (reserved) */
tc_sh : 2, /* separate I and D = 0, shared I and D = 1 */
tc_hvers: 1, /* H-VERSION dependent */
tc_page : 1, /* 2K page size = 0, 4k page size = 1 */
tc_cst : 3, /* incoherent = 0, coherent = 1 */
- tc_resv2: 5, /* (reserved) */
- tc_assoc: 8; /* associativity of TLB */
+ tc_aid : 5, /* access id width = 15 + aid */
+ tc_sr : 6, /* space id width */
+ tc_hv2 : 2; /* H-VERSION dependent */
+};
+
+struct dtlb_cf { /* PDC_CACHE (for "struct pdc_cache") */
+ u_int tc_resv1:12, /* (reserved) */
+ tc_sh : 2, /* separate I and D = 0, shared I and D = 1 */
+ tc_hvers: 1, /* H-VERSION dependent */
+ tc_u: 1, /* TLB U bit implemented */
+ tc_cst : 3, /* incoherent = 0, coherent = 1 */
+ tc_resv2: 11, /* (reserved) */
+ tc_hv2 : 2; /* H-VERSION dependent */
};
struct pdc_cache { /* PDC_CACHE */
@@ -416,7 +427,7 @@
u_int dc_loop; /* number of FDCE's per addr stride (flush) */
/* Instruction TLB */
u_int it_size; /* number of entries in I-TLB */
- struct tlb_cf it_conf; /* I-TLB configuration (see above) */
+ struct itlb_cf it_conf; /* I-TLB configuration (see above) */
u_int it_sp_base; /* start space of I-TLB (for PITLBE flush) */
u_int it_sp_stride; /* space incr per sp_count iteration (flush) */
u_int it_sp_count; /* number of off_count iterations (flush) */
@@ -426,7 +437,7 @@
u_int it_loop; /* number of PITLBE's per off_stride (flush) */
/* Data TLB */
u_int dt_size; /* number of entries in D-TLB */
- struct tlb_cf dt_conf; /* D-TLB configuration (see above) */
+ struct dtlb_cf dt_conf; /* D-TLB configuration (see above) */
u_int dt_sp_base; /* start space of D-TLB (for PDTLBE flush) */
u_int dt_sp_stride; /* space incr per sp_count iteration (flush) */
u_int dt_sp_count; /* number of off_count iterations (flush) */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Wed Aug 12 20:10:41 UTC 2009 Modified Files: src/sys/arch/hp700/include: iomod.h Log Message: Define HPPA_FLEX_SIZE To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp700/include/iomod.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/iomod.h diff -u src/sys/arch/hp700/include/iomod.h:1.6 src/sys/arch/hp700/include/iomod.h:1.7 --- src/sys/arch/hp700/include/iomod.h:1.6 Wed May 27 09:30:14 2009 +++ src/sys/arch/hp700/include/iomod.h Wed Aug 12 20:10:41 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: iomod.h,v 1.6 2009/05/27 09:30:14 skrll Exp $ */ +/* $NetBSD: iomod.h,v 1.7 2009/08/12 20:10:41 skrll Exp $ */ /* $OpenBSD: iomod.h,v 1.18 2007/10/20 16:41:45 miod Exp $ */ @@ -124,6 +124,7 @@ #define MAXMODBUS ((int)(FPA_IOMOD)) /* maximum modules/bus */ #define HPPA_FLEX_MASK 0xFFFC /* (see below) */ +#define HPPA_FLEX_SIZE (~HPPA_FLEX_MASK + 1) #define HPPA_FLEX(a) (((a) & HPPA_FLEX_MASK) >> 18) /* size of HPA space for any device */
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Fri Jul 24 06:57:53 UTC 2009 Modified Files: src/sys/arch/hp700/include: bus.h Log Message: G/C DCIAS To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/bus.h diff -u src/sys/arch/hp700/include/bus.h:1.14 src/sys/arch/hp700/include/bus.h:1.15 --- src/sys/arch/hp700/include/bus.h:1.14 Thu Jul 23 13:34:26 2009 +++ src/sys/arch/hp700/include/bus.h Fri Jul 24 06:57:53 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.14 2009/07/23 13:34:26 skrll Exp $ */ +/* $NetBSD: bus.h,v 1.15 2009/07/24 06:57:53 skrll Exp $ */ /* $OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $ */ @@ -181,8 +181,6 @@ /* bus access routines */ -#define DCIAS(pa) ((void)(pa)) - #define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) #define bus_space_map(t,a,c,ca,hp) \
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Thu May 7 08:16:50 UTC 2009 Modified Files: src/sys/arch/hp700/include: intr.h Log Message: Add __insn_barrier after updating cpl in splraise. PR/41369. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/intr.h diff -u src/sys/arch/hp700/include/intr.h:1.13 src/sys/arch/hp700/include/intr.h:1.14 --- src/sys/arch/hp700/include/intr.h:1.13 Mon Jul 7 12:29:30 2008 +++ src/sys/arch/hp700/include/intr.h Thu May 7 08:16:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.13 2008/07/07 12:29:30 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.14 2009/05/07 08:16:50 skrll Exp $ */ /*- * Copyright (c) 1998, 2001, 2002 The NetBSD Foundation, Inc. @@ -74,6 +74,7 @@ register int ocpl = cpl; cpl = ocpl | ncpl; + __insn_barrier(); return (ocpl); }
