Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F105986832
D14026.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D14026.diff
View Options
Index: head/sys/powerpc/powernv/platform_powernv.c
===================================================================
--- head/sys/powerpc/powernv/platform_powernv.c
+++ head/sys/powerpc/powernv/platform_powernv.c
@@ -425,9 +425,21 @@
static void
powernv_smp_ap_init(platform_t platform)
{
+ register_t msr;
+ /* LPID must not be altered when PSL_DR or PSL_IR is set */
+ msr = mfmsr();
+ mtmsr(msr & ~(PSL_DR | PSL_IR));
+
+ isync();
/* Direct interrupts to SRR instead of HSRR and reset LPCR otherwise */
+ mtspr(SPR_LPID, 0);
+ isync();
+
+ mtmsr(msr);
+
mtspr(SPR_LPCR, LPCR_LPES);
+ isync();
}
static void
Index: head/sys/powerpc/powerpc/mp_machdep.c
===================================================================
--- head/sys/powerpc/powerpc/mp_machdep.c
+++ head/sys/powerpc/powerpc/mp_machdep.c
@@ -94,6 +94,9 @@
printf("SMP: AP CPU #%d launched\n", PCPU_GET(cpuid));
mtx_unlock_spin(&ap_boot_mtx);
+ while(smp_started == 0)
+ ;
+
/* Start per-CPU event timers. */
cpu_initclocks_ap();
@@ -197,6 +200,7 @@
{
struct pcpu *pc;
int cpus, timeout;
+ int ret;
if (mp_ncpus <= 1)
return;
@@ -215,12 +219,12 @@
printf("Waking up CPU %d (dev=%x)\n",
pc->pc_cpuid, (int)pc->pc_hwref);
- platform_smp_start_cpu(pc);
-
- timeout = 2000; /* wait 2sec for the AP */
- while (!pc->pc_awake && --timeout > 0)
- DELAY(1000);
-
+ ret = platform_smp_start_cpu(pc);
+ if (ret == 0) {
+ timeout = 2000; /* wait 2sec for the AP */
+ while (!pc->pc_awake && --timeout > 0)
+ DELAY(1000);
+ }
} else {
pc->pc_awake = 1;
}
@@ -253,11 +257,12 @@
mp_ncpus, cpus, smp_cpus);
}
+ if (smp_cpus > 1)
+ atomic_store_rel_int(&smp_started, 1);
+
/* Let the APs get into the scheduler */
DELAY(10000);
- /* XXX Atomic set operation? */
- smp_started = 1;
}
SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Dec 24, 12:26 PM (20 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15588055
Default Alt Text
D14026.diff (1 KB)
Attached To
Mode
D14026: PPC64: cleanup APs startup routines
Attached
Detach File
Event Timeline
Log In to Comment