import of tp-smapi version 0.40

Author: Shem Multinymous

CHANGES

@@ -1,4 +1,14 @@
-Change history for tp_smapi:
+Change history for the tp_smapi package:
+
+0.40 2008-12-16
+---------------------
+- thinkpad_ec: Added a "force_io=1" module parameter, to let it load on
+  recent ThinkPad models (e.g., T400 and T500). This is a kludge to work
+  around an ACPI DSDT which claims the ports we need.
+- tp_smapi: Don't restore battery charging thresholds when resuming from
+  suspend-to-RAM.
+- When building, use /lib/modules/*/build instead of /lib/modules/*/src
+  and give a clearer error message if that's missing.
 
 0.39 2008-09-27
 ---------------------

Makefile

@@ -19,10 +19,23 @@ else
 LOAD_HDAPS  := :
 endif
 
+ifeq ($(FORCE_IO),1)
+THINKPAD_EC_PARAM := force_io=1
+else
+THINKPAD_EC_PARAM := 
+endif
+
 DEBUG := 0
 
-ifneq ($(shell [ -f $(KSRC)/include/linux/aio_abi.h ] && echo 1),1)
-$(error This driver requires kernel 2.6.19 or newer, and matching kernel sources. You may need to override KVER=$(KVER) or KSRC=$(KSRC) or KBUILD=$(KBUILD) or MOD_DIR=$(MOD_DIR))
+ifneq ($(shell [ -f $(KBUILD)/include/linux/aio_abi.h ] && echo 1),1)
+$(warning Building tp_smapi requires Linux kernel 2.6.19 or newer, and matching kernel headers.)
+$(warning You may need to override the following Make variables:)
+$(warning .   KVER=$(KVER))
+$(warning .   KBUILD=$(KBUILD))
+$(warning .   MOD_DIR=$(MOD_DIR))
+$(warning For "make patch", you may also need the full kernel sources, and may need to override:)
+$(warning .   KSRC=$(KSRC))
+$(error Missing kernel headers)
 endif
 
 .PHONY: default clean modules load unload install patch check_hdaps mk-hdaps.diff
@@ -34,8 +47,8 @@ export TP_MODULES
 default: modules
 
 # Build the modules thinkpad_ec.ko, tp_smapi.ko and (if HDAPS=1) hdaps.ko
-modules: $(KSRC) $(patsubst %.o,%.c,$(TP_MODULES))
-	$(MAKE) -C $(KSRC) M=$(PWD) O=$(KBUILD) modules
+modules: $(KBUILD) $(patsubst %.o,%.c,$(TP_MODULES))
+	$(MAKE) -C $(KBUILD) M=$(PWD) O=$(KBUILD) modules
 
 clean:
 	rm -f tp_smapi.mod.* tp_smapi.o tp_smapi.ko .tp_smapi.*.cmd
@@ -47,9 +60,7 @@ clean:
 
 load: check_hdaps unload modules
 	@( [ `id -u` == 0 ] || { echo "Must be root to load modules"; exit 1; } )
-	{ insmod ./thinkpad_ec.ko &&\
-	  insmod ./tp_smapi.ko debug=$(DEBUG) &&\
-	  $(LOAD_HDAPS); }; :
+	{ insmod ./thinkpad_ec.ko $(THINKPAD_EC_PARAM) && insmod ./tp_smapi.ko debug=$(DEBUG) && $(LOAD_HDAPS); }; :
 	@echo -e '\nRecent dmesg output:' ; dmesg | tail -10
 
 unload:
@@ -76,7 +87,7 @@ ifeq ($(HDAPS),1)
 	rm -f $(MOD_DIR)/drivers/hwmon/hdaps.ko
 	rm -f $(MOD_DIR)/extra/hdaps.ko
 endif
-	$(MAKE) -C $(KSRC) M=$(PWD) O=$(KBUILD) modules_install
+	$(MAKE) -C $(KBUILD) M=$(PWD) O=$(KBUILD) modules_install
 	depmod -a
 
 
