From d7ade70215fcfe15caed54d7132a9dca73fd01f7 Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Sat, 20 Nov 2004 01:55:10 +0000
Subject: [PATCH] support "linearization function" 1/x.       Modified from a
 patch by Peter Wilsmore <pwilsmore@asi.com.au>

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2763 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                   |  1 +
 doc/chips/bmcsensors      |  2 +-
 kernel/chips/bmcsensors.c | 33 +++++++++++++++++++++++++++------
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4572f50b..c20969d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ ask CVS about it:
   File README.thinkpad: Update
   File doc/chips/lm63: New
   File kernel/chips/Module.mk: Resync module list with mkpatch
+  Module bmcsensors: Support function 1/x
   Module i2c-ipmb: Remove from build since it doesn't work
   Module lm63: New driver for the National Semiconductor LM63
   Module lm83: Use signed types for temperatures
diff --git a/doc/chips/bmcsensors b/doc/chips/bmcsensors
index c7444d1a..6273d729 100644
--- a/doc/chips/bmcsensors
+++ b/doc/chips/bmcsensors
@@ -116,7 +116,7 @@ Threshold setting is not yet supported.
 
 1's and 2's complement formats not yet supported.
 
-Non-linear conversions not supported.
+Non-linear conversions not supported, except for 1/x.
 
 Fan divs are not supported (or required) - should the driver
 export a fan_div entry (1 1 1 ...) for compatibility?
diff --git a/kernel/chips/bmcsensors.c b/kernel/chips/bmcsensors.c
index ca09f26c..106dacf2 100644
--- a/kernel/chips/bmcsensors.c
+++ b/kernel/chips/bmcsensors.c
@@ -249,6 +249,7 @@ static void bmcsensors_select_thresholds(struct sdrdata * sd)
 {
 	u8 capab = sd->capab;
 	u16 mask = sd->thresh_mask;
+	int tmp;
 
 	sd->lim1 = -1;
 	sd->lim2 = -1;
@@ -296,7 +297,13 @@ static void bmcsensors_select_thresholds(struct sdrdata * sd)
 		}
 	}
 
-	/* fixme swap lim1/lim2 if m < 0 */
+	/* swap lim1/lim2 if m < 0 or function is 1/x (but not both!) */
+	if(m < 0 && sd->linear != 7 || m >= 0 && sd->linear == 7) {
+		tmp = sd->lim1;
+		sd->lim1 = sd->lim2;
+		sd->lim2 = tmp;
+	}
+
 	if(sd->lim1 >= 0)
 		printk(KERN_INFO "bmcsensors.o: using %s for upper limit\n",
 			threshold_text[sd->lim1]);
@@ -380,7 +387,7 @@ static void bmcsensors_build_proc_table()
 				bmcsensors_dir_table[i].procname, id);
 		}
 		bmcsensors_select_thresholds(sdrd + i);
-		if(sdrd[i].linear != 0) {
+		if(sdrd[i].linear != 0 && sdrd[i].linear != 7) {
 			printk(KERN_INFO
 			       "bmcsensors.o: sensor %d: nonlinear function 0x%.2x unsupported, expect bad results\n",
 			       i, sdrd[i].linear);
@@ -926,6 +933,7 @@ static int decplaces(struct sdrdata *sd)
 }
 
 /* convert a raw value to a reading. IMPI V1.5 Section 30 */
+/* 1/x is the only "linearization function" supported */
 static long conv_val(int value, struct sdrdata *sd)
 {
 	u8 k1, k2;
@@ -939,10 +947,23 @@ static long conv_val(int value, struct sdrdata *sd)
 	else
 		r += sd->b / exps[16 - k1];
 	r *= exps[decplaces(sd)];
-	if(k2 < 8)
-		r *= exps[k2];
-	else
-		r /= exps[16 - k2];
+	if(k2 < 8) {
+		if(sd->linear != 7)
+			r *= exps[k2];
+		else
+			// this will always truncate to 0: r = 1 / (exps[k2] * r);
+			r = 0;
+	} else {
+		if(sd->linear != 7)
+			r /= exps[16 - k2];
+		else {
+			if(r != 0)
+				// 1 / x * 10 ** (-m) == 10 ** m / x
+				r = exps[16 - k2] / r;
+			else
+				r = 0;
+		}
+	}
 	return r;
 }