Index: kernel/arch/abs32le/Makefile.inc =================================================================== --- kernel/arch/abs32le/Makefile.inc (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/abs32le/Makefile.inc (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -51,5 +51,4 @@ arch/$(KARCH)/src/cpu/cpu.c \ arch/$(KARCH)/src/smp/smp.c \ - arch/$(KARCH)/src/smp/smp_call.c \ arch/$(KARCH)/src/smp/ipi.c \ arch/$(KARCH)/src/mm/km.c \ Index: kernel/arch/abs32le/src/smp/smp_call.c =================================================================== --- kernel/arch/abs32le/src/smp/smp_call.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup kernel_abs32le - * @{ - */ -/** @file - */ - -#include -#include - -#ifdef CONFIG_SMP - -void arch_smp_call_ipi(unsigned int cpu_id) -{ - panic("smp_call IPI not implemented."); -} - -#endif /* CONFIG_SMP */ - -/** @} - */ Index: kernel/arch/amd64/Makefile.inc =================================================================== --- kernel/arch/amd64/Makefile.inc (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/amd64/Makefile.inc (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -85,5 +85,4 @@ arch/$(KARCH)/src/smp/ipi.c \ arch/$(KARCH)/src/smp/mps.c \ - arch/$(KARCH)/src/smp/smp_call.c \ arch/$(KARCH)/src/smp/smp.c endif Index: kernel/arch/amd64/include/arch/interrupt.h =================================================================== --- kernel/arch/amd64/include/arch/interrupt.h (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/amd64/include/arch/interrupt.h (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -81,5 +81,4 @@ #define VECTOR_TLB_SHOOTDOWN_IPI (IVT_FREEBASE + 1) #define VECTOR_DEBUG_IPI (IVT_FREEBASE + 2) -#define VECTOR_SMP_CALL_IPI (IVT_FREEBASE + 3) extern void (*disable_irqs_function)(uint16_t); Index: kernel/arch/amd64/src/interrupt.c =================================================================== --- kernel/arch/amd64/src/interrupt.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/amd64/src/interrupt.c (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -53,5 +53,4 @@ #include #include -#include /* @@ -161,10 +160,4 @@ tlb_shootdown_ipi_recv(); } - -static void arch_smp_call_ipi_recv(unsigned int n, istate_t *istate) -{ - trap_virtual_eoi(); - smp_call_ipi_recv(); -} #endif @@ -229,6 +222,4 @@ exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true, (iroutine_t) tlb_shootdown_ipi); - exc_register(VECTOR_SMP_CALL_IPI, "smp_call", true, - (iroutine_t) arch_smp_call_ipi_recv); #endif } Index: kernel/arch/ia32/Makefile.inc =================================================================== --- kernel/arch/ia32/Makefile.inc (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/ia32/Makefile.inc (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -76,5 +76,4 @@ arch/$(KARCH)/src/smp/mps.c \ arch/$(KARCH)/src/smp/smp.c \ - arch/$(KARCH)/src/smp/smp_call.c \ arch/$(KARCH)/src/atomic.S \ arch/$(KARCH)/src/smp/ipi.c \ Index: kernel/arch/ia32/include/arch/interrupt.h =================================================================== --- kernel/arch/ia32/include/arch/interrupt.h (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/ia32/include/arch/interrupt.h (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -85,5 +85,4 @@ #define VECTOR_TLB_SHOOTDOWN_IPI (IVT_FREEBASE + 1) #define VECTOR_DEBUG_IPI (IVT_FREEBASE + 2) -#define VECTOR_SMP_CALL_IPI (IVT_FREEBASE + 3) extern void (*disable_irqs_function)(uint16_t); Index: kernel/arch/ia32/src/interrupt.c =================================================================== --- kernel/arch/ia32/src/interrupt.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/ia32/src/interrupt.c (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -55,5 +55,4 @@ #include #include -#include #include @@ -183,10 +182,4 @@ tlb_shootdown_ipi_recv(); } - -static void arch_smp_call_ipi_recv(unsigned int n, istate_t *istate) -{ - trap_virtual_eoi(); - smp_call_ipi_recv(); -} #endif @@ -250,6 +243,4 @@ exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true, (iroutine_t) tlb_shootdown_ipi); - exc_register(VECTOR_SMP_CALL_IPI, "smp_call", true, - (iroutine_t) arch_smp_call_ipi_recv); #endif } Index: kernel/arch/ia32/src/smp/smp_call.c =================================================================== --- kernel/arch/ia32/src/smp/smp_call.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup kernel_ia32 - * @{ - */ -/** @file - */ - -#include -#include -#include -#include - -#ifdef CONFIG_SMP - -void arch_smp_call_ipi(unsigned int cpu_id) -{ - (void) l_apic_send_custom_ipi(cpus[cpu_id].arch.id, VECTOR_SMP_CALL_IPI); -} - -#endif /* CONFIG_SMP */ - -/** @} - */ Index: kernel/arch/ia64/Makefile.inc =================================================================== --- kernel/arch/ia64/Makefile.inc (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/ia64/Makefile.inc (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -58,5 +58,4 @@ arch/$(KARCH)/src/smc.c \ arch/$(KARCH)/src/smp/smp.c \ - arch/$(KARCH)/src/smp/smp_call.c \ arch/$(KARCH)/src/drivers/it.c Index: kernel/arch/ia64/src/smp/smp_call.c =================================================================== --- kernel/arch/ia64/src/smp/smp_call.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup kernel_ia64 - * @{ - */ -/** @file - */ - -#include -#include - -#ifdef CONFIG_SMP - -void arch_smp_call_ipi(unsigned int cpu_id) -{ - panic("smp_call IPI not implemented."); -} - -#endif /* CONFIG_SMP */ - -/** @} - */ Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/mips32/Makefile.inc (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -68,5 +68,4 @@ arch/$(KARCH)/src/smc.c \ arch/$(KARCH)/src/smp/smp.c \ - arch/$(KARCH)/src/smp/smp_call.c \ arch/$(KARCH)/src/machine_func.c Index: kernel/arch/mips32/src/smp/smp_call.c =================================================================== --- kernel/arch/mips32/src/smp/smp_call.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup kernel_mips32 - * @{ - */ -/** @file - */ - -#include -#include - -#ifdef CONFIG_SMP - -void arch_smp_call_ipi(unsigned int cpu_id) -{ - panic("smp_call IPI not implemented."); -} - -#endif /* CONFIG_SMP */ - -/** @} - */ Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/sparc64/Makefile.inc (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -99,5 +99,4 @@ ARCH_SOURCES += \ arch/$(KARCH)/src/smp/$(USARCH)/smp.c \ - arch/$(KARCH)/src/smp/$(USARCH)/smp_call.c \ arch/$(KARCH)/src/smp/$(USARCH)/ipi.c endif Index: kernel/arch/sparc64/include/arch/interrupt.h =================================================================== --- kernel/arch/sparc64/include/arch/interrupt.h (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/sparc64/include/arch/interrupt.h (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -47,5 +47,4 @@ enum { IPI_TLB_SHOOTDOWN = VECTOR_TLB_SHOOTDOWN_IPI, - IPI_SMP_CALL }; Index: kernel/arch/sparc64/include/arch/smp/sun4u/ipi.h =================================================================== --- kernel/arch/sparc64/include/arch/smp/sun4u/ipi.h (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup kernel_sparc64 - * @{ - */ -/** - * @file - * @brief IPI functions specific to Sun4U. - */ - -#ifndef KERN_sparc64_sun4u_IPI_H_ -#define KERN_sparc64_sun4u_IPI_H_ - -extern void ipi_unicast_arch(unsigned int, int); - -#endif - -/** @} - */ Index: kernel/arch/sparc64/src/smp/sun4u/ipi.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4u/ipi.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ kernel/arch/sparc64/src/smp/sun4u/ipi.c (revision d19b3fcc8f46d58029778b0ba79ad3d796f39697) @@ -35,5 +35,4 @@ #include #include -#include #include #include @@ -43,5 +42,4 @@ #include #include -#include #include #include @@ -175,25 +173,4 @@ } -/* - * Deliver an IPI to the specified processors (except the current one). - * - * Interrupts must be disabled. - * - * @param cpu_id Destination cpu id (index into cpus array). Must not - * be the current cpu. - * @param ipi IPI number. - */ -void ipi_unicast_arch(unsigned int cpu_id, int ipi) -{ - assert(&cpus[cpu_id] != CPU); - - if (ipi == IPI_SMP_CALL) { - cross_call(cpus[cpu_id].arch.mid, smp_call_ipi_recv); - } else { - panic("Unknown IPI (%d).\n", ipi); - return; - } -} - /** @} */ Index: kernel/arch/sparc64/src/smp/sun4u/smp_call.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4u/smp_call.c (revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup kernel_sparc64 - * @{ - */ - -/** - * @file - * @brief Sun4u specific smp call support. - */ - -#include -#include -#include - -void arch_smp_call_ipi(unsigned int cpu_id) -{ - /* - * Required by ipi_unicast_arch(). That functions resolves a potential - * deadlock should both the destination and source cpus be sending - * unicast ipis to each other with interrupts disabled. - */ - ipl_t ipl = interrupts_disable(); - ipi_unicast_arch(cpu_id, IPI_SMP_CALL); - interrupts_restore(ipl); -} - -/** @} - */