* [PATCH v8 0/2] x86/devicetree: Enable multiprocessing @ 2018-03-22 21:35 Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" Ivan Gorinov ` (2 more replies) 0 siblings, 3 replies; 7+ messages in thread From: Ivan Gorinov @ 2018-03-22 21:35 UTC (permalink / raw) To: Thomas Gleixner, Frank Rowand, Andy Shevchenko Cc: Linux Kernel Mailing List, Ingo Molnar, Rob Herring, Mark Rutland Current x86 implementation of Device Tree does not support multiprocessing, and the bindings documentation describes the "reg" property of "cpu" nodes as "CPU number" instead of hardware-assigned local APIC ID. v8: * Fixed build error with CONFIG_X86_LOCAL_APIC=n reported by kbuild. v7: * Change log update. v6: * Calling of_property_read_u32() to get Local APIC ID from "reg". * DT documentation changes: corrected CPU node example and changed the "reg" property description. v5: * Using the "reg" property to specify Local APIC ID. Ivan Gorinov (2): of: Documentation: Specify local APIC ID in "reg" x86/devicetree: Use CPU description from Device Tree Documentation/devicetree/bindings/x86/ce4100.txt | 37 ++++++++++++++----- arch/x86/kernel/devicetree.c | 45 +++++++++++++++++------- 2 files changed, 61 insertions(+), 21 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" 2018-03-22 21:35 [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Ivan Gorinov @ 2018-03-22 21:35 ` Ivan Gorinov 2018-03-25 23:50 ` Rob Herring 2018-03-26 13:19 ` [tip:x86/platform] of/Documentation: " tip-bot for Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 2/2] x86/devicetree: Use CPU description from Device Tree Ivan Gorinov 2018-03-23 16:26 ` [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Andy Shevchenko 2 siblings, 2 replies; 7+ messages in thread From: Ivan Gorinov @ 2018-03-22 21:35 UTC (permalink / raw) To: Thomas Gleixner, Frank Rowand, Andy Shevchenko Cc: Linux Kernel Mailing List, Ingo Molnar, Rob Herring, Mark Rutland Use the "reg" property to specify the processor's local APIC ID instead of setting it to the CPU node index in Device Tree. Local APIC ID is assigned by hardware and visible in the APIC ID register. Some processor models allow APIC ID to be changed by software, but CPUID instruction executed with %eax = 0x0b always returns the initial ID in %edx. Local APIC ID does not match the node index in many systems. Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com> --- Documentation/devicetree/bindings/x86/ce4100.txt | 37 ++++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/x86/ce4100.txt b/Documentation/devicetree/bindings/x86/ce4100.txt index b49ae59..4bbfed1 100644 --- a/Documentation/devicetree/bindings/x86/ce4100.txt +++ b/Documentation/devicetree/bindings/x86/ce4100.txt @@ -7,17 +7,36 @@ Many of the "generic" devices like HPET or IO APIC have the ce4100 name in their compatible property because they first appeared in this SoC. -The CPU node ------------- - cpu@0 { - device_type = "cpu"; - compatible = "intel,ce4100"; - reg = <0>; - lapic = <&lapic0>; +The CPU nodes +------------- + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0x00 { + device_type = "cpu"; + compatible = "intel,ce4100"; + reg = <0x00>; + }; + + cpu@0x02 { + device_type = "cpu"; + compatible = "intel,ce4100"; + reg = <0x02>; + }; }; -The reg property describes the CPU number. The lapic property points to -the local APIC timer. +A "cpu" node describes one logical processor (hardware thread). + +Required properties: + +- device_type + Device type, must be "cpu". + +- reg + Local APIC ID, the unique number assigned to each processor by + system hardware. The SoC node ------------ -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" 2018-03-22 21:35 ` [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" Ivan Gorinov @ 2018-03-25 23:50 ` Rob Herring 2018-03-26 13:19 ` [tip:x86/platform] of/Documentation: " tip-bot for Ivan Gorinov 1 sibling, 0 replies; 7+ messages in thread From: Rob Herring @ 2018-03-25 23:50 UTC (permalink / raw) To: Ivan Gorinov Cc: Thomas Gleixner, Frank Rowand, Andy Shevchenko, Linux Kernel Mailing List, Ingo Molnar, Mark Rutland On Thu, Mar 22, 2018 at 4:35 PM, Ivan Gorinov <ivan.gorinov@intel.com> wrote: > Use the "reg" property to specify the processor's local APIC ID instead of > setting it to the CPU node index in Device Tree. > > Local APIC ID is assigned by hardware and visible in the APIC ID register. > Some processor models allow APIC ID to be changed by software, but CPUID > instruction executed with %eax = 0x0b always returns the initial ID in %edx. > > Local APIC ID does not match the node index in many systems. > > Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com> > --- > Documentation/devicetree/bindings/x86/ce4100.txt | 37 ++++++++++++++++++------ > 1 file changed, 28 insertions(+), 9 deletions(-) > > diff --git a/Documentation/devicetree/bindings/x86/ce4100.txt b/Documentation/devicetree/bindings/x86/ce4100.txt > index b49ae59..4bbfed1 100644 > --- a/Documentation/devicetree/bindings/x86/ce4100.txt > +++ b/Documentation/devicetree/bindings/x86/ce4100.txt > @@ -7,17 +7,36 @@ Many of the "generic" devices like HPET or IO APIC have the ce4100 > name in their compatible property because they first appeared in this > SoC. > > -The CPU node > ------------- > - cpu@0 { > - device_type = "cpu"; > - compatible = "intel,ce4100"; > - reg = <0>; > - lapic = <&lapic0>; > +The CPU nodes > +------------- > + > + cpus { > + #address-cells = <1>; > + #size-cells = <0>; > + > + cpu@0x00 { As I mentioned on prior versions, drop the '0x' and leading zeros. Otherwise, Reviewed-by: Rob Herring <robh@kernel.org> > + device_type = "cpu"; > + compatible = "intel,ce4100"; > + reg = <0x00>; > + }; > + > + cpu@0x02 { > + device_type = "cpu"; > + compatible = "intel,ce4100"; > + reg = <0x02>; > + }; > }; > > -The reg property describes the CPU number. The lapic property points to > -the local APIC timer. > +A "cpu" node describes one logical processor (hardware thread). > + > +Required properties: > + > +- device_type > + Device type, must be "cpu". > + > +- reg > + Local APIC ID, the unique number assigned to each processor by > + system hardware. > > The SoC node > ------------ > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [tip:x86/platform] of/Documentation: Specify local APIC ID in "reg" 2018-03-22 21:35 ` [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" Ivan Gorinov 2018-03-25 23:50 ` Rob Herring @ 2018-03-26 13:19 ` tip-bot for Ivan Gorinov 1 sibling, 0 replies; 7+ messages in thread From: tip-bot for Ivan Gorinov @ 2018-03-26 13:19 UTC (permalink / raw) To: linux-tip-commits Cc: andy.shevchenko, mark.rutland, frowand.list, tglx, mingo, robh+dt, ivan.gorinov, robh, linux-kernel, hpa Commit-ID: 7f2e85840871f199057e65232ebde846192ed989 Gitweb: https://git.kernel.org/tip/7f2e85840871f199057e65232ebde846192ed989 Author: Ivan Gorinov <ivan.gorinov@intel.com> AuthorDate: Thu, 22 Mar 2018 14:35:33 -0700 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Mon, 26 Mar 2018 15:13:32 +0200 of/Documentation: Specify local APIC ID in "reg" Use the "reg" property to specify the processor's local APIC ID instead of setting it to the CPU node index in Device Tree. Local APIC ID is assigned by hardware and visible in the APIC ID register. Some processor models allow APIC ID to be changed by software, but CPUID instruction executed with %eax = 0x0b always returns the initial ID in %edx. Local APIC ID does not match the node index in many systems. Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Rob Herring <robh@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Link: https://lkml.kernel.org/r/4b1a471a56ac0ebd7510f4759afce9104595d6da.1521753738.git.ivan.gorinov@intel.com --- Documentation/devicetree/bindings/x86/ce4100.txt | 37 ++++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/x86/ce4100.txt b/Documentation/devicetree/bindings/x86/ce4100.txt index b49ae593a60b..cd1221bfb539 100644 --- a/Documentation/devicetree/bindings/x86/ce4100.txt +++ b/Documentation/devicetree/bindings/x86/ce4100.txt @@ -7,17 +7,36 @@ Many of the "generic" devices like HPET or IO APIC have the ce4100 name in their compatible property because they first appeared in this SoC. -The CPU node ------------- - cpu@0 { - device_type = "cpu"; - compatible = "intel,ce4100"; - reg = <0>; - lapic = <&lapic0>; +The CPU nodes +------------- + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "intel,ce4100"; + reg = <0x00>; + }; + + cpu@2 { + device_type = "cpu"; + compatible = "intel,ce4100"; + reg = <0x02>; + }; }; -The reg property describes the CPU number. The lapic property points to -the local APIC timer. +A "cpu" node describes one logical processor (hardware thread). + +Required properties: + +- device_type + Device type, must be "cpu". + +- reg + Local APIC ID, the unique number assigned to each processor by + system hardware. The SoC node ------------ ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v8 2/2] x86/devicetree: Use CPU description from Device Tree 2018-03-22 21:35 [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" Ivan Gorinov @ 2018-03-22 21:35 ` Ivan Gorinov 2018-03-26 13:19 ` [tip:x86/platform] " tip-bot for Ivan Gorinov 2018-03-23 16:26 ` [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Andy Shevchenko 2 siblings, 1 reply; 7+ messages in thread From: Ivan Gorinov @ 2018-03-22 21:35 UTC (permalink / raw) To: Thomas Gleixner, Frank Rowand, Andy Shevchenko Cc: Linux Kernel Mailing List, Ingo Molnar, Rob Herring, Mark Rutland Current x86 Device Tree implementation does not support multiprocessing. Use new DT bindings to describe the processors. Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com> --- arch/x86/kernel/devicetree.c | 45 ++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 25de5f6..cca6742 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -130,34 +130,52 @@ static void __init dtb_setup_hpet(void) #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) { -#ifdef CONFIG_X86_LOCAL_APIC struct device_node *dn; struct resource r; + unsigned long lapic_addr = APIC_DEFAULT_PHYS_BASE; int ret; dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-lapic"); - if (!dn) - return; - - ret = of_address_to_resource(dn, 0, &r); - if (WARN_ON(ret)) - return; + if (dn) { + ret = of_address_to_resource(dn, 0, &r); + if (WARN_ON(ret)) + return; + lapic_addr = r.start; + } /* Did the boot loader setup the local APIC ? */ if (!boot_cpu_has(X86_FEATURE_APIC)) { - if (apic_force_enable(r.start)) + if (apic_force_enable(lapic_addr)) return; } 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 + register_lapic_address(lapic_addr); } +#endif /* CONFIG_X86_LOCAL_APIC */ + #ifdef CONFIG_X86_IO_APIC static unsigned int ioapic_id; @@ -255,7 +273,10 @@ static void __init dtb_ioapic_setup(void) {} static void __init dtb_apic_setup(void) { +#ifdef CONFIG_X86_LOCAL_APIC dtb_lapic_setup(); + dtb_cpu_setup(); +#endif dtb_ioapic_setup(); } -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [tip:x86/platform] x86/devicetree: Use CPU description from Device Tree 2018-03-22 21:35 ` [PATCH v8 2/2] x86/devicetree: Use CPU description from Device Tree Ivan Gorinov @ 2018-03-26 13:19 ` tip-bot for Ivan Gorinov 0 siblings, 0 replies; 7+ messages in thread From: tip-bot for Ivan Gorinov @ 2018-03-26 13:19 UTC (permalink / raw) To: linux-tip-commits Cc: andy.shevchenko, ivan.gorinov, tglx, frowand.list, mark.rutland, robh+dt, linux-kernel, hpa, mingo Commit-ID: 4e07db9c8db87e3b71be4c3cd626ddc9bacd5a1e Gitweb: https://git.kernel.org/tip/4e07db9c8db87e3b71be4c3cd626ddc9bacd5a1e Author: Ivan Gorinov <ivan.gorinov@intel.com> AuthorDate: Thu, 22 Mar 2018 14:35:47 -0700 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Mon, 26 Mar 2018 15:13:32 +0200 x86/devicetree: Use CPU description from Device Tree Current x86 Device Tree implementation does not support multiprocessing. Use new DT bindings to describe the processors. Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Link: https://lkml.kernel.org/r/c291fb2cef51b730b59916d7745be0eaa4378c6c.1521753738.git.ivan.gorinov@intel.com --- arch/x86/kernel/devicetree.c | 45 ++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 5cd387fcc777..c9d2b19749b8 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -131,34 +131,52 @@ static void __init dtb_setup_hpet(void) #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) { -#ifdef CONFIG_X86_LOCAL_APIC struct device_node *dn; struct resource r; + unsigned long lapic_addr = APIC_DEFAULT_PHYS_BASE; int ret; dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-lapic"); - if (!dn) - return; - - ret = of_address_to_resource(dn, 0, &r); - if (WARN_ON(ret)) - return; + if (dn) { + ret = of_address_to_resource(dn, 0, &r); + if (WARN_ON(ret)) + return; + lapic_addr = r.start; + } /* Did the boot loader setup the local APIC ? */ if (!boot_cpu_has(X86_FEATURE_APIC)) { - if (apic_force_enable(r.start)) + if (apic_force_enable(lapic_addr)) return; } 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 + register_lapic_address(lapic_addr); } +#endif /* CONFIG_X86_LOCAL_APIC */ + #ifdef CONFIG_X86_IO_APIC static unsigned int ioapic_id; @@ -259,7 +277,10 @@ static void __init dtb_ioapic_setup(void) {} static void __init dtb_apic_setup(void) { +#ifdef CONFIG_X86_LOCAL_APIC dtb_lapic_setup(); + dtb_cpu_setup(); +#endif dtb_ioapic_setup(); } ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v8 0/2] x86/devicetree: Enable multiprocessing 2018-03-22 21:35 [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 2/2] x86/devicetree: Use CPU description from Device Tree Ivan Gorinov @ 2018-03-23 16:26 ` Andy Shevchenko 2 siblings, 0 replies; 7+ messages in thread From: Andy Shevchenko @ 2018-03-23 16:26 UTC (permalink / raw) To: Ivan Gorinov Cc: Thomas Gleixner, Frank Rowand, Linux Kernel Mailing List, Ingo Molnar, Rob Herring, Mark Rutland On Thu, Mar 22, 2018 at 11:35 PM, Ivan Gorinov <ivan.gorinov@intel.com> wrote: > Current x86 implementation of Device Tree does not support multiprocessing, > and the bindings documentation describes the "reg" property of "cpu" nodes > as "CPU number" instead of hardware-assigned local APIC ID. > FWIW, Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > v8: > * Fixed build error with CONFIG_X86_LOCAL_APIC=n reported by kbuild. > > v7: > * Change log update. > > v6: > * Calling of_property_read_u32() to get Local APIC ID from "reg". > > * DT documentation changes: corrected CPU node example and changed > the "reg" property description. > > v5: > * Using the "reg" property to specify Local APIC ID. > > Ivan Gorinov (2): > of: Documentation: Specify local APIC ID in "reg" > x86/devicetree: Use CPU description from Device Tree > > Documentation/devicetree/bindings/x86/ce4100.txt | 37 ++++++++++++++----- > arch/x86/kernel/devicetree.c | 45 +++++++++++++++++------- > 2 files changed, 61 insertions(+), 21 deletions(-) > > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-03-26 13:20 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-03-22 21:35 [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 1/2] of: Documentation: Specify local APIC ID in "reg" Ivan Gorinov 2018-03-25 23:50 ` Rob Herring 2018-03-26 13:19 ` [tip:x86/platform] of/Documentation: " tip-bot for Ivan Gorinov 2018-03-22 21:35 ` [PATCH v8 2/2] x86/devicetree: Use CPU description from Device Tree Ivan Gorinov 2018-03-26 13:19 ` [tip:x86/platform] " tip-bot for Ivan Gorinov 2018-03-23 16:26 ` [PATCH v8 0/2] x86/devicetree: Enable multiprocessing Andy Shevchenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).