x86/devicetree: Use CPU description from Device Tree (4e07db9c) · Commits · 戴 / test

arch/x86/kernel/devicetree.c

+33 −12

Original line number	Original line	Diff line number	Diff line
	@@ -131,34 +131,52 @@ static void __init dtb_setup_hpet(void)
	#endif		#endif
	}		}

			#ifdef CONFIG_X86_LOCAL_APIC

			static void __init dtb_cpu_setup(void)
			{
			struct device_node *dn;
			u32 apic_id, version;
			int ret;

			version = GET_APIC_VERSION(apic_read(APIC_LVR));
			for_each_node_by_type(dn, "cpu") {
			ret = of_property_read_u32(dn, "reg", &apic_id);
			if (ret < 0) {
			pr_warn("%pOF: missing local APIC ID\n", dn);
			continue;
			}
			generic_processor_info(apic_id, version);
			}
			}

	static void __init dtb_lapic_setup(void)		static void __init dtb_lapic_setup(void)
	{		{
	#ifdef CONFIG_X86_LOCAL_APIC
	struct device_node *dn;		struct device_node *dn;
	struct resource r;		struct resource r;
			unsigned long lapic_addr = APIC_DEFAULT_PHYS_BASE;
	int ret;		int ret;

	dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-lapic");		dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-lapic");
	if (!dn)		if (dn) {
	return;

	ret = of_address_to_resource(dn, 0, &r);		ret = of_address_to_resource(dn, 0, &r);
	if (WARN_ON(ret))		if (WARN_ON(ret))
	return;		return;
			lapic_addr = r.start;
			}

	/* Did the boot loader setup the local APIC ? */		/* Did the boot loader setup the local APIC ? */
	if (!boot_cpu_has(X86_FEATURE_APIC)) {		if (!boot_cpu_has(X86_FEATURE_APIC)) {
	if (apic_force_enable(r.start))		if (apic_force_enable(lapic_addr))
	return;		return;
	}		}
	smp_found_config = 1;		smp_found_config = 1;
	pic_mode = 1;		pic_mode = 1;
	register_lapic_address(r.start);		register_lapic_address(lapic_addr);
	generic_processor_info(boot_cpu_physical_apicid,
	GET_APIC_VERSION(apic_read(APIC_LVR)));
	#endif
	}		}

			#endif /* CONFIG_X86_LOCAL_APIC */

	#ifdef CONFIG_X86_IO_APIC		#ifdef CONFIG_X86_IO_APIC
	static unsigned int ioapic_id;		static unsigned int ioapic_id;

	@@ -259,7 +277,10 @@ static void __init dtb_ioapic_setup(void) {}

	static void __init dtb_apic_setup(void)		static void __init dtb_apic_setup(void)
	{		{
			#ifdef CONFIG_X86_LOCAL_APIC
	dtb_lapic_setup();		dtb_lapic_setup();
			dtb_cpu_setup();
			#endif
	dtb_ioapic_setup();		dtb_ioapic_setup();
	}		}

Admin message