x86: devicetree: enable multiprocessing and interrupt setting in DT
PATCH 1/1 x86: devicetree: enable multiprocessing and interrupt setting in DT
The x86-specific Device Tree implementation only supported single CPU, and IRQ allocation from DT parameters was broken in recent versions.
This change enables multiprocessing and fixes broken IRQ allocation.
---
arch/x86/kernel/devicetree.c | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
arch/x86/kernel/devicetree.c +0 -0
@@ -130,6 +130,29 @@ static void __init dtb_setup_hpet(void)
#endif
}
+static void __init dtb_cpu_setup(void)
+{
+ struct device_node *dn;
+ struct resource r;
+ const void *prop;
+ int apic_id, version;
+ int ret;
+
+ version = GET_APIC_VERSION(apic_read(APIC_LVR));
+ for_each_node_by_type(dn, "cpu") {
+ prop = of_get_property(dn, "intel,apic-id", NULL);
+ if (prop) {
+ apic_id = be32_to_cpup(prop);
+ } else {
+ ret = of_address_to_resource(dn, 0, &r);
+ if (WARN_ON(ret))
+ continue;
+ apic_id = r.start;
+ }
+ generic_processor_info(apic_id, version);
+ }
+}
+
static void __init dtb_lapic_setup(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
@@ -153,8 +176,6 @@ static void __init dtb_lapic_setup(void) smp_found_config = 1;
pic_mode = 1;
register_lapic_address(r.start);
- generic_processor_info(boot_cpu_physical_apicid,
- GET_APIC_VERSION(apic_read(APIC_LVR)));
#endif
}
@@ -194,19 +215,22 @@ static struct of_ioapic_type of_ioapic_type[] = static int dt_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs, void *arg)
{
- struct of_phandle_args *irq_data = (void *)arg;
+ struct irq_fwspec *fwspec = (struct irq_fwspec *)arg;
struct of_ioapic_type *it;
struct irq_alloc_info tmp;
+ int type_index;
- if (WARN_ON(irq_data->args_count < 2))
+ if (WARN_ON(fwspec->param_count < 2))
return -EINVAL;
- if (irq_data->args[1] >= ARRAY_SIZE(of_ioapic_type))
+
+ type_index = fwspec->param[1];
+ if (type_index >= ARRAY_SIZE(of_ioapic_type))
return -EINVAL;
- it = &of_ioapic_type[irq_data->args[1]];
+ it = &of_ioapic_type[type_index];
ioapic_set_alloc_attr(&tmp, NUMA_NO_NODE, it->trigger, it->polarity); tmp.ioapic_id = mpc_ioapic_id(mp_irqdomain_ioapic_idx(domain));
- tmp.ioapic_pin = irq_data->args[0];
+ tmp.ioapic_pin = fwspec->param[0];
return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp);
}
@@ -256,6 +280,7 @@ static void __init dtb_ioapic_setup(void) {} static void __init dtb_apic_setup(void)
{
dtb_lapic_setup();
+ dtb_cpu_setup();
dtb_ioapic_setup();
}
@@ -278,6 +303,8 @@ static void __init x86_flattree_get_config(void) map_len = size;
}
+ early_init_dt_verify(dt);
+
unflatten_and_copy_device_tree();
early_memunmap(dt, map_len);
}
--
2.7.4
Quoted 2 lines · Ivan Gorinov
The x86-specific Device Tree implementation only supported single CPU, and IRQ allocation from DT parameters was broken in recent versions.
Was broken is not really informative. Please describe in which way it was broken.
Quoted 2 lines
This change enables multiprocessing and fixes broken IRQ allocation.
Please split this into two parts:
1) Fix the broken IRQ mechanics
2) Enable SMP parsing
arch/x86/kernel/devicetree.c static void __init dtb_setup_hpet(void) · line 130
Quoted 11 lines
Signed-off-by Ivan Gorinov <[email protected]>---
arch/x86/kernel/devicetree.c | 41 ++++++++++++++++++++++++++++++++++-------1 file changed, 34 insertions(+), 7 deletions(-)arch/x86/kernel/devicetree.c +0
-0@@ -130,6 +130,29 @@ static void __init dtb_setup_hpet(void) #endif
patching file arch/x86/kernel/devicetree.c
patch: **** malformed patch at line 25: #endif
Your patch is white space damaged by your mail client.
See Documentation/process/email-clients.rst:Evolution (GUI)
Thanks,
tglx