SMP/x86: convention - put all ipi.* files under smp/ directory

This follows the convention of other higher-level ipi.* smp.* files
put under smp/. Also upcoming ARM files.

include/arch/x86/arch/32/mode/kernel/tlb.h

@@ -13,7 +13,7 @@
 #ifndef __MODE_KERNEL_TLB_H
 #define __MODE_KERNEL_TLB_H
 
-#include <mode/kernel/ipi.h>
+#include <mode/smp/ipi.h>
 #include <arch/kernel/tlb.h>
 
 static inline void invalidateTLBEntry(vptr_t vptr, word_t mask)

include/arch/x86/arch/32/mode/smp/ipi.h

@@ -10,8 +10,8 @@
  * @TAG(DATA61_GPL)
  */
 
-#ifndef __MODE_KERNEL_IPI_H
-#define __MODE_KERNEL_IPI_H
+#ifndef __MODE_SMP_IPI_H
+#define __MODE_SMP_IPI_H
 
 #include <config.h>
 #include <types.h>
@@ -43,6 +43,5 @@ static void inline doRemoteInvalidateTLB(word_t mask)
 }
 
 void Mode_handleRemoteCall(IpiModeRemoteCall_t call, word_t arg0, word_t arg1, word_t arg2);
-
 #endif /* CONFIG_MAX_NUM_NODES */
-#endif /* __ARCH_KERNEL_IPI_H */
+#endif /* __ARCH_SMP_IPI_H */

include/arch/x86/arch/64/mode/kernel/tlb.h

@@ -15,7 +15,7 @@
 
 #include <smp/ipi.h>
 #include <arch/kernel/tlb.h>
-#include <mode/kernel/ipi.h>
+#include <mode/smp/ipi.h>
 #include <arch/kernel/tlb_bitmap.h>
 
 /*

include/arch/x86/arch/64/mode/smp/ipi.h

@@ -10,8 +10,8 @@
  * @TAG(DATA61_GPL)
  */
 
-#ifndef __MODE_KERNEL_IPI_H
-#define __MODE_KERNEL_IPI_H
+#ifndef __MODE_SMP_IPI_H
+#define __MODE_SMP_IPI_H
 
 #include <config.h>
 #include <types.h>
@@ -39,4 +39,4 @@ static inline void doRemoteInvalidateASID(vspace_root_t *vspace, asid_t asid, wo
 }
 
 #endif /* CONFIG_MAX_NUM_NODES */
-#endif /* __ARCH_KERNEL_IPI_H */
+#endif /* __ARCH_SMP_IPI_H */

include/arch/x86/arch/smp/ipi.h

@@ -10,8 +10,8 @@
  * @TAG(DATA61_GPL)
  */
 
-#ifndef __ARCH_KERNEL_IPI_H
-#define __ARCH_KERNEL_IPI_H
+#ifndef __ARCH_SMP_IPI_H
+#define __ARCH_SMP_IPI_H
 
 #include <config.h>
 
@@ -31,4 +31,4 @@ typedef enum {
 } IpiRemoteCall_t;
 
 #endif /* CONFIG_MAX_NUM_NODES > 1 */
-#endif /* __ARCH_KERNEL_IPI_H */
+#endif /* __ARCH_SMP_IPI_H */

src/arch/x86/32/Makefile

@@ -14,6 +14,7 @@ include ${SOURCE_ROOT}/src/arch/$(ARCH)/32/object/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/32/kernel/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/32/model/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/32/machine/Makefile
+include ${SOURCE_ROOT}/src/arch/$(ARCH)/32/smp/Makefile
 
 ARCH_C_SOURCES += 32/c_traps.c
 ARCH_ASM_SOURCES += 32/machine_asm.S \

src/arch/x86/32/kernel/Makefile

@@ -11,5 +11,4 @@
 ARCH_C_SOURCES += 32/kernel/vspace_32paging.c \
                   32/kernel/thread.c \
                   32/kernel/vspace.c \
