diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-05-09 23:42:27 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-05-11 23:29:04 +1000 |
| commit | 89c190627257a38d5e4d7cb3e5382f0e6e089f7c (patch) | |
| tree | 797a5fc7b409f7883520f6e12547b1e094587afc | |
| parent | 6158faed7c80256fb6b370781cb3cd6815f4ba69 (diff) | |
| download | linux-stable-89c190627257a38d5e4d7cb3e5382f0e6e089f7c.tar.gz linux-stable-89c190627257a38d5e4d7cb3e5382f0e6e089f7c.tar.bz2 linux-stable-89c190627257a38d5e4d7cb3e5382f0e6e089f7c.zip | |
powerpc/prom: Drop support for old FDT versions
In commit e6a6928c3ea1 ("of/fdt: Convert FDT functions to use
libfdt") (Apr 2014), the generic flat device tree code dropped support
for flat device tree's older than version 0x10 (16).
We still have code in our CPU scanning to cope with flat device tree
versions earlier than 2, which can now never trigger, so drop it.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 9dbed488aba1..05e7fb47a7a4 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -332,25 +332,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node, * NOTE: This must match the parsing done in smp_setup_cpu_maps. */ for (i = 0; i < nthreads; i++) { - /* - * version 2 of the kexec param format adds the phys cpuid of - * booted proc. - */ - if (fdt_version(initial_boot_params) >= 2) { - if (be32_to_cpu(intserv[i]) == - fdt_boot_cpuid_phys(initial_boot_params)) { - found = boot_cpu_count; - found_thread = i; - } - } else { - /* - * Check if it's the boot-cpu, set it's hw index now, - * unfortunately this format did not support booting - * off secondary threads. - */ - if (of_get_flat_dt_prop(node, - "linux,boot-cpu", NULL) != NULL) - found = boot_cpu_count; + if (be32_to_cpu(intserv[i]) == + fdt_boot_cpuid_phys(initial_boot_params)) { + found = boot_cpu_count; + found_thread = i; } #ifdef CONFIG_SMP /* logical cpu id is always 0 on UP kernels */ |