Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c30f6828 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 76cdd44c

arch/s390/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ drivers-y += drivers/s390/ 
drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/



boot		:= arch/s390/boot

tools		:= arch/s390/tools



all: image bzImage
@@ -124,6 +125,10 @@ vdso_install: 


archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(tools)



archprepare:

	$(Q)$(MAKE) $(build)=$(tools) include/generated/facilities.h



# Don't use tabs in echo arguments

define archhelp

arch/s390/include/asm/facilities_src.h

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 *    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 */

		}

	},

};

arch/s390/include/asm/facility.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */

arch/s390/tools/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
gen_facilities

arch/s390/tools/Makefile

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#

# Makefile for s390 specific build tools

#



hostprogs-y		    += gen_facilities

HOSTCFLAGS_gen_facilities.o += -Wall $(LINUXINCLUDE)



define filechk_facilities.h

	$(obj)/gen_facilities

endef



$(obj)/gen_facilities.o: $(srctree)/arch/s390/tools/gen_facilities.c



include/generated/facilities.h: $(obj)/gen_facilities FORCE

	$(call filechk,facilities.h)