Skip to content

Commit

Permalink
powerpc: Fix hard CPU IDs detection
Browse files Browse the repository at this point in the history
commit 9d07bc8
"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>
  • Loading branch information
Benjamin Herrenschmidt committed May 20, 2011
1 parent e83b906 commit 208b3a4
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
int i, nthreads;
unsigned long len;
int found = -1;
int found_thread = 0;

/* We are scanning "cpu" nodes only */
if (type == NULL || strcmp(type, "cpu") != 0)
Expand All @@ -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
* booted proc.
*/
if (initial_boot_params && initial_boot_params->version >= 2) {
if (intserv[i] == initial_boot_params->boot_cpuid_phys)
if (initial_boot_params->version >= 2) {
if (intserv[i] == initial_boot_params->boot_cpuid_phys) {
found = boot_cpu_count;
found_thread = i;
}
} else {
/*
* Check if it's the boot-cpu, set it's hw index now,
Expand All @@ -322,9 +325,9 @@ static int __init early_init_dt_scan_cpus(unsigned long node,

if (found >= 0) {
DBG("boot cpu: logical %d physical %d\n", found,
intserv[i]);
intserv[found_thread]);
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
Expand Down

0 comments on commit 208b3a4

Please sign in to comment.