diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-04-27 22:41:47 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-04-27 22:41:47 +0000 |
| commit | a10bdbeff1033de44b37c9b030f9b39bbd008fa0 (patch) | |
| tree | 729300affddec79fb520e1338f4740a93f0e317b /sys/arch/arm/include | |
| parent | af8ada589a2ecd07d021494e027795b3b1ae2454 (diff) | |
Bring over the changes to mainbus(4) and simplebus(4) from arm64.
Diffstat (limited to 'sys/arch/arm/include')
| -rw-r--r-- | sys/arch/arm/include/armreg.h | 8 | ||||
| -rw-r--r-- | sys/arch/arm/include/cpu.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/arm/include/armreg.h b/sys/arch/arm/include/armreg.h index 877eaf369c4..7e89418e57e 100644 --- a/sys/arch/arm/include/armreg.h +++ b/sys/arch/arm/include/armreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armreg.h,v 1.40 2017/04/24 18:15:16 kettenis Exp $ */ +/* $OpenBSD: armreg.h,v 1.41 2017/04/27 22:41:46 kettenis Exp $ */ /* $NetBSD: armreg.h,v 1.27 2003/09/06 08:43:02 rearnsha Exp $ */ /* @@ -274,6 +274,12 @@ #define CPU_CT_xSIZE_ASSOC(x) (((x) >> 3) & 0x7) /* associativity */ #define CPU_CT_xSIZE_SIZE(x) (((x) >> 6) & 0x7) /* size */ +/* MPIDR, Multiprocessor Affinity Register */ +#define MPIDR_AFF2 (0xffU << 16) +#define MPIDR_AFF1 (0xffU << 8) +#define MPIDR_AFF0 (0xffU << 0) +#define MPIDR_AFF (MPIDR_AFF2|MPIDR_AFF1|MPIDR_AFF0) + /* Fault status register definitions */ #define FAULT_USER 0x20 diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h index 3219069f050..312c2f6c9c9 100644 --- a/sys/arch/arm/include/cpu.h +++ b/sys/arch/arm/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.45 2017/03/03 14:54:02 tom Exp $ */ +/* $OpenBSD: cpu.h,v 1.46 2017/04/27 22:41:46 kettenis Exp $ */ /* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */ /* @@ -281,8 +281,6 @@ extern int want_resched; /* resched() was called */ * cpu device glue (belongs in cpuvar.h) */ -struct device; -void cpu_attach(struct device *); int cpu_alloc_idle_pcb(struct cpu_info *); /* |