[PATCH] x86: devicetree: enable multiprocessing and interrupt setting in DT

[Ivan Gorinov]

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.

Signed-off-by: Ivan Gorinov <ivan.gorinov@xxxxxxxxx>
---
Âarch/x86/kernel/devicetree.c | 41 ++++++++++++++++++++++++++++++++++-------
Â1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 25de5f6..f885eab 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -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