diff options
| -rw-r--r-- | sys/ia64/ia64/interrupt.c | 9 | ||||
| -rw-r--r-- | sys/ia64/ia64/mp_machdep.c | 15 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c index e401bf9d76b2..de89f7787021 100644 --- a/sys/ia64/ia64/interrupt.c +++ b/sys/ia64/ia64/interrupt.c @@ -55,6 +55,7 @@ #include <machine/frame.h> #include <machine/intr.h> #include <machine/sapicvar.h> +#include <machine/smp.h> #ifdef EVCNT_COUNTERS struct evcnt clock_intr_evcnt; /* event counter for clock intrs. */ @@ -67,6 +68,9 @@ struct evcnt clock_intr_evcnt; /* event counter for clock intrs. */ #include <ddb/ddb.h> #endif +extern int mp_ipi_vector[]; /* XXX */ +extern int mp_ipi_test; + volatile int mc_expected, mc_received; static void @@ -113,9 +117,10 @@ interrupt(u_int64_t vector, struct trapframe *framep) /* divide hz (1024) by 8 to get stathz (128) */ if((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); - } else { + } else if (vector == mp_ipi_vector[IPI_TEST]) { + mp_ipi_test++; + } else ia64_dispatch_intr(framep, vector); - } out: atomic_subtract_int(&td->td_intr_nesting_level, 1); diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index 86898b76e643..4163b6196efa 100644 --- a/sys/ia64/ia64/mp_machdep.c +++ b/sys/ia64/ia64/mp_machdep.c @@ -69,6 +69,7 @@ struct mp_cpu { int mp_hardware = 0; int mp_ipi_vector[IPI_COUNT]; +int mp_ipi_test; TAILQ_HEAD(, mp_cpu) ia64_cpus = TAILQ_HEAD_INITIALIZER(ia64_cpus); @@ -158,6 +159,9 @@ cpu_mp_start() if (bootverbose) printf("SMP: waking up CPU%d\n", cpu->cpu_no); ipi_send(cpu->cpu_lid, IPI_AP_WAKEUP); + } else { + mp_ipi_test = 0; + ipi_self(IPI_TEST); } } } @@ -165,18 +169,12 @@ cpu_mp_start() static void cpu_mp_unleash(void *dummy) { - struct mp_cpu *cpu; - int awake = 0; if (!mp_hardware) return; - TAILQ_FOREACH(cpu, &ia64_cpus, cpu_next) { - if (cpu->cpu_awake) - awake++; - } - - printf("SMP: %d CPUs, %d awake\n", mp_ncpus, awake); + if (mp_ipi_test != 1) + printf("SMP: sending of a test IPI to BSP failed\n"); } /* @@ -246,6 +244,7 @@ ipi_send(u_int64_t lid, int ipi) ((lid >> 12) & 0xFFFF0L)); vector = (u_int64_t)(mp_ipi_vector[ipi] & 0xff); *pipi = vector; + ia64_mf_a(); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); |