From: Goffredo Baroncelli <kreijack@gmail.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "\"" <jdelvare@suse.de>, "\"" <linux-kernel@vger.kernel.org>,
"\"" <bryan@whatroute.net>,
Goffredo Baroncelli <kreijack@inwind.it>
Subject: [PATCH 3/4] Add the "verbose" module option.
Date: Fri, 1 Aug 2014 14:00:49 +0000 [thread overview]
Message-ID: <1406901650-20841-4-git-send-email-kreijack@inwind.it> (raw)
In-Reply-To: <1406901650-20841-1-git-send-email-kreijack@inwind.it>
The "verbose" option controls the message in the kernel log
verbose = 0 no message
verbose = 1 log only the fan speed changes
verbose = 2 log the fan speed changes and the temperature changes
Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
---
drivers/macintosh/therm_windtunnel.c | 37 +++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 1e50455..0c4eb85 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -44,7 +44,11 @@
#include <asm/sections.h>
#include <asm/macio.h>
-#define LOG_TEMP 0 /* continuously log temperature */
+static int verbose = 1; /* see description below */
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose, "Vebosity level: 0=silent, "
+ "1=log the fan tuning, "
+ "2=log the temperature.");
static struct {
volatile int running;
@@ -157,10 +161,6 @@ tune_fan( int fan_setting )
/* write_reg( x.fan, 0x24, val, 1 ); */
write_reg( x.fan, 0x25, val, 1 );
write_reg( x.fan, 0x20, 0, 1 );
- print_temp("CPU-temp: ", x.temp );
- if( x.casetemp )
- print_temp(", Case: ", x.casetemp );
- printk(", Fan: %d (tuned %+d)\n", 11-fan_setting, x.fan_level-fan_setting );
x.fan_level = fan_setting;
}
@@ -179,14 +179,6 @@ poll_temp( void )
casetemp = read_reg(x.fan, 0x0b, 1) << 8;
casetemp |= (read_reg(x.fan, 0x06, 1) & 0x7) << 5;
- if( LOG_TEMP && x.temp != temp ) {
- print_temp("CPU-temp: ", temp );
- print_temp(", Case: ", casetemp );
- printk(", Fan: %d\n", 11-x.fan_level );
- }
- x.temp = temp;
- x.casetemp = casetemp;
-
level = -1;
for( i=0; (temp & 0xffff) > fan_table[i].temp ; i++ )
;
@@ -200,6 +192,25 @@ poll_temp( void )
level = fan_table[i].fan_up_setting;
x.upind = i;
+ /*
+ * if verbose >0 log each fan tuning
+ * if verbose >1 log each cpu temperature change
+ */
+ if ((verbose > 1 && x.temp != temp ) ||
+ (verbose > 0 && level >= 0)) {
+ print_temp("CPU-temp: ", temp );
+ if (casetemp)
+ print_temp(", Case: ", casetemp );
+ if (level >= 0)
+ printk(", Fan: %d (tuned %+d)\n", 11-level,
+ x.fan_level-level );
+ else
+ printk(", Fan: %d (tuned +0)\n",x.fan_level);
+ }
+
+ x.temp = temp;
+ x.casetemp = casetemp;
+
if( level >= 0 )
tune_fan( level );
}
--
2.0.1
next prev parent reply other threads:[~2014-08-01 14:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 14:00 [PATCH][v2] therm_windtunnel doesn't work properly on PowerMac G4 Goffredo Baroncelli
2014-08-01 14:00 ` [PATCH 1/4] Update drivers names to the ones invoked by i2c-powermac Goffredo Baroncelli
2014-08-01 14:00 ` [PATCH 2/4] Remove attach_method because un-used Goffredo Baroncelli
2014-08-01 14:00 ` Goffredo Baroncelli [this message]
2014-08-03 14:12 ` [PATCH 3/4] Add the "verbose" module option Jean Delvare
2014-08-03 15:12 ` Goffredo Baroncelli
2014-08-03 15:52 ` Jean Delvare
2014-08-03 16:36 ` Goffredo Baroncelli
2014-08-04 8:46 ` Jean Delvare
2014-08-04 17:10 ` Goffredo Baroncelli
2014-08-05 8:59 ` Jean Delvare
2014-08-01 14:00 ` [PATCH 4/4] Return the fan speed via sysfs Goffredo Baroncelli
2014-08-03 14:17 ` Jean Delvare
2014-08-03 15:27 ` Goffredo Baroncelli
2014-08-03 15:59 ` Jean Delvare
2014-08-03 16:42 ` Goffredo Baroncelli
2014-08-04 8:44 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406901650-20841-4-git-send-email-kreijack@inwind.it \
--to=kreijack@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=bryan@whatroute.net \
--cc=jdelvare@suse.de \
--cc=kreijack@inwind.it \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®