-                  32/kernel/elf.c \
-                  32/kernel/ipi.c
+                  32/kernel/elf.c

src/arch/x86/32/smp/Makefile

@@ -0,0 +1,13 @@
+#
+# Copyright 2017, Data61
+# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+# ABN 41 687 119 230.
+#
+# This software may be distributed and modified according to the terms of
+# the GNU General Public License version 2. Note that NO WARRANTY is provided.
+# See "LICENSE_GPLv2.txt" for details.
+#
+# @TAG(DATA61_GPL)
+#
+
+ARCH_C_SOURCES += 32/smp/ipi.c

src/arch/x86/32/smp/ipi.c

@@ -11,7 +11,7 @@
  */
 
 #include <config.h>
-#include <mode/kernel/ipi.h>
+#include <mode/smp/ipi.h>
 
 #if CONFIG_MAX_NUM_NODES > 1
 

src/arch/x86/64/Makefile

@@ -16,6 +16,7 @@ include ${SOURCE_ROOT}/src/arch/$(ARCH)/64/object/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/64/kernel/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/64/model/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/64/machine/Makefile
+include ${SOURCE_ROOT}/src/arch/$(ARCH)/64/smp/Makefile
 
 ARCH_C_SOURCES += 64/c_traps.c
 ARCH_ASM_SOURCES += 64/machine_asm.S \

src/arch/x86/64/kernel/Makefile

@@ -12,5 +12,4 @@
 
 ARCH_C_SOURCES += 64/kernel/thread.c \
                   64/kernel/vspace.c \
-                  64/kernel/elf.c \
-                  64/kernel/ipi.c
+                  64/kernel/elf.c

src/arch/x86/64/smp/Makefile

@@ -0,0 +1,13 @@
+#
+# Copyright 2017, Data61
+# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+# ABN 41 687 119 230.
+#
+# This software may be distributed and modified according to the terms of
+# the GNU General Public License version 2. Note that NO WARRANTY is provided.
+# See "LICENSE_GPLv2.txt" for details.
+#
+# @TAG(DATA61_GPL)
+#
+
+ARCH_C_SOURCES += 64/smp/ipi.c

src/arch/x86/64/smp/ipi.c

@@ -11,7 +11,7 @@
  */
 
 #include <config.h>
-#include <mode/kernel/ipi.h>
+#include <mode/smp/ipi.h>
 #include <mode/kernel/tlb.h>
 
 #if CONFIG_MAX_NUM_NODES > 1

src/arch/x86/Makefile

@@ -14,6 +14,7 @@ include ${SOURCE_ROOT}/src/arch/$(ARCH)/kernel/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/model/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/machine/Makefile
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/benchmark/Makefile
+include ${SOURCE_ROOT}/src/arch/$(ARCH)/smp/Makefile
 
 include ${SOURCE_ROOT}/src/arch/$(ARCH)/${TYPE_SUFFIX}/Makefile
 

src/arch/x86/kernel/Makefile

@@ -18,5 +18,4 @@ ARCH_C_SOURCES += kernel/vspace.c \
                   kernel/smp_sys.c \
                   kernel/boot.c \
                   kernel/cmdline.c \
-                  kernel/ipi.c \
                   kernel/ept.c

src/arch/x86/smp/Makefile

@@ -0,0 +1,15 @@
+#
+# Copyright 2017, Data61
+# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+# ABN 41 687 119 230.
+#
+# This software may be distributed and modified according to the terms of
+# the GNU General Public License version 2. Note that NO WARRANTY is provided.
+# See "LICENSE_GPLv2.txt" for details.
+#
+# @TAG(DATA61_GPL)
+#
+
+DIRECTORIES += src/arch/$(ARCH)/smp
+
+ARCH_C_SOURCES += smp/ipi.c

src/arch/x86/smp/ipi.c

@@ -11,7 +11,7 @@
  */
 
 #include <config.h>
-#include <mode/kernel/ipi.h>
+#include <mode/smp/ipi.h>
 #include <smp/ipi.h>
 #include <smp/lock.h>