lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Fix hard CPU IDs detection

Browse Source 
commit 9d07bc841c
"powerpc: Properly handshake CPUs going out of boot spin loop"

Would cause a miscalculation of the hard CPU ID. It removes breaking
out of the loop when finding a match with a processor, thus the "i"
used as an index in the intserv array is always incorrect

This broke interrupt on my PowerMac laptop.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2011-05-20 17:50:18 +10:00
parent e83b906c99
commit 208b3a4c19
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/kernel/prom.c
View File

@@ -278,6 +278,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
int i, nthreads; int i, nthreads;
unsigned long len; unsigned long len;
int found = -1; int found = -1;
int found_thread = 0;
/* We are scanning "cpu" nodes only */ /* We are scanning "cpu" nodes only */
if (type == NULL || strcmp(type, "cpu") != 0) if (type == NULL || strcmp(type, "cpu") != 0)
@@ -301,9 +302,11 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
* version 2 of the kexec param format adds the phys cpuid of * version 2 of the kexec param format adds the phys cpuid of
* booted proc. * booted proc.
*/ */
if (initial_boot_params && initial_boot_params->version >= 2) { if (initial_boot_params->version >= 2) {
if (intserv[i] == initial_boot_params->boot_cpuid_phys) if (intserv[i] == initial_boot_params->boot_cpuid_phys) {
found = boot_cpu_count; found = boot_cpu_count;
found_thread = i;
}
} else { } else {
/* /*
* Check if it's the boot-cpu, set it's hw index now, * Check if it's the boot-cpu, set it's hw index now,
@@ -322,9 +325,9 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
if (found >= 0) { if (found >= 0) {
DBG("boot cpu: logical %d physical %d\n", found, DBG("boot cpu: logical %d physical %d\n", found,
intserv[i]); intserv[found_thread]);
boot_cpuid = found; boot_cpuid = found;
set_hard_smp_processor_id(found, intserv[i]); set_hard_smp_processor_id(found, intserv[found_thread]);
/* /*
* PAPR defines "logical" PVR values for cpus that * PAPR defines "logical" PVR values for cpus that