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

Make octeon_ap_boot 64 bits to handle MAXCPU up to 64.

Browse Source 
Better construction of CPU mask in platform_cpu_mask().
Release cores still in reset when platform_start_ap() is called.

Reviewed by: imp, marcel
Obtained from: Juniper Networks, Inc
Author: Andrew Duane
Approved by: re (kib)
This commit is contained in:
Marcel Moolenaar 2011-08-05 22:54:42 +00:00
parent b7f2d66a79
commit 841fed3aa3
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/mips/cavium/asm_octeon.S
View File

@ -50,12 +50,12 @@ LEAF(octeon_ap_wait)
jal platform_processor_id
nop
1: ll t0, octeon_ap_boot
1: lld t0, octeon_ap_boot
bne v0, t0, 1b
nop
move t0, zero
sc t0, octeon_ap_boot
scd t0, octeon_ap_boot
beqz t0, 1b
nop

34
sys/mips/cavium/octeon_mp.c
View File

@ -46,7 +46,8 @@ __FBSDID("$FreeBSD$");
/* XXX */
extern cvmx_bootinfo_t *octeon_bootinfo;
unsigned octeon_ap_boot = ~0;
/* NOTE: this 64-bit mask (and many others) limits MAXCPU to 64 */
uint64_t octeon_ap_boot = ~0ULL;
void
platform_ipi_send(int cpuid)
@ -105,15 +106,13 @@ platform_init_ap(int cpuid)
void
platform_cpu_mask(cpuset_t *mask)
{
uint64_t core_mask = octeon_bootinfo->core_mask;
uint64_t i, m;
CPU_ZERO(mask);
/*
* XXX: hack in order to simplify CPU set building, assuming that
* core_mask is 32-bits.
*/
memcpy(mask, &octeon_bootinfo->core_mask,
sizeof(octeon_bootinfo->core_mask));
for (i = 0, m = 1 ; i < MAXCPU; i++, m <<= 1)
if (core_mask & m)
CPU_SET(i, mask);
}
struct cpu_group *
@ -125,11 +124,26 @@ platform_smp_topo(void)
int
platform_start_ap(int cpuid)
{
if (atomic_cmpset_32(&octeon_ap_boot, ~0, cpuid) == 0)
uint64_t cores_in_reset;
/*
* Release the core if it is in reset, and let it rev up a bit.
* The real synchronization happens below via octeon_ap_boot.
*/
cores_in_reset = cvmx_read_csr(CVMX_CIU_PP_RST);
if (cores_in_reset & (1ULL << cpuid)) {
if (bootverbose)
printf ("AP #%d still in reset\n", cpuid);
cores_in_reset &= ~(1ULL << cpuid);
cvmx_write_csr(CVMX_CIU_PP_RST, (uint64_t)(cores_in_reset));
DELAY(2000); /* Give it a moment to start */
}
if (atomic_cmpset_64(&octeon_ap_boot, ~0, cpuid) == 0)
return (-1);
for (;;) {
DELAY(1000);
if (atomic_cmpset_32(&octeon_ap_boot, 0, ~0) != 0)
if (atomic_cmpset_64(&octeon_ap_boot, 0, ~0) != 0)
return (0);
printf("Waiting for cpu%d to start\n", cpuid);
}