Date: Mon, 31 Jul 2017 20:20:10 +0200
From: Jakub Bogusz <qboosh@pld-linux.org>
To: linux-kernel@vger.kernel.org, mitr@volny.cz
Subject: [PATCH] wistron_btns needs executable BIOS image
Message-ID: <20170731182010.GA933@stranger.qboosh.pl>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk"
Content-Disposition: inline
User-Agent: Mutt/1.6.2 (2016-07-01)


--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello,

This patch (originally agains 3.1x, now I updated include to build
against 4.12.x) fixes winstron_btns module issue with calling BIOS
functions in non-executable memory.

Tested (on Linux 3.10.x and few later versions) on F-S Amilo 8210 laptop.


-- 
Jakub Bogusz    http://qboosh.pl/

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="linux-wistron-nx.patch"

wistron_btns needs executable BIOS image.

Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org>

--- linux-4.12/drivers/input/misc/wistron_btns.c.orig	2013-11-16 09:05:55.612742472 +0100
+++ linux-4.12/drivers/input/misc/wistron_btns.c	2013-11-16 09:24:37.356028732 +0100
@@ -33,6 +33,7 @@
 #include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <asm/set_memory.h>
 
 /* How often we poll keys - msecs */
 #define POLL_INTERVAL_DEFAULT	500 /* when idle */
@@ -124,6 +125,7 @@
 	if (entry_point >= 0xF0000) {
 		bios_code_map_base = base;
 		bios_entry_point = bios_code_map_base + (entry_point & 0xFFFF);
+		set_memory_x((unsigned long)bios_code_map_base, 0x10000 >> PAGE_SHIFT);
 	} else {
 		iounmap(base);
 		bios_code_map_base = ioremap(entry_point & ~0x3FFF, 0x4000);
@@ -134,6 +136,7 @@
 			goto err;
 		}
 		bios_entry_point = bios_code_map_base + (entry_point & 0x3FFF);
+		set_memory_x((unsigned long)bios_code_map_base, 0x4000 >> PAGE_SHIFT);
 	}
 	/* The Windows driver maps 0x10000 bytes, we keep only one page... */
 	bios_data_map_base = ioremap(0x400, 0xc00);

--UugvWAfsgieZRqgk--