d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OK, I have had it with losing my console because the AP's print their "I am

Browse Source 
alive!" message right as the scsi probe messages happen.  This is a bit
nasty, but it seems to work.  At the point that we unlock the AP's, briefly
wait till they are all done while we hold the console on their behalf.
This commit is contained in:
Peter Wemm 2002-08-28 23:24:05 +00:00
parent de7ac779e9
commit 97e2d5fc53
6 changed files with 72 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/amd64/amd64/mp_machdep.c
View File

@ -2452,7 +2452,7 @@ ap_init(void)
/* spin until all the AP's are ready */
while (!aps_ready)
/* spin */ ;
ia32_pause();
/* BSP may have changed PTD while we were waiting */
invltlb();
@ -2500,7 +2500,8 @@ ap_init(void)
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
if (smp_cpus == mp_ncpus) {
smp_started = 1; /* enable IPI's, tlb shootdown, freezes etc */
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
smp_active = 1; /* historic */
}
@ -2508,13 +2509,14 @@ ap_init(void)
/* wait until all the AP's are up */
while (smp_started == 0)
; /* nothing */
ia32_pause();
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
binuptime(PCPU_PTR(switchtime));
PCPU_SET(switchticks, ticks);
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
cpu_throw(); /* doesn't return */
panic("scheduler returned us to %s", __func__);
@ -2649,7 +2651,12 @@ ipi_self(u_int ipi)
void
release_aps(void *dummy __unused)
{
mtx_lock_spin(&sched_lock);
atomic_store_rel_int(&aps_ready, 1);
while (smp_started == 0)
ia32_pause();
mtx_unlock_spin(&sched_lock);
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);

17
sys/amd64/amd64/mptable.c
View File

@ -2452,7 +2452,7 @@ ap_init(void)
/* spin until all the AP's are ready */
while (!aps_ready)
/* spin */ ;
ia32_pause();
/* BSP may have changed PTD while we were waiting */
invltlb();
@ -2500,7 +2500,8 @@ ap_init(void)
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
if (smp_cpus == mp_ncpus) {
smp_started = 1; /* enable IPI's, tlb shootdown, freezes etc */
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
smp_active = 1; /* historic */
}
@ -2508,13 +2509,14 @@ ap_init(void)
/* wait until all the AP's are up */
while (smp_started == 0)
; /* nothing */
ia32_pause();
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
binuptime(PCPU_PTR(switchtime));
PCPU_SET(switchticks, ticks);
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
cpu_throw(); /* doesn't return */
panic("scheduler returned us to %s", __func__);
@ -2649,7 +2651,12 @@ ipi_self(u_int ipi)
void
release_aps(void *dummy __unused)
{
mtx_lock_spin(&sched_lock);
atomic_store_rel_int(&aps_ready, 1);
while (smp_started == 0)
ia32_pause();
mtx_unlock_spin(&sched_lock);
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);

17
sys/amd64/include/mptable.h
View File

@ -2452,7 +2452,7 @@ ap_init(void)
/* spin until all the AP's are ready */
while (!aps_ready)
/* spin */ ;
ia32_pause();
/* BSP may have changed PTD while we were waiting */
invltlb();
@ -2500,7 +2500,8 @@ ap_init(void)
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
if (smp_cpus == mp_ncpus) {
smp_started = 1; /* enable IPI's, tlb shootdown, freezes etc */
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
smp_active = 1; /* historic */
}
@ -2508,13 +2509,14 @@ ap_init(void)
/* wait until all the AP's are up */
while (smp_started == 0)
; /* nothing */
ia32_pause();
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
binuptime(PCPU_PTR(switchtime));
PCPU_SET(switchticks, ticks);
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
cpu_throw(); /* doesn't return */
panic("scheduler returned us to %s", __func__);
@ -2649,7 +2651,12 @@ ipi_self(u_int ipi)
void
release_aps(void *dummy __unused)
{
mtx_lock_spin(&sched_lock);
atomic_store_rel_int(&aps_ready, 1);
while (smp_started == 0)
ia32_pause();
mtx_unlock_spin(&sched_lock);
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);

