lima-textured-cube: Automatically load mali kernel module

Move the kernel module loading code into a separate source file
and use it for both lima-memtester and lima-textured-cube.

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>

Author: ssvb

CMakeLists.txt

@@ -9,7 +9,7 @@ include_directories(limadriver/include limadriver/limare/lib
                     limadriver/limare/tests/common)
 
 add_executable(lima-textured-cube
-               textured_cube_mainloop.c
+               lima-textured-cube.c textured_cube_mainloop.c load_mali_kernel_module.c
                limadriver/limare/lib/gp.c limadriver/limare/lib/limare.c
                limadriver/limare/lib/bmp.c limadriver/limare/lib/program.c
                limadriver/limare/lib/plb.c limadriver/limare/lib/dump.c
@@ -24,7 +24,7 @@ add_executable(lima-textured-cube
 target_link_libraries(lima-textured-cube m rt ${CMAKE_THREAD_LIBS_INIT})
 
 add_executable(lima-memtester
-               main.c textured_cube_mainloop.c
+               lima-memtester.c textured_cube_mainloop.c load_mali_kernel_module.c
                memtester-4.3.0/memtester.c memtester-4.3.0/tests.c
                memtester-4.3.0/arm-asm-helpers.S
                limadriver/limare/lib/gp.c limadriver/limare/lib/limare.c

main.c renamed to lima-memtester.c

@@ -26,30 +26,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "load_mali_kernel_module.h"
 
 int textured_cube_main(void);
 int memtester_main(int argc, char *argv[]);
 
-static void check_kernel_cmdline(void)
-{
-	char buffer[1024];
-	FILE *f = fopen("/proc/cmdline", "r");
-	if (!f) {
-		printf("Warning: can't open /proc/cmdline\n");
-		return;
-	}
-	if (fgets(buffer, sizeof(buffer), f) &&
-	    strstr(buffer, "sunxi_no_mali_mem_reserve"))
-	{
-		fprintf(stderr, "Please remove 'sunxi_no_mali_mem_reserve' option from\n");
-		fprintf(stderr, "your kernel command line. Otherwise the mali kernel\n");
-		fprintf(stderr, "driver may be non-functional and actually knock down\n");
-		fprintf(stderr, "your system with some old linux-sunxi kernels.\n");
-		abort();
-	}
-	fclose(f);
-}
-
 static void *lima_thread(void *threadid)
 {
 	textured_cube_main();
@@ -62,13 +43,7 @@ static void start_lima_thread(void)
 {
 	pthread_t th;
 
-	check_kernel_cmdline();
-
-	if (system("modprobe mali >/dev/null 2>&1")) {
-		fprintf(stderr, "Failed to 'modprobe mali'.\n");
-		abort();
-	}
-
+	load_mali_kernel_module();
 	pthread_create(&th, NULL, lima_thread, NULL);
 
 	/* Wait a bit and let lima stop spamming to the console */

lima-textured-cube.c

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014 Siarhei Siamashka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "load_mali_kernel_module.h"
+
+int textured_cube_main(void);
+
+int main(int argc, char *argv[])
+{
+	load_mali_kernel_module();
+	textured_cube_main();
+	return 0;
+}

load_mali_kernel_module.c

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014 Siarhei Siamashka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+static void check_kernel_cmdline(void)
+{
+	char buffer[1024];
+	FILE *f = fopen("/proc/cmdline", "r");
+	if (!f) {
+		printf("Warning: can't open /proc/cmdline\n");
+		return;
+	}
+	if (fgets(buffer, sizeof(buffer), f) &&
+	    strstr(buffer, "sunxi_no_mali_mem_reserve"))
+	{
+		fprintf(stderr, "Please remove 'sunxi_no_mali_mem_reserve' option from\n");
+		fprintf(stderr, "your kernel command line. Otherwise the mali kernel\n");
+		fprintf(stderr, "driver may be non-functional and actually knock down\n");
+		fprintf(stderr, "your system with some old linux-sunxi kernels.\n");
+		abort();
+	}
+	fclose(f);
+}
+
+void load_mali_kernel_module(void)
+{
+	check_kernel_cmdline();
+
+	if (system("modprobe mali >/dev/null 2>&1")) {
+		fprintf(stderr, "Failed to 'modprobe mali'.\n");
+		abort();
+	}
+}

load_mali_kernel_module.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014 Siarhei Siamashka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef LOAD_MALI_KERNEL_MODULE_H
+#define LOAD_MALI_KERNEL_MODULE_H
+
+void load_mali_kernel_module(void);
+
+#endif

textured_cube_mainloop.c

@@ -29,12 +29,7 @@
 #include "cube_mesh.h"
 #include "companion.h"
 
-#ifdef MEMTESTER_MODE
 int textured_cube_main(void)
-#else
-int
-main(int argc, char *argv[])
-#endif
 {
 	struct limare_state *state;
 	int ret;