From d7c1f9d043d39500ebb39b6566f55da584832480 Mon Sep 17 00:00:00 2001 From: Almudena Garcia Date: Wed, 12 Aug 2020 15:53:56 +0200 Subject: [PATCH 4/5] 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. --- Makefrag.am | 2 ++ i386/Makefrag.am | 2 ++ i386/i386/smp.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ i386/i386/smp.h | 22 ++++++++++++++++++++ kern/smp.c | 41 ++++++++++++++++++++++++++++++++++++ kern/smp.h | 29 ++++++++++++++++++++++++++ 6 files changed, 150 insertions(+) create mode 100644 i386/i386/smp.c create mode 100644 i386/i386/smp.h create mode 100644 kern/smp.c create mode 100644 kern/smp.h diff --git a/Makefrag.am b/Makefrag.am index ea612275..b7a7f2a5 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -199,6 +199,8 @@ libkernel_a_SOURCES += \ kern/sched_prim.c \ kern/sched_prim.h \ kern/shuttle.h \ + kern/smp.h \ + kern/smp.c \ kern/startup.c \ kern/startup.h \ kern/strings.c \ diff --git a/i386/Makefrag.am b/i386/Makefrag.am index ceddaaef..0f3d6e1a 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -130,6 +130,8 @@ libkernel_a_SOURCES += \ i386/i386/seg.c \ i386/i386/seg.h \ i386/i386/setjmp.h \ + i386/i386/smp.h \ + i386/i386/smp.c \ i386/i386/spl.S \ i386/i386/spl.h \ i386/i386/strings.c \ diff --git a/i386/i386/smp.c b/i386/i386/smp.c new file mode 100644 index 00000000..09e4bafa --- /dev/null +++ b/i386/i386/smp.c @@ -0,0 +1,54 @@ +/* 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 + + +/* + * smp_data_init: initialize smp_data structure + * Must be called after smp_init(), once all APIC structures + * has been initialized + */ +static void smp_data_init(void) +{ + smp_info.num_cpus = apic_get_numcpus(); +} + + +/* + * 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; +} + diff --git a/i386/i386/smp.h b/i386/i386/smp.h new file mode 100644 index 00000000..a1ed33c9 --- /dev/null +++ b/i386/i386/smp.h @@ -0,0 +1,22 @@ +/* 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. */ + +int smp_init(void); + diff --git a/kern/smp.c b/kern/smp.c new file mode 100644 index 00000000..cfc1a933 --- /dev/null +++ b/kern/smp.c @@ -0,0 +1,41 @@ +/* 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 +#include + +struct smp_data smp_info; + +/* + * smp_get_numcpus: returns the number of cpus existing in the machine + */ +uint8_t smp_get_numcpus(void) +{ + uint8_t numcpus = smp_info.num_cpus; + + if (numcpus == 0) + return 1; /* Although SMP doesn't find cpus, always there are at least one. */ + else + return numcpus; +} + + + diff --git a/kern/smp.h b/kern/smp.h new file mode 100644 index 00000000..fbaee819 --- /dev/null +++ b/kern/smp.h @@ -0,0 +1,29 @@ +/* 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. */ + +#include + +struct smp_data { + int num_cpus; +}; + +extern struct smp_data smp_info; + +uint8_t smp_get_numcpus(void); -- 2.28.0