summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm
diff options
context:
space:
mode:
authorHeiko Carstens2015-02-02 07:08:44 +0100
committerMartin Schwidefsky2015-12-18 14:59:20 +0100
commitc30f6828fed9d33c2d54dfaf3621717c56f9c779 (patch)
tree70ceed0eaf29d2410f8ac06c999a53d62368a44b /arch/s390/include/asm
parents390/facilities: always use lowcore's stfle field for storing facility bits (diff)
downloadkernel-qcow2-linux-c30f6828fed9d33c2d54dfaf3621717c56f9c779.tar.gz
kernel-qcow2-linux-c30f6828fed9d33c2d54dfaf3621717c56f9c779.tar.xz
kernel-qcow2-linux-c30f6828fed9d33c2d54dfaf3621717c56f9c779.zip
s390/facilities: add helper tool to generate facility lists
Modifying the architecture level set facility lists was always very error prone. Given the numbering of the facility bits within the Principles of Operation, where the most significant bit number is 0, it happened a lot of times that wrong bits were set or cleared. Therefore this patch adds a tool "gen_facilities" which generates include/generated/facilites.h. The definition of the bits to be set is contained within arch/s390/include/asm/facilities_src.h and can be easily extended to e.g. also generate such lists for the KVM module. The generated file looks like this: #define FACILITIES_ALS _AC(0xc1006450f0040000,UL) #define FACILITIES_ALS_DWORDS 1 The facility bits defined in this patch match 1:1 to the current masks that can be found in head.S. That is if the tool gets executed with -march=z990 then the generated masks will equal the masks in head.S for CONFIG_MARCH_Z990. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
-rw-r--r--arch/s390/include/asm/facilities_src.h67
-rw-r--r--arch/s390/include/asm/facility.h5
2 files changed, 72 insertions, 0 deletions
diff --git a/arch/s390/include/asm/facilities_src.h b/arch/s390/include/asm/facilities_src.h
new file mode 100644
index 000000000000..4555fa69a29e
--- /dev/null
+++ b/arch/s390/include/asm/facilities_src.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright IBM Corp. 2015
+ */
+
+#ifndef S390_GEN_FACILITIES_C
+#error "This file can only be included by gen_facilities.c"
+#endif
+
+#include <linux/kconfig.h>
+
+struct facility_def {
+ char *name;
+ int *bits;
+};
+
+static struct facility_def facility_defs[] = {
+ {
+ /*
+ * FACILITIES_ALS contains the list of facilities that are
+ * required to run a kernel that is compiled e.g. with
+ * -march=<machine>.
+ */
+ .name = "FACILITIES_ALS",
+ .bits = (int[]){
+#ifdef CONFIG_HAVE_MARCH_Z900_FEATURES
+ 0, /* N3 instructions */
+ 1, /* z/Arch mode installed */
+#endif
+#ifdef CONFIG_HAVE_MARCH_Z990_FEATURES
+ 18, /* long displacement facility */
+#endif
+#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
+ 7, /* stfle */
+ 16, /* extended translation facility 2 */
+ 17, /* message security assist */
+ 20, /* HFP-multiply-and-add */
+ 21, /* extended-immediate facility */
+ 22, /* extended-translation facility 3 */
+ 23, /* HFP-unnormalized-extension */
+ 24, /* ETF2-enhancement */
+ 25, /* store clock fast */
+ 30, /* ETF3-enhancement */
+#endif
+#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES
+ 26, /* parsing enhancement facility */
+ 27, /* mvcos */
+ 32, /* compare and swap and store */
+ 33, /* compare and swap and store 2 */
+ 34, /* general extension facility */
+ 35, /* execute extensions */
+ 41, /* floating point support enhancement */
+ 42, /* DFP facility */
+ 44, /* PFPO */
+#endif
+#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
+ 37, /* floating point extension */
+ 45, /* fast-BCR, etc. */
+#endif
+#ifdef CONFIG_HAVE_MARCH_ZEC12_FEATURES
+ 48, /* decimal floating point zoned */
+ 49, /* misc-instruction-extensions */
+ 52, /* interlocked facility 2 */
+#endif
+ -1 /* END */
+ }
+ },
+};
diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h
index b4f99d22ba04..007163f91856 100644
--- a/arch/s390/include/asm/facility.h
+++ b/arch/s390/include/asm/facility.h
@@ -7,6 +7,10 @@
#ifndef __ASM_FACILITY_H
#define __ASM_FACILITY_H
+#include <generated/facilities.h>
+
+#ifndef __ASSEMBLY__
+
#include <linux/string.h>
#include <linux/preempt.h>
#include <asm/lowcore.h>
@@ -62,4 +66,5 @@ static inline void stfle(u64 *stfle_fac_list, int size)
preempt_enable();
}
+#endif /* __ASSEMBLY__ */
#endif /* __ASM_FACILITY_H */