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

Since r289279 bufinit() uses mp_ncpus, but some architectures set this

Browse Source 
variable during mp_start() which is too late.  Move this to mp_setmaxid()
where other architectures set it and move x86 assertions to MI code.

Reviewed by:	kib (x86 part)
This commit is contained in:
Tijl Coosemans 2015-11-08 14:26:50 +00:00
parent 91e93daf9c
commit 27f38a8d69
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=290547
7 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm/annapurna/alpine/alpine_machdep_mp.c
View File

@ -128,16 +128,14 @@ platform_mp_init_secondary(void)
void
platform_mp_setmaxid(void)
{
int core_cnt;
core_cnt = platform_mp_get_core_cnt();
mp_maxid = core_cnt - 1;
mp_ncpus = platform_mp_get_core_cnt();
mp_maxid = mp_ncpus - 1;
}
int
platform_mp_probe(void)
{
mp_ncpus = platform_mp_get_core_cnt();
return (1);
}

5
sys/arm/mv/armadaxp/armadaxp_mp.c
View File

@ -82,15 +82,14 @@ void
platform_mp_setmaxid(void)
{
mp_maxid = 3;
mp_ncpus = platform_get_ncpus();
mp_maxid = mp_ncpus - 1;
}
int
platform_mp_probe(void)
{
mp_ncpus = platform_get_ncpus();
return (mp_ncpus > 1);
}

16
sys/arm/qemu/virt_mp.c
View File

@ -49,17 +49,8 @@ static int running_cpus;
int
platform_mp_probe(void)
{
int ncpus;
ncpus = ofw_cpu_early_foreach(NULL, true);
if (ncpus <= 1) {
mp_ncpus = 1;
return (0);
}
mp_ncpus = MIN(ncpus, MAXCPU);
return (1);
return (mp_ncpus > 1);
}
static boolean_t
@ -77,7 +68,10 @@ platform_mp_setmaxid(void)
{
mp_maxid = PCPU_GET(cpuid);
ofw_cpu_early_foreach(virt_maxid, true);
mp_ncpus = ofw_cpu_early_foreach(virt_maxid, true);
if (mp_ncpus < 1)
mp_ncpus = 1;
mp_ncpus = MIN(ncpus, MAXCPU);
}
static boolean_t

4
sys/arm/ti/omap4/omap4_mp.c
View File

@ -51,14 +51,14 @@ void
platform_mp_setmaxid(void)
{
mp_maxid = 1;
mp_maxid = 1;
mp_ncpus = 2;
}
int
platform_mp_probe(void)
{
mp_ncpus = 2;
return (1);
}

2
sys/arm/xilinx/zy7_mp.c
View File

@ -57,13 +57,13 @@ platform_mp_setmaxid(void)
{
mp_maxid = 1;
mp_ncpus = 2;
}
int
platform_mp_probe(void)
{
mp_ncpus = 2;
return (1);
}

8
sys/kern/subr_smp.c
View File

@ -125,7 +125,15 @@ struct mtx smp_ipi_mtx;
static void
mp_setmaxid(void *dummy)
{
cpu_mp_setmaxid();
KASSERT(mp_ncpus >= 1, ("%s: CPU count < 1", __func__));
KASSERT(mp_ncpus > 1 || mp_maxid == 0,
("%s: one CPU but mp_maxid is not zero", __func__));
KASSERT(mp_maxid >= mp_ncpus - 1,
("%s: counters out of sync: max %d, count %d", __func__,
mp_maxid, mp_ncpus));
}
SYSINIT(cpu_mp_setmaxid, SI_SUB_TUNABLES, SI_ORDER_FIRST, mp_setmaxid, NULL);

36
sys/x86/x86/mp_x86.c
View File

@ -425,18 +425,11 @@ cpu_mp_setmaxid(void)
{
/*
* mp_maxid should be already set by calls to cpu_add().
* Just sanity check its value here.
* mp_ncpus and mp_maxid should be already set by calls to cpu_add().
* If there were no calls to cpu_add() assume this is a UP system.
*/
if (mp_ncpus == 0)
KASSERT(mp_maxid == 0,
("%s: mp_ncpus is zero, but mp_maxid is not", __func__));
else if (mp_ncpus == 1)
mp_maxid = 0;
else
KASSERT(mp_maxid >= mp_ncpus - 1,
("%s: counters out of sync: max %d, count %d", __func__,
mp_maxid, mp_ncpus));
mp_ncpus = 1;
}
int
@ -448,28 +441,7 @@ cpu_mp_probe(void)
* correctly.
*/
CPU_SETOF(0, &all_cpus);
if (mp_ncpus == 0) {
/*
* No CPUs were found, so this must be a UP system. Setup
* the variables to represent a system with a single CPU
* with an id of 0.
*/
mp_ncpus = 1;
return (0);
}
/* At least one CPU was found. */
if (mp_ncpus == 1) {
/*
* One CPU was found, so this must be a UP system with
* an I/O APIC.
*/
mp_maxid = 0;
return (0);
}
/* At least two CPUs were found. */
return (1);
return (mp_ncpus > 1);
}
/*