diff options
| -rw-r--r-- | sys/include/sys/cpu.h | 40 | ||||
| -rw-r--r-- | sys/include/sys/machdep.h | 2 | ||||
| -rw-r--r-- | sys/kern/kern_cpu.c | 70 |
3 files changed, 112 insertions, 0 deletions
diff --git a/sys/include/sys/cpu.h b/sys/include/sys/cpu.h new file mode 100644 index 0000000..6697811 --- /dev/null +++ b/sys/include/sys/cpu.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _SYS_CPU_H_ +#define _SYS_CPU_H_ + +#include <machine/cpu.h> + +#define cpu_index(ci) ci->idx + +void cpu_attach(struct cpu_info *ci); +struct cpu_info *cpu_get(size_t i); + +#endif /* !_SYS_CPU_H_ */ diff --git a/sys/include/sys/machdep.h b/sys/include/sys/machdep.h index 5964369..b97748c 100644 --- a/sys/include/sys/machdep.h +++ b/sys/include/sys/machdep.h @@ -35,6 +35,8 @@ #if defined(_KERNEL) +#define MAXCPUS 32 + __weak void processor_init(void); __weak void pre_init(void); __weak void processor_halt(void); diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c new file mode 100644 index 0000000..97a7aa4 --- /dev/null +++ b/sys/kern/kern_cpu.c @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cpu.h> +#include <sys/types.h> +#include <sys/panic.h> +#include <sys/machdep.h> +#include <vm/dynalloc.h> +#include <assert.h> + +__MODULE_NAME("kern_cpu"); +__KERNEL_META("$Hyra$: kern_cpu.c, Ian Marco Moffett, " + "Machine independent CPU interface"); + +#define CI_LIST_SZ \ + sizeof(struct cpu_info *) * (MAXCPUS + 1) + +static size_t ncpu = 0; +static struct cpu_info **ci_list = NULL; + +void +cpu_attach(struct cpu_info *ci) +{ + if ((ci->idx = ncpu++) >= (MAXCPUS + 1)) { + panic("Machine core count exceeds MAXCPUS!\n"); + } + + if (ci_list == NULL) { + ci_list = dynalloc(CI_LIST_SZ); + __assert(ci_list != NULL); + } + + ci_list[cpu_index(ci)] = ci; +} + +struct cpu_info * +cpu_get(size_t i) +{ + if (i >= ncpu || ci_list == NULL) { + return NULL; + } + + return ci_list[i]; +} |