17
sys/i386/i386/mp_machdep.c
View File

@ -2452,7 +2452,7 @@ ap_init(void)
/* spin until all the AP's are ready */
while (!aps_ready)
/* spin */ ;
ia32_pause();
/* BSP may have changed PTD while we were waiting */
invltlb();
@ -2500,7 +2500,8 @@ ap_init(void)
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
if (smp_cpus == mp_ncpus) {
smp_started = 1; /* enable IPI's, tlb shootdown, freezes etc */
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
smp_active = 1; /* historic */
}
@ -2508,13 +2509,14 @@ ap_init(void)
/* wait until all the AP's are up */
while (smp_started == 0)
; /* nothing */
ia32_pause();
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
binuptime(PCPU_PTR(switchtime));
PCPU_SET(switchticks, ticks);
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
cpu_throw(); /* doesn't return */
panic("scheduler returned us to %s", __func__);
@ -2649,7 +2651,12 @@ ipi_self(u_int ipi)
void
release_aps(void *dummy __unused)
{
mtx_lock_spin(&sched_lock);
atomic_store_rel_int(&aps_ready, 1);
while (smp_started == 0)
ia32_pause();
mtx_unlock_spin(&sched_lock);
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);

17
sys/i386/i386/mptable.c
View File

@ -2452,7 +2452,7 @@ ap_init(void)
/* spin until all the AP's are ready */
while (!aps_ready)
/* spin */ ;
ia32_pause();
/* BSP may have changed PTD while we were waiting */
invltlb();
@ -2500,7 +2500,8 @@ ap_init(void)
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
if (smp_cpus == mp_ncpus) {
smp_started = 1; /* enable IPI's, tlb shootdown, freezes etc */
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
smp_active = 1; /* historic */
}
@ -2508,13 +2509,14 @@ ap_init(void)
/* wait until all the AP's are up */
while (smp_started == 0)
; /* nothing */
ia32_pause();
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
binuptime(PCPU_PTR(switchtime));
PCPU_SET(switchticks, ticks);
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
cpu_throw(); /* doesn't return */
panic("scheduler returned us to %s", __func__);
@ -2649,7 +2651,12 @@ ipi_self(u_int ipi)
void
release_aps(void *dummy __unused)
{
mtx_lock_spin(&sched_lock);
atomic_store_rel_int(&aps_ready, 1);
while (smp_started == 0)
ia32_pause();
mtx_unlock_spin(&sched_lock);
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);

17
sys/i386/include/mptable.h
View File

@ -2452,7 +2452,7 @@ ap_init(void)
/* spin until all the AP's are ready */
while (!aps_ready)
/* spin */ ;
ia32_pause();
/* BSP may have changed PTD while we were waiting */
invltlb();
@ -2500,7 +2500,8 @@ ap_init(void)
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
if (smp_cpus == mp_ncpus) {
smp_started = 1; /* enable IPI's, tlb shootdown, freezes etc */
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
smp_active = 1; /* historic */
}
@ -2508,13 +2509,14 @@ ap_init(void)
/* wait until all the AP's are up */
while (smp_started == 0)
; /* nothing */
ia32_pause();
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
binuptime(PCPU_PTR(switchtime));
PCPU_SET(switchticks, ticks);
/* ok, now grab sched_lock and enter the scheduler */
mtx_lock_spin(&sched_lock);
cpu_throw(); /* doesn't return */
panic("scheduler returned us to %s", __func__);
@ -2649,7 +2651,12 @@ ipi_self(u_int ipi)
void
release_aps(void *dummy __unused)
{
mtx_lock_spin(&sched_lock);
atomic_store_rel_int(&aps_ready, 1);
while (smp_started == 0)
ia32_pause();
mtx_unlock_spin(&sched_lock);
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);