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

Technically speaking, using one virtal processor area for all CPUs is a

Browse Source 
violation of the spec. Make duplicate entries for each CPU.
This commit is contained in:
Nathan Whitehorn 2015-02-09 02:13:36 +00:00
parent 0eb1bfa5e7
commit f1e4841797
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/powerpc/pseries/platform_chrp.c
View File

@ -58,7 +58,7 @@ extern void *ap_pcpu;
#endif #endif
#ifdef __powerpc64__ #ifdef __powerpc64__
static uint8_t splpar_vpa[640] __aligned(64); static uint8_t splpar_vpa[MAXCPU][640] __aligned(128); /* XXX: dpcpu */
#endif #endif
static vm_offset_t realmaxaddr = VM_MAX_ADDRESS; static vm_offset_t realmaxaddr = VM_MAX_ADDRESS;
@ -124,6 +124,8 @@ chrp_probe(platform_t plat)
static int static int
chrp_attach(platform_t plat) chrp_attach(platform_t plat)
{ {
int i;
#ifdef __powerpc64__ #ifdef __powerpc64__
/* XXX: check for /rtas/ibm,hypertas-functions? */ /* XXX: check for /rtas/ibm,hypertas-functions? */
if (!(mfmsr() & PSL_HV)) { if (!(mfmsr() & PSL_HV)) {
@ -136,14 +138,19 @@ chrp_attach(platform_t plat)
cpu_idle_hook = phyp_cpu_idle; cpu_idle_hook = phyp_cpu_idle;
/* Set up important VPA fields */ /* Set up important VPA fields */
bzero(splpar_vpa, sizeof(splpar_vpa)); for (i = 0; i < MAXCPU; i++) {
splpar_vpa[4] = (uint8_t)((sizeof(splpar_vpa) >> 8) & 0xff); bzero(splpar_vpa[i], sizeof(splpar_vpa));
splpar_vpa[5] = (uint8_t)(sizeof(splpar_vpa) & 0xff); /* First two: VPA size */
splpar_vpa[0xba] = 1; /* Maintain FPRs */ splpar_vpa[i][4] =
splpar_vpa[0xbb] = 1; /* Maintain PMCs */ (uint8_t)((sizeof(splpar_vpa[i]) >> 8) & 0xff);
splpar_vpa[0xfc] = 0xff; /* Maintain full SLB */ splpar_vpa[i][5] =
splpar_vpa[0xfd] = 0xff; (uint8_t)(sizeof(splpar_vpa[i]) & 0xff);
splpar_vpa[0xff] = 1; /* Maintain Altivec */ splpar_vpa[i][0xba] = 1; /* Maintain FPRs */
splpar_vpa[i][0xbb] = 1; /* Maintain PMCs */
splpar_vpa[i][0xfc] = 0xff; /* Maintain full SLB */
splpar_vpa[i][0xfd] = 0xff;
splpar_vpa[i][0xff] = 1; /* Maintain Altivec */
}
mb(); mb();
/* Set up hypervisor CPU stuff */ /* Set up hypervisor CPU stuff */
@ -492,11 +499,12 @@ static void
chrp_smp_ap_init(platform_t platform) chrp_smp_ap_init(platform_t platform)
{ {
if (!(mfmsr() & PSL_HV)) { if (!(mfmsr() & PSL_HV)) {
/* Register VPA */
phyp_hcall(H_REGISTER_VPA, 1UL, PCPU_GET(cpuid),
splpar_vpa[PCPU_GET(cpuid)]);
/* Set interrupt priority */ /* Set interrupt priority */
phyp_hcall(H_CPPR, 0xff); phyp_hcall(H_CPPR, 0xff);
/* Register VPA */
phyp_hcall(H_REGISTER_VPA, 1UL, PCPU_GET(cpuid), splpar_vpa);
} }
} }
#else #else