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

powerpc: 32-bit CHRP SMP fixes

Browse Source 
Untested, but "should" work...  at least this way it compiles.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2005-10-27 22:42:04 +10:00
parent eef69e3cfb
commit 80579e1f4a
4 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1110,22 +1110,22 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
}
#endif
#ifdef CONFIG_PPC64
boot_cpuid = 0;
boot_cpuid_phys = 0;
if (initial_boot_params && initial_boot_params->version >= 2) {
/* version 2 of the kexec param format adds the phys cpuid
* of booted proc.
*/
boot_cpuid_phys = initial_boot_params->boot_cpuid_phys;
boot_cpuid = 0;
} else {
/* Check if it's the boot-cpu, set it's hw index in paca now */
/* Check if it's the boot-cpu, set it's hw index now */
if (get_flat_dt_prop(node, "linux,boot-cpu", NULL) != NULL) {
prop = get_flat_dt_prop(node, "reg", NULL);
set_hard_smp_processor_id(0, prop == NULL ? 0 : *prop);
boot_cpuid_phys = get_hard_smp_processor_id(0);
if (prop != NULL)
boot_cpuid_phys = *prop;
}
}
#endif
set_hard_smp_processor_id(0, boot_cpuid_phys);
#ifdef CONFIG_ALTIVEC
/* Check if we have a VMX and eventually update CPU features */

4
arch/powerpc/kernel/setup_32.c
View File

@@ -59,6 +59,10 @@ struct ide_machdep_calls ppc_ide_md;
int __irq_offset_value;
EXPORT_SYMBOL(__irq_offset_value);
int boot_cpuid;
EXPORT_SYMBOL_GPL(boot_cpuid);
int boot_cpuid_phys;
unsigned long ISA_DMA_THRESHOLD;
unsigned int DMA_MODE_READ;
unsigned int DMA_MODE_WRITE;