From: Almudena Garcia Date: Mon, 10 Aug 2020 19:59:00 +0200 Subject: [PATCH 5/6] smp: Add generic smp pseudoclass This pseudoclass generalize the initialization and access of SMP data, allowing expands it to other architectures. In x86, the functions calls to apic functions. *kern/smp.c: Source file. Implements a interface to load the SMP functions for the current architecture. *kern/smp.h: Header file. Add declaration for smp_data structure. *i386/i386/smp.c: Source file. Implements a set of functions to manage the SMP actions in i386 *i386/i386/smp.h: Header file. Add declarations for SMP functions in i386. --- diff --git a/Makefrag.am b/Makefrag.am index ea612275..03821d03 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -122,6 +122,24 @@ EXTRA_DIST += \ ipc/notify.defs +# +# SMP implementation (APIC, ACPI, etc) +# + +libkernel_a_SOURCES += \ + i386/i386at/acpi_parse_apic.h \ + i386/i386at/acpi_parse_apic.c + +libkernel_a_SOURCES += \ + i386/i386/apic.h \ + i386/i386/apic.c + +libkernel_a_SOURCES += \ + kern/smp.h \ + kern/smp.c \ + i386/i386/smp.h \ + i386/i386/smp.c + # # `kernel' implementation (tasks, threads, trivia, etc.). # diff --git a/i386/i386/smp.c b/i386/i386/smp.c new file mode 100644 index 00000000..9fbc1ca1 --- /dev/null +++ b/i386/i386/smp.c @@ -0,0 +1,70 @@ +/* smp.h - i386 SMP controller for Mach + Copyright (C) 2020 Free Software Foundation, Inc. + Written by Almudena Garcia Jurado-Centurion + + This file is part of GNU Mach. + + GNU Mach is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GNU Mach is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ + +#include +#include +#include + +#include + +struct smp_data smp_info; + +/* + * smp_data_init: initialize smp_data structure + * Must be called after smp_init(), once all APIC structures + * has been initialized + */ +void smp_data_init(void) +{ + smp_info.num_cpus = apic_get_numcpus(); +} + +/* + * smp_get_current_cpu: return the hardware identifier (APIC ID in x86) + * of current CPU + */ +int smp_get_current_cpu(void) +{ + return apic_get_current_cpu(); +} + +/* + * smp_init: initialize the SMP support, starting the cpus searching + * and enumeration. + */ +int smp_init(void) +{ + int apic_success; + + apic_success = acpi_apic_init(); + if (apic_success) { + smp_data_init(); + } + + return apic_success; +} + +/* + * smp_get_numcpus: returns the number of cpus existing in the machine + */ +int smp_get_numcpus(void) +{ + return smp_info.num_cpus; +} diff --git a/i386/i386/smp.h b/i386/i386/smp.h new file mode 100644 index 00000000..97684335 --- /dev/null +++ b/i386/i386/smp.h @@ -0,0 +1,25 @@ +/* smp.h - i386 SMP controller for Mach. Header file + Copyright (C) 2020 Free Software Foundation, Inc. + Written by Almudena Garcia Jurado-Centurion + + This file is part of GNU Mach. + + GNU Mach is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GNU Mach is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ + +void smp_data_init(void); +int smp_get_current_cpu(void); +int smp_init(void); +int smp_get_numcpus(void); + diff --git a/kern/smp.c b/kern/smp.c new file mode 100644 index 00000000..0a684774 --- /dev/null +++ b/kern/smp.c @@ -0,0 +1,26 @@ +/* smp.c - Template for generic SMP controller for Mach. + Copyright (C) 2020 Free Software Foundation, Inc. + Written by Almudena Garcia Jurado-Centurion + + This file is part of GNU Mach. + + GNU Mach is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GNU Mach is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ + +#include +#include + + + + diff --git a/kern/smp.h b/kern/smp.h new file mode 100644 index 00000000..f837dab9 --- /dev/null +++ b/kern/smp.h @@ -0,0 +1,24 @@ +/* smp.h - Template for generic SMP controller for Mach. Header file + Copyright (C) 2020 Free Software Foundation, Inc. + Written by Almudena Garcia Jurado-Centurion + + This file is part of GNU Mach. + + GNU Mach is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GNU Mach is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ + +struct smp_data { + int num_cpus; +}; +