@@ -92,7 +103,7 @@ BASE_IN_PATCH  := 1
 SMAPI_IN_PATCH := 1
 HDAPS_IN_PATCH := 1
 
-patch:
+patch: $(KSRC)
 	@TMPDIR=`mktemp -d /tmp/tp_smapi-patch.XXXXXX` &&\
 	echo "Working directory: $$TMPDIR" &&\
 	cd $$TMPDIR &&\

README

@@ -1,4 +1,4 @@
-tp_smapi version 0.39
+tp_smapi version 0.40
 IBM ThinkPad hardware functions driver
 
 Author:  Shem Multinymous <multinymous@gmail.com>
@@ -41,15 +41,22 @@ with one patched for compatibility with tp_smapi:
 or
 # make install HDAPS=1
 
+With some recent ThinkPad models, the "thinkpad_ec" will refuse to load due to
+reserved ports. You can force loading by passing the "force_io=1" parameter
+to the "thinkpad_ec" module using /etc/modules.conf (or your distribution's
+equivalent). To test this prior to installation, use:
+# make load HDAPS=1 FORCE_IO=1
+
 To prepare a stand-alone patch against the current kernel tree (including
-a compatibility fixes to hdaps and Kconfig entries):
+the hdaps replacement and Kconfig entries), assuming you have its sourcecode
+under /lib/modules/`uname -r`/source:
 # make patch
 
-To work against a kernel (other than the current one) that's
-installed under /lib/modules/, add an appropriate KVER= parameter
-# make patch KVER=2.6.16-rc2
-To work against an uninstalled kernel, you'll need to set KSRC and KBUILD too:
-# make patch KVER=2.6.16-rc2 KSRC=$HOME/2.6.16-rc2 KBUILD=$HOME/2.6.16-rc2
+To work against a kernel (other than the current one) that's properly
+installed under /lib/modules/*, add an appropriate KVER= parameter
+# make patch KVER=2.6.16
+To work against another kernel, you'll need to set KSRC and KBUILD too:
+# make patch KVER=2.6.16 KSRC=$HOME/2.6.16 KBUILD=$HOME/2.6.16
 
 To delete all autogenerated files:
 # make clean
@@ -59,17 +66,15 @@ Append "DEBUG=1" to "make load" to load tp_smapi with debug=1.
 The original kernel tree is never modified by any these commands. 
 The /lib/modules directory is modified only by "make install".
 
-If your kernel doesn't have dmi-decode-and-save-oem-string-information
-applied (see below) then all make commands except "make patch" will need
-to invoke "dmidecode" using "sudo", to get information about your
-hardware at compile time.
-
 
 Module parameters
 -----------------
 
+thinkpad_ec module:
+  force_io=1 lets thinkpad_ec load on some recent ThinkPad models
+  (e.g., T400 and T500) whose BIOS's ACPI DSDT reserves the ports we need.
 tp_smapi module: 
-  debug=1 enables verbose dmesg output.
+  debug=1    enables verbose dmesg output.
 
 
 Usage

hdaps.c

@@ -89,7 +89,6 @@ static struct input_dev *hdaps_idev_raw; /* raw hdaps sensor readouts */
 static unsigned int hdaps_invert = HDAPS_ORIENT_UNDEFINED;
 static int needs_calibration;
 
-
 /* Configuration: */
 static int sampling_rate = 50;       /* Sampling rate  */
 static int oversampling_ratio = 5;   /* Ratio between our sampling rate and

thinkpad_ec.c

@@ -45,7 +45,7 @@
 	#include <linux/semaphore.h>
 #endif
 
-#define TP_VERSION "0.39"
+#define TP_VERSION "0.40"
 
 MODULE_AUTHOR("Shem Multinymous");
 MODULE_DESCRIPTION("ThinkPad embedded controller hardware access");
@@ -88,9 +88,14 @@ static u64 prefetch_jiffies;                      /* time of prefetch, or: */
 #define TPC_PREFETCH_JUNK   (INITIAL_JIFFIES+1)   /*   Ignore prefetch */
 
 /* Locking: */
-
 static DECLARE_MUTEX(thinkpad_ec_mutex);
 
