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

Backout early start of APs since it caused some machines to hang.

Browse Source
This commit is contained in:
Tor Egge 1999-04-13 03:24:47 +00:00
parent b6adffbf1b
commit 87c737bc83
7 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;

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

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;

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

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;

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

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;

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

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;

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

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;

5
sys/kern/subr_smp.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $ * $Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
*/ */
#include "opt_smp.h" #include "opt_smp.h"
@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
for (i = 0; i < mp_ncpus; i++) { for (i = 0; i < mp_ncpus; i++) {
bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int)); bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
} }
wait_ap(1000000);
if (smp_started == 0)
printf("WARNING: Failed to start all APs\n");
/* number of APs actually started */ /* number of APs actually started */
return mp_ncpus - 1; return mp_ncpus - 1;