powerpc/64s: ibm,powerpc-cpu-features dt implementation
Subsystems (2)
Nicholas Piggin
reviewerPATCH 1/1 powerpc/64s: ibm,powerpc-cpu-features dt implementation
The ibm,powerpc-cpu-features dt binding describes CPU features with ascii names and extensible compatibility, privilege, and enablement metadata that allows improved flexibility and compatibility with new hardware.
Design overview and specification of features is available in the OPAL source.
Since last post:
- Check the "compatible" property.
- Update documentation, don't specify it has to be a child node of /cpus/
- POWER9 CPU_FTR_ICSWX bit is now clear upstream.
- Fix POWER9 DD1 feature getting applied.
- PPC_FEATURE2_EBB is left to PMU init for the moment (matching existing init).
- Slightly change how LPCR was being set in cpu_restore, to match existing code for idle reinit.
- Add init time TLB flushes to match existing boot init.
Mambo still has a few issues with POWER8:
- HFSCR bit 54 and 57 are now clear (mambo sets at init)
- PMAO_BUG is set. This is due to mambo setting architected POWER8 mode and POWER8E PVR. Current kernels lose PMAO_BUG bit.
- CI_LARGE_PAGE is now set (mambo boot does not set it for some reason, haven't looked at why).
--- .../bindings/powerpc/ibm,powerpc-cpu-features.txt | 246 +++++++ arch/powerpc/Kconfig | 16 + arch/powerpc/include/asm/cpu_has_feature.h | 4 +- arch/powerpc/include/asm/cpufeatures.h | 55 ++ arch/powerpc/include/asm/cputable.h | 2 + arch/powerpc/include/asm/reg.h | 1 + arch/powerpc/include/uapi/asm/cputable.h | 6 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/cpufeatures.c | 724 +++++++++++++++++++++ arch/powerpc/kernel/cputable.c | 37 +- arch/powerpc/kernel/prom.c | 338 +++++++++- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 15 +- 13 files changed, 1430 insertions(+), 17 deletions(-) create mode 100644 Documentation/devicetree/bindings/powerpc/ibm,powerpc-cpu-features.txt create mode 100644 arch/powerpc/include/asm/cpufeatures.h create mode 100644 arch/powerpc/kernel/cpufeatures.c
Documentation/devicetree/bindings/powerpc/ibm,powerpc-cpu-features.txt new file +246 -0
@@ -0,0 +1,246 @@ +*** NOTE *** +This document is copied from OPAL firmware +(skiboot/doc/device-tree/ibm,powerpc-cpu-features/binding.txt) + +There is more complete overview and documentation of features in that +source tree. All patches and modifications should go there. +************ + +ibm,powerpc-cpu-features binding +================================ + +This device tree binding describes CPU features available to software, with +enablement, privilege, and compatibility metadata. + +More general description of design and implementation of this binding is +found in design.txt, which also points to documentation of specific features. + + +/cpus/ibm,powerpc-cpu-features node binding +------------------------------------------- + +Node: ibm,powerpc-cpu-features + +Description: Container of CPU feature nodes. + +The node name must be "ibm,powerpc-cpu-features". + +It is implemented as a child of the node "/cpus", but this must not be +assumed by parsers. + +The node is optional but should be provided by new OPAL firmware. + +Properties: + +- device_type + Usage: required + Value type: string + Definition: "cpu-features" + +- compatible + Usage: required + Value type: string + Definition: "ibm,powerpc-cpu-features" + + This compatibility refers to backwards compatibility of the overall + design with parsers that behave according to these guidelines. This can + be extended in a backward compatible manner which would not warrant a + revision of the compatible property. + +- isa + Usage: required + Value type: <u32> + Definition: + + isa that the CPU is currently running in. This provides instruction set + compatibility, less the individual feature nodes. For example, an ISA v3.0 + implementation that lacks the "transactional-memory" cpufeature node + should not use transactional memory facilities. + + Value corresponds to the "Power ISA Version" multiplied by 1000. + For example, <3000> corresponds to Version 3.0, <2070> to Version 2.07. + The minor digit is available for revisions. + +/cpus/ibm,powerpc-cpu-features/example-feature node bindings +---------------------------------------------------------------- + +Each child node of cpu-features represents a CPU feature / capability. + +Node: A string describing an architected CPU feature, e.g., "floating-point". + +Description: A feature or capability supported by the CPUs. + +The name of the node is a human readable string that forms the interface +used to describe features to software. Features are currently documented +in the code where they are implemented in skiboot/core/cpufeatures.c + +Presence of the node indicates the feature is available. + +Properties: + +- isa + Usage: required + Value type: <u32> + Definition: + + First level of the Power ISA that the feature appears in. + Software should filter out features when constraining the + environment to a particular ISA version. + + Value is defined similarly to /cpus/features/isa + +- usable-privilege + Usage: required + Value type: <u32> bit mask + Definition: + Bit numbers are LSB0 + bit 0 - PR (problem state / user mode) + bit 1 - OS (privileged state) + bit 2 - HV (hypervisor state) + All other bits reserved and should be zero. + + This property describes the privilege levels and/or software components + that can use the feature. + + If bit 0 is set, then the hwcap-bit-nr property will exist. + + +- hv-support + Usage: optional + Value type: <u32> bit mask + Definition: + Bit numbers are LSB0 + bit 0 - HFSCR + All other bits reserved and should be zero. + + This property describes the HV privilege support required to enable the + feature to lesser privilege levels. If the property does not exist then no + support is required. + + If no bits are set, the hypervisor must have explicit/custom support for + this feature. + + If the HFSCR bit is set, then the hfscr-bit-nr property will exist and + the feature may be enabled by setting this bit in the HFSCR register. + + +- os-support + Usage: optional + Value type: <u32> bit mask + Definition: + Bit numbers are LSB0 + bit 0 - FSCR + All other bits reserved and should be zero. + + This property describes the OS privilege support required to enable the + feature to lesser privilege levels. If the property does not exist then no + support is required. + + If no bits are set, the operating system must have explicit/custom support + for this feature. + + If the FSCR bit is set, then the fscr-bit-nr property will exist and + the feature may be enabled by setting this bit in the FSCR register. + + +- hfscr-bit-nr + Usage: optional + Value type: <u32> + Definition: HFSCR bit position (LSB0) + + This property exists when the hv-support property HFSCR bit is set. This + property describes the bit number in the HFSCR register that the + hypervisor must set in order to enable this feature. + + This property also exists if an HFSCR bit corresponds with this feature. + This makes CPU feature parsing slightly simpler. + + +- fscr-bit-nr + Usage: optional + Value type: <u32> + Definition: FSCR bit position (LSB0) + + This property exists when the os-support property FSCR bit is set. This + property describes the bit number in the FSCR register that the + operating system must set in order to enable this feature. + + This property also exists if an FSCR bit corresponds with this feature. + This makes CPU feature parsing slightly simpler. + + +- hwcap-bit-nr + Usage: optional + Value type: <u32> + Definition: Linux ELF AUX vector bit position (LSB0) + + This property may exist when the usable-privilege property value has PR bit set. + This property describes the bit number that should be set in the ELF AUX + hardware capability vectors in order to advertise this feature to userspace. + Bits 0-31 correspond to bits 0-31 in AT_HWCAP vector. Bits 32-63 correspond + to 0-31 in AT_HWCAP2 vector, and so on. Missing AT_HWCAPx vectors implies + that the feature is not enabled or can not be advertised. Operating systems + may provide a number of unassigned hardware capability bits to allow for new + features to be advertised. + + Some properties representing features created before this binding are + advertised to userspace without a one-to-one hwcap bit number may not specify + this bit. Operating system will handle those bits specifically. All new + features usable by userspace will have a hwcap-bit-nr property. + + +- dependencies + Usage: optional + Value type: <prop-encoded-array> + Definition: + + If this property exists then it is a list of phandles to cpu feature + nodes that must be enabled for this feature to be enabled. + + +Example +------- + + /cpus/ibm,powerpc-cpu-features { + device_type = "ibm,powerpc-cpu-features"; + + isa = <3020>; + + darn { + isa = <3000>; + usable-privilege = <1 | 2 | 4>; + hwcap-bit-nr = <xx>; + }; + + scv { + isa = <3000>; + usable-privilege = <1 | 2>; + os-support = <0>; + hwcap-bit-nr = <xx>; + }; + + stop { + isa = <3000>; + usable-privilege = <2 | 4>; + hv-support = <0>; + os-support = <0>; + }; + + vsx2 (hypothetical) { + isa = <3010>; + usable-privilege = <1 | 2 | 4>; + hv-support = <0>; + os-support = <0>; + hwcap-bit-nr = <xx>; + }; + + vsx2-newinsns { + isa = <3020>; + usable-privilege = <1 | 2 | 4>; + os-support = <1>; + fscr-bit-nr = <xx>; + hwcap-bit-nr = <xx>; + dependencies = <&vsx2>; + }; + + };
arch/powerpc/Kconfig +16 -0
@@ -380,6 +380,22 @@ source "arch/powerpc/platforms/Kconfig" menu "Kernel options" +config PPC_CPUFEATURES_DT + bool "cpufeatures cpu setup and device tree support (UNSTABLE)" + depends on PPC_BOOK3S_64 + default n + ---help--- + cpufeatures is a proposed new device tree binding for describing + CPU compatibility and features. Saying y here will attempt to use + cpufeatures binding if the firmware provides it. This binding is + not stable, so a kernel built with this option may not function + properly with future firmware. + +config PPC_CPUFEATURES_ENABLE_UNKNOWN + bool "cpufeatures pass through unknown features to guest/userspace" + depends on PPC_CPUFEATURES_DT + default y + config HIGHMEM bool "High memory support" depends on PPC32
arch/powerpc/include/asm/cpu_has_feature.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef __ASM_POWERPC_CPUFEATURES_H -#define __ASM_POWERPC_CPUFEATURES_H +#ifndef __ASM_POWERPC_CPU_HAS_FEATURE_H +#define __ASM_POWERPC_CPU_HAS_FEATURE_H#ifndef __ASSEMBLY__
arch/powerpc/include/asm/cpufeatures.h new file +55 -0
55 lines not on this page · raw message
arch/powerpc/include/asm/cputable.h +2 -0
@@ -118,7 +118,9 @@ extern struct cpu_spec *cur_cpu_spec;extern unsigned int __start___ftr_fixup, __stop___ftr_fixup; +extern void set_cur_cpu_spec (struct cpu_spec *s);extern struct cpu_spec *identify_cpu (unsigned long offset,unsigned int pvr); +extern void identify_cpu_name (unsigned int pvr);extern void do_feature_fixups (unsigned long value,void *fixup_start,void *fixup_end);
arch/powerpc/include/asm/reg.h +1 -0
@@ -1229,6 +1229,7 @@#define PVR_POWER8E 0x004B#define PVR_POWER8NVL 0x004C#define PVR_POWER8 0x004D +#define PVR_POWER9 0x004E#define PVR_BE 0x0070#define PVR_PA6T 0x0090
arch/powerpc/include/uapi/asm/cputable.h +6 -0
@@ -1,6 +1,12 @@#ifndef _UAPI__ASM_POWERPC_CPUTABLE_H#define _UAPI__ASM_POWERPC_CPUTABLE_H +/* +* IMPORTANT! +* All future PPC_FEATURE_* definitions must be allocated by OPAL / skiboot +* firmware, in accordance with the ibm,powerpc-cpu-features specification. +*/ +/* in AT_HWCAP */ #define PPC_FEATURE_32 0x80000000#define PPC_FEATURE_64 0x40000000
arch/powerpc/kernel/Makefile +1 -0
@@ -56,6 +56,7 @@ obj-$(CONFIG_PPC_RTAS) += rtas.o rtas-rtc.o $(rtaspci-y-y) obj-$(CONFIG_PPC_RTAS_DAEMON) += rtasd.o obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o obj-$(CONFIG_RTAS_PROC) += rtas-proc.o +obj-$(CONFIG_PPC_CPUFEATURES_DT) += cpufeatures.o obj-$(CONFIG_EEH) += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \ eeh_driver.o eeh_event.o eeh_sysfs.o obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o
arch/powerpc/kernel/cpufeatures.c new file +724 -0
724 lines not on this page · raw message
arch/powerpc/kernel/cputable.c +35 -2
@@ -23,7 +23,9 @@#include <asm/mmu.h> #include <asm/setup.h> -struct cpu_spec * cur_cpu_spec =NULL ; +static struct cpu_spec the_cpu_spec__read_mostly ; + +struct cpu_spec * cur_cpu_spec__read_mostly =NULL ;EXPORT_SYMBOL (cur_cpu_spec);/* The platform string corresponding to the real PVR */
@@ -2179,7 +2181,15 @@ static struct cpu_spec __initdata cpu_specs[] = {#endif /* CONFIG_E500 */ }; -static struct cpu_spec the_cpu_spec; +void __init set_cur_cpu_spec (struct cpu_spec *s) +{ +struct cpu_spec *t = &the_cpu_spec; + + t =PTRRELOC (t); + *t = *s; + + *PTRRELOC (&cur_cpu_spec) = &the_cpu_spec; +}static struct cpu_spec *__init setup_cpu_spec (unsigned long offset,struct cpu_spec *s)
@@ -2266,6 +2276,29 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)return NULL ; } +/* +* Used by cpufeatures to get the name for CPUs with a PVR table. +* If they don't hae a PVR table, cpufeatures gets the name from +* cpu device-tree node. +*/ +void __init identify_cpu_name (unsigned int pvr) +{ +struct cpu_spec *s = cpu_specs; +struct cpu_spec *t = &the_cpu_spec; +int i; + + s =PTRRELOC (s); + t =PTRRELOC (t); + +for (i =0 ; i <ARRAY_SIZE (cpu_specs); i++,s++) { +if ((pvr & s->pvr_mask) == s->pvr_value) { + t->cpu_name = s->cpu_name; +return ; + } + } +} + +#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECKS struct static_key_true cpu_feature_keys[NUM_CPU_FTR_KEYS ] = { [0 ... NUM_CPU_FTR_KEYS - 1] = STATIC_KEY_TRUE_INIT
arch/powerpc/kernel/prom.c +327 -11
374 lines not on this page · raw message
arch/powerpc/kernel/setup-common.c +1 -1
@@ -256,7 +256,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)seq_printf (m,"processor\t: %lu\n" , cpu_id);seq_printf (m,"cpu\t\t: " ); -if (cur_cpu_spec->pvr_mask) +if (cur_cpu_spec->pvr_mask && cur_cpu_spec->cpu_name)seq_printf (m,"%s" , cur_cpu_spec->cpu_name);else seq_printf (m,"unknown (%08x)" , pvr);
arch/powerpc/kernel/setup_64.c +14 -1
@@ -49,6 +49,7 @@#include <asm/paca.h> #include <asm/time.h> #include <asm/cputable.h> +#include <asm/cpufeatures.h> #include <asm/sections.h> #include <asm/btext.h> #include <asm/nvram.h>
@@ -274,8 +275,17 @@ void __init early_setup(unsigned long dt_ptr)/* -------- printk is _NOT_ safe to use here ! ------- */ -/* Identify CPU type */ +#ifdef CONFIG_PPC_CPUFEATURES_DT +/* Setup flat device-tree pointer */ + initial_boot_params =__va (dt_ptr); +if (early_init_devtree_check_cpu_features_exists ()) +cpufeatures_setup_cpu (); +else +/* Legacy table-based approach when /cpus/features is missing */ +identify_cpu (0 ,mfspr (SPRN_PVR )); +#else identify_cpu (0 ,mfspr (SPRN_PVR )); +#endif /* Assume we're on cpu 0 for now. Don't write to the paca yet! */ initialise_paca (&boot_paca,0 );
@@ -541,6 +551,9 @@ void __init initialize_cache_info(void) dcache_bsize = ppc64_caches.l1d.block_size; icache_bsize = ppc64_caches.l1i.block_size; + cur_cpu_spec->dcache_bsize = dcache_bsize; + cur_cpu_spec->icache_bsize = icache_bsize; +DBG (" <- initialize_cache_info()\n" ); }
Signature · 1 line
2.11.0
kbuild test robot
build botreproduce: wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross…
Hi Nicholas,
[auto build test ERROR on powerpc/next]
[also build test ERROR on v4.11 next-20170505]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Nicholas-Piggin/powerpc-64s-ibm-powerpc-cpu-features-dt-implementation/20170505-111808 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc-allmodconfig (attached as .config) compiler: powerpc64-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=powerpc
All errors (new ones prefixed by >>):
arch/powerpc/kernel/prom.c: In function 'cpufeatures_deps_enable':
>> arch/powerpc/kernel/prom.c:457:8: error: implicit declaration of function 'of_get_flat_dt_phandle' [-Werror=implicit-function-declaration]
if (of_get_flat_dt_phandle(d->node) == phandle) {
^~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/kernel/prom.c: In function 'early_init_dt_scan_cpufeatures':
>> arch/powerpc/kernel/prom.c:521:2: error: implicit declaration of function 'of_scan_flat_dt_subnodes' [-Werror=implicit-function-declaration]
of_scan_flat_dt_subnodes(node, count_cpufeatures_subnodes,
^~~~~~~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
vim +/of_get_flat_dt_phandle +457 arch/powerpc/kernel/prom.c
451 unsigned long phandle = be32_to_cpu(prop[i]);
452 int j;
453
454 for (j = 0; j < nr_dt_cpu_features; j++) {
455 struct dt_cpu_feature *d = &dt_cpu_features[j];
456
> 457 if (of_get_flat_dt_phandle(d->node) == phandle) {
458 cpufeatures_deps_enable(d);
459 if (d->disabled) {
460 f->disabled = 1;
461 return;
462 }
463 }
464 }
465 }
466
467 if (cpufeatures_process_feature(f))
468 f->enabled = 1;
469 else
470 f->disabled = 1;
471 }
472
473 static int __init scan_cpufeatures_subnodes(unsigned long node,
474 const char *uname,
475 void *data)
476 {
477 int *count = data;
478
479 process_cpufeatures_node(node, uname, *count);
480
481 (*count)++;
482
483 return 0;
484 }
485
486 static int __init count_cpufeatures_subnodes(unsigned long node,
487 const char *uname,
488 void *data)
489 {
490 int *count = data;
491
492 (*count)++;
493
494 return 0;
495 }
496
497 static int __init early_init_dt_scan_cpufeatures(unsigned long node,
498 const char *uname, int depth,
499 void *data)
500 {
501 const char *compat = of_get_flat_dt_prop(node, "compatible", NULL);
502 const __be32 *prop;
503 int count, i;
504 u32 isa;
505
506 /* We are scanning "ibm,powerpc-cpu-features" nodes only */
507 if (compat == NULL || strcmp(compat, "ibm,powerpc-cpu-features") != 0)
508 return 0;
509
510 prop = of_get_flat_dt_prop(node, "isa", NULL);
511 if (!prop) {
512 printk("ibm,powerpc-cpu-features node has missing property \"isa\"\n");
513 return 0;
514 }
515
516 isa = be32_to_cpup(prop);
517
518 has_cpufeatures_node = 1;
519
520 /* Count and allocate space for cpu features */
> 521 of_scan_flat_dt_subnodes(node, count_cpufeatures_subnodes, 522 &nr_dt_cpu_features);
523 dt_cpu_features = __va(
524 memblock_alloc(sizeof(struct dt_cpu_feature)*
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation