Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision bb4c9fcafcb7262c368aaa8fbfc6e3b0fab0871b) +++ kernel/arch/sparc64/Makefile.inc (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) @@ -101,4 +101,5 @@ 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/interrupt.h =================================================================== --- kernel/arch/sparc64/include/interrupt.h (revision bb4c9fcafcb7262c368aaa8fbfc6e3b0fab0871b) +++ kernel/arch/sparc64/include/interrupt.h (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) @@ -47,5 +47,6 @@ enum { - IPI_TLB_SHOOTDOWN = VECTOR_TLB_SHOOTDOWN_IPI + IPI_TLB_SHOOTDOWN = VECTOR_TLB_SHOOTDOWN_IPI, + IPI_SMP_CALL }; Index: kernel/arch/sparc64/include/smp/sun4u/ipi.h =================================================================== --- kernel/arch/sparc64/include/smp/sun4u/ipi.h (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) +++ kernel/arch/sparc64/include/smp/sun4u/ipi.h (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) @@ -0,0 +1,45 @@ +/* + * 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 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/debug/stacktrace.c =================================================================== --- kernel/arch/sparc64/src/debug/stacktrace.c (revision bb4c9fcafcb7262c368aaa8fbfc6e3b0fab0871b) +++ kernel/arch/sparc64/src/debug/stacktrace.c (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) @@ -36,4 +36,5 @@ #include #include +#include #include Index: kernel/arch/sparc64/src/smp/sun4u/ipi.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4u/ipi.c (revision bb4c9fcafcb7262c368aaa8fbfc6e3b0fab0871b) +++ kernel/arch/sparc64/src/smp/sun4u/ipi.c (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) @@ -34,4 +34,5 @@ #include +#include #include #include @@ -40,4 +41,5 @@ #include #include +#include #include #include @@ -171,4 +173,26 @@ } + +/* + * 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 c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) +++ kernel/arch/sparc64/src/smp/sun4u/smp_call.c (revision c0c26ac0de18c254bbce5fef8c6dbbbf0dbca479) @@ -0,0 +1,55 @@ +/* + * 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 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); +} + +/** @} + */