+/* Kludge in case the ACPI DSDT reserves the ports we need. */
+static int force_io;    /* Willing to do IO to ports we couldn't reserve? */
+static int reserved_io; /* Successfully reserved the ports? */
+module_param_named(force_io, force_io, bool, 0600);
+MODULE_PARM_DESC(force_io, "Force IO even if region already reserved (0=off, 1=on)");
+
 /**
  * thinkpad_ec_lock - get lock on the ThinkPad EC
  *
@@ -468,17 +473,24 @@ static int __init thinkpad_ec_init(void)
 		return -ENODEV;
 	}
 
-	if (!request_region(TPC_BASE_PORT, TPC_NUM_PORTS,
-			    "thinkpad_ec")) {
-		printk(KERN_ERR "thinkpad_ec: cannot claim io ports %#x-%#x\n",
+	if (request_region(TPC_BASE_PORT, TPC_NUM_PORTS, "thinkpad_ec")) {
+		reserved_io = 1;
+	} else {
+		printk(KERN_ERR "thinkpad_ec: cannot claim IO ports %#x-%#x... ",
 		       TPC_BASE_PORT,
 		       TPC_BASE_PORT + TPC_NUM_PORTS - 1);
-		return -ENXIO;
+		if (force_io) {
+			printk("forcing use of unreserved IO ports.\n");
+		} else {
+			printk("consider using force_io=1.\n");
+			return -ENXIO;
+		}
 	}
 	prefetch_jiffies = TPC_PREFETCH_JUNK;
 	if (thinkpad_ec_test()) {
 		printk(KERN_ERR "thinkpad_ec: initial ec test failed\n");
-		release_region(TPC_BASE_PORT, TPC_NUM_PORTS);
+		if (reserved_io)
+			release_region(TPC_BASE_PORT, TPC_NUM_PORTS);
 		return -ENXIO;
 	}
 	printk(KERN_INFO "thinkpad_ec: thinkpad_ec " TP_VERSION " loaded.\n");
@@ -487,7 +499,8 @@ static int __init thinkpad_ec_init(void)
 
 static void __exit thinkpad_ec_exit(void)
 {
-	release_region(TPC_BASE_PORT, TPC_NUM_PORTS);
+	if (reserved_io)
+		release_region(TPC_BASE_PORT, TPC_NUM_PORTS);
 	printk(KERN_INFO "thinkpad_ec: unloaded.\n");
 }
 

tp_smapi.c

@@ -47,7 +47,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#define TP_VERSION "0.39"
+#define TP_VERSION "0.40"
 #define TP_DESC "ThinkPad SMAPI Support"
 #define TP_DIR "smapi"
 
@@ -1238,13 +1238,15 @@ static int saved_threshs[4] = {-1, -1, -1, -1};  /* -1 = don't know */
 
 static int tp_suspend(struct platform_device *dev, pm_message_t state)
 {
-	if (get_real_thresh(0, THRESH_STOP , &saved_threshs[0]))
+	int restore = (state.event == PM_EVENT_HIBERNATE ||
+	               state.event == PM_EVENT_FREEZE);
+	if (!restore || get_real_thresh(0, THRESH_STOP , &saved_threshs[0]))
 		saved_threshs[0] = -1;
-	if (get_real_thresh(0, THRESH_START, &saved_threshs[1]))
+	if (!restore || get_real_thresh(0, THRESH_START, &saved_threshs[1]))
 		saved_threshs[1] = -1;
-	if (get_real_thresh(1, THRESH_STOP , &saved_threshs[2]))
+	if (!restore || get_real_thresh(1, THRESH_STOP , &saved_threshs[2]))
 		saved_threshs[2] = -1;
-	if (get_real_thresh(1, THRESH_START, &saved_threshs[3]))
+	if (!restore || get_real_thresh(1, THRESH_START, &saved_threshs[3]))
 		saved_threshs[3] = -1;
 	DPRINTK("suspend saved: %d %d %d %d", saved_threshs[0],
 		saved_threshs[1], saved_threshs[2], saved_threshs[3]);