From 0658fe8ce1bed4ab7541cf3a55c496495d2a42a2 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Mon, 9 Sep 2013 12:49:19 +0000 Subject: [PATCH] Add hook called when every new processor is brought online -- including the BSP -- so that platform modules have a chance to add the new CPU to any internal bookkeeping. Approved by: re (kib) --- sys/powerpc/include/platform.h | 1 + sys/powerpc/powerpc/mp_machdep.c | 3 +++ sys/powerpc/powerpc/platform.c | 6 ++++++ sys/powerpc/powerpc/platform_if.m | 12 ++++++++++++ 4 files changed, 22 insertions(+) diff --git a/sys/powerpc/include/platform.h b/sys/powerpc/include/platform.h index 48ea0e60325..d93088c9b82 100644 --- a/sys/powerpc/include/platform.h +++ b/sys/powerpc/include/platform.h @@ -52,6 +52,7 @@ int platform_smp_first_cpu(struct cpuref *); int platform_smp_next_cpu(struct cpuref *); int platform_smp_get_bsp(struct cpuref *); int platform_smp_start_cpu(struct pcpu *); +void platform_smp_ap_init(void); const char *installed_platform(void); void platform_probe_and_attach(void); diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c index b6d977b3098..6835d0c84ad 100644 --- a/sys/powerpc/powerpc/mp_machdep.c +++ b/sys/powerpc/powerpc/mp_machdep.c @@ -91,6 +91,9 @@ machdep_ap_bootstrap(void) #endif decr_ap_init(); + /* Give platform code a chance to do anything necessary */ + platform_smp_ap_init(); + /* Serialize console output and AP count increment */ mtx_lock_spin(&ap_boot_mtx); ap_awake++; diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 169bbc199e1..6f7e7b56115 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -141,6 +141,12 @@ platform_smp_start_cpu(struct pcpu *cpu) return (PLATFORM_SMP_START_CPU(plat_obj, cpu)); } +void +platform_smp_ap_init() +{ + PLATFORM_SMP_AP_INIT(plat_obj); +} + #ifdef SMP struct cpu_group * cpu_topo(void) diff --git a/sys/powerpc/powerpc/platform_if.m b/sys/powerpc/powerpc/platform_if.m index 94383c327d6..cd878e02b6c 100644 --- a/sys/powerpc/powerpc/platform_if.m +++ b/sys/powerpc/powerpc/platform_if.m @@ -80,6 +80,10 @@ CODE { { return (VM_MAX_ADDRESS); } + static void platform_null_smp_ap_init(platform_t plat) + { + return; + } }; /** @@ -184,6 +188,14 @@ METHOD int smp_start_cpu { struct pcpu *_cpu; }; +/** + * @brief Start a CPU + * + */ +METHOD void smp_ap_init { + platform_t _plat; +} DEFAULT platform_null_smp_ap_init; + /** * @brief Return SMP topology */