s390/tools: Rename gen_facilities to gen_bitmaps

Rename gen_facilities.c to gen_bitmaps.c and make it more generic so it
can be used for various bitmaps. Add command line parsing, and use it
to explicitly specify that the facilities header should be generated.

Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

3 files changed, 38 insertions, 20 deletions

diff --git a/arch/s390/tools/.gitignore b/arch/s390/tools/.gitignore
index e6af51d9d183..e07d27143172 100644
--- a/arch/s390/tools/.gitignore
+++ b/arch/s390/tools/.gitignore
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 gen_facilities
+gen_bitmaps
 gen_opcode_table
 relocs
diff --git a/arch/s390/tools/Makefile b/arch/s390/tools/Makefile
index f2862364fb42..ac267bb46550 100644
--- a/arch/s390/tools/Makefile
+++ b/arch/s390/tools/Makefile
@@ -10,17 +10,17 @@ PHONY += kapi
 
 kapi:	$(kapi-hdrs-y)
 
-hostprogs		    += gen_facilities
+hostprogs		    += gen_bitmaps
 hostprogs		    += gen_opcode_table
 
-HOSTCFLAGS_gen_facilities.o += $(LINUXINCLUDE)
+HOSTCFLAGS_gen_bitmaps.o += $(LINUXINCLUDE)
 
-filechk_facility-defs.h = $(obj)/gen_facilities
+filechk_facility-defs.h = $(obj)/gen_bitmaps --facility
 
 filechk_dis-defs.h = \
 	$(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt
 
-$(kapi)/facility-defs.h: $(obj)/gen_facilities FORCE
+$(kapi)/facility-defs.h: $(obj)/gen_bitmaps FORCE
 	$(call filechk,facility-defs.h)
 
 $(kapi)/dis-defs.h: $(obj)/gen_opcode_table FORCE
diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_bitmaps.c
index 32dd5a57240d..4bc5f19dd405 100644
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_bitmaps.c
@@ -1,24 +1,25 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Simple program to generate defines out of facility lists that use the bit
- * numbering scheme from the Princples of Operations: most significant bit
- * has bit number 0.
+ * Simple program to generate bitmaps, for example facility lists.
  *
  *    Copyright IBM Corp. 2015, 2018
  *
  */
 
+#include <getopt.h>
 #include <strings.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-struct facility_def {
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+struct bitmap_def {
 	char *name;
 	int *bits;
 };
 
-static struct facility_def facility_defs[] = {
+static struct bitmap_def facility_defs[] = {
 	{
 		/*
 		 * FACILITIES_ALS contains the list of facilities that are
@@ -124,7 +125,7 @@ static struct facility_def facility_defs[] = {
 	},
 };
 
-static void print_facility_list(struct facility_def *def)
+static void print_bitmap(struct bitmap_def *def)
 {
 	unsigned int high, bit, dword, i;
 	unsigned long long *array;
@@ -151,25 +152,41 @@ static void print_facility_list(struct facility_def *def)
 	free(array);
 }
 
-static void print_facility_lists(void)
+static void print_header(const char *guard, struct bitmap_def *defs, size_t num)
 {
 	unsigned int i;
 
-	for (i = 0; i < sizeof(facility_defs) / sizeof(facility_defs[0]); i++)
-		print_facility_list(&facility_defs[i]);
-}
-
-int main(int argc, char **argv)
-{
-	printf("#ifndef __ASM_S390_FACILITY_DEFS__\n");
-	printf("#define __ASM_S390_FACILITY_DEFS__\n");
+	printf("#ifndef __ASM_S390_%s_DEFS__\n", guard);
+	printf("#define __ASM_S390_%s_DEFS__\n", guard);
 	printf("/*\n");
 	printf(" * DO NOT MODIFY.\n");
 	printf(" *\n");
 	printf(" * This file was generated by %s\n", __FILE__);
 	printf(" */\n\n");
 	printf("#include <linux/const.h>\n\n");
-	print_facility_lists();
+	for (i = 0; i < num; i++)
+		print_bitmap(&defs[i]);
 	printf("\n#endif\n");
+}
+
+static const struct option long_options[] = {
+	{ "facility", no_argument, NULL, 'f' },
+	{ NULL, 0, NULL, 0 }
+};
+
+int main(int argc, char **argv)
+{
+	int opt;
+
+	opt = getopt_long(argc, argv, "", long_options, NULL);
+	if (opt == -1)
+		return 1;
+	switch (opt) {
+	case 'f':
+		print_header("FACILITY", facility_defs, ARRAY_SIZE(facility_defs));
+		break;
+	default:
+		return 1;
+	}
 	return 0;
 }