therm_windtunnel doesn't work properly on PowerMac G4
PATCH 3/3 therm_windtunnel doesn't work properly on PowerMac G4
Add the "log_temp" and "verbose" module parameters.
log_temp enable/disable the temperature logging
verbose enable/disable the fan tune logging
--- drivers/macintosh/therm_windtunnel.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/macintosh/therm_windtunnel.c +13 -6
@@ -44,7 +44,13 @@#include <asm/sections.h> #include <asm/macio.h> -#define LOG_TEMP 0/* continuously log temperature */ +static bool log_temp =0 ; +module_param (log_temp, bool,0644 ); +MODULE_PARM_DESC (log_temp,"Enable the temperature logging" ); + +static bool verbose =1 ; +module_param (verbose, bool,0644 ); +MODULE_PARM_DESC (verbose,"Enable the fan speed logging" ); static struct { volatile int running;
@@ -157,11 +163,12 @@ 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 ) +if (verbose) { +print_temp ("CPU-temp: " , x.temp );print_temp (", Case: " , x.casetemp ); -printk (", Fan: %d (tuned %+d)\n" ,11 -fan_setting, x.fan_level-fan_setting ); - +printk (", Fan: %d (tuned %+d)\n" , +11 -fan_setting, x.fan_level-fan_setting ); + } x.fan_level = fan_setting; }
@@ -179,7 +186,7 @@ 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 ) { +if ( log_temp && x.temp != temp ) {print_temp ("CPU-temp: " , temp );print_temp (", Case: " , casetemp );printk (", Fan: %d\n" ,11 -x.fan_level );
Hi Goffredo,
For next time: please give each individual patch an appropriate subject. Otherwise it is difficult to keep track of what each patch does exactly.
Quoted 1 line · Goffredo Baroncelli
Add the "
log_temp" and "verbose" module parameters.
I think this is a good idea, much better than build-time settings.
Quoted 2 lines
log_tempenable/disable the temperature logging
verbose enable/disable the fan tune logging
These names are not very consistent, both printks are logging both the temperatures and the fan speed.
Also I'm unsure if you really need 2 parameters for this. I see these more as two degrees of verbosity of the same logging feature. I would like to suggest having a single module parameter, with 3 different values:
0: log nothing
1: log fan tuning (default)
2: log fan tuning + temperature continuously
What do you think?
Quoted 27 lines
Signed-off-by Goffredo Baroncelli <[email protected]>--- drivers/macintosh/therm_windtunnel.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)drivers/macintosh/therm_windtunnel.c +7
-1@@ -44,7 +44,13 @@#include <asm/sections.h> #include <asm/macio.h> -#define LOG_TEMP 0/* continuously log temperature */ +static bool log_temp =0 ; +module_param (log_temp, bool,0644 ); +MODULE_PARM_DESC (log_temp,"Enable the temperature logging" ); + +static bool verbose =1 ; +module_param (verbose, bool,0644 ); +MODULE_PARM_DESC (verbose,"Enable the fan speed logging" ); static struct { volatile int running;
drivers/macintosh/therm_windtunnel.c tune_fan( int fan_setting ) · line 168
Quoted 8 lines
drivers/macintosh/therm_windtunnel.c +2
-2@@ -157,11 +163,12 @@ 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 ) +if (verbose) { +print_temp ("CPU-temp: " , x.temp );print_temp (", Case: " , x.casetemp );
In the original code, there was a condition for printing the case temperature, which you dropped. Is this on purpose? If so it should be explained in the patch description.
BTW I see that the continuous temperature logging below does not have such a condition. For consistency I think it should be either always or never included.
Quoted 9 lines
drivers/macintosh/therm_windtunnel.c +3
-2-printk (", Fan: %d (tuned %+d)\n" ,11 -fan_setting, x.fan_level-fan_setting ); - +printk (", Fan: %d (tuned %+d)\n" , +11 -fan_setting, x.fan_level-fan_setting ); + } x.fan_level = fan_setting; }
drivers/macintosh/therm_windtunnel.c poll_temp( void ) · line 192
Quoted 8 lines
drivers/macintosh/therm_windtunnel.c +1
-1@@ -179,7 +186,7 @@ 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 ) { +if ( log_temp && x.temp != temp ) {print_temp ("CPU-temp: " , temp );print_temp (", Case: " , casetemp );printk (", Fan: %d\n" ,11 -x.fan_level );
Thanks,
Signature · 2 lines
Jean Delvare SUSE L3 Support
Quoted 5 lines · Jean Delvare
Hi Goffredo,
For next time: please give each individual patch an appropriate subject. Otherwise it is difficult to keep track of what each patch does exactly.
I had to use the same subject because the email weren't threaded. The subject was the only way to group the patches.
The next time I will use git send-email (which I hate !), so this problem will disappear.
Quoted 22 lines · Goffredo Baroncelli
Quoted 1 line
Add the "
log_temp" and "verbose" module parameters.I think this is a good idea, much better than build-time settings.
Quoted 2 lines
log_tempenable/disable the temperature logging
verbose enable/disable the fan tune loggingThese names are not very consistent, both printks are logging both the temperatures and the fan speed.
Also I'm unsure if you really need 2 parameters for this. I see these more as two degrees of verbosity of the same logging feature. I would like to suggest having a single module parameter, with 3 different values:
0: log nothing
1: log fan tuning (default)
2: log fan tuning + temperature continuously
Quoted 1 line
What do you think?
I definitely agree. I will work on that in the next few days
Quoted 41 lines
Quoted 28 lines
Signed-off-by Goffredo Baroncelli <[email protected]>--- drivers/macintosh/therm_windtunnel.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)drivers/macintosh/therm_windtunnel.c +7
-1@@ -44,7 +44,13 @@#include <asm/sections.h> #include <asm/macio.h> -#define LOG_TEMP 0/* continuously log temperature */ +static bool log_temp =0 ; +module_param (log_temp, bool,0644 ); +MODULE_PARM_DESC (log_temp,"Enable the temperature logging" ); + +static bool verbose =1 ; +module_param (verbose, bool,0644 ); +MODULE_PARM_DESC (verbose,"Enable the fan speed logging" ); static struct { volatile int running;drivers/macintosh/therm_windtunnel.c tune_fan( int fan_setting ) · line 168
Quoted 8 lines
drivers/macintosh/therm_windtunnel.c +2
-2@@ -157,11 +163,12 @@ 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 ) +if (verbose) { +print_temp ("CPU-temp: " , x.temp );print_temp (", Case: " , x.casetemp );In the original code, there was a condition for printing the case temperature, which you dropped. Is this on purpose? If so it should be explained in the patch description.
Quoted 3 lines
BTW I see that the continuous temperature logging below does not have such a condition. For consistency I think it should be either always or never included.
I removed the "if" because the same printk() happens before (the tune_fan() function is called after the 2nd printk() ).
So remove the "if" is safe.
I agree that a better explanation in the comments helps. Because I have to update the patch for the log_temp/verbose module parameters, I will enhance the patch description.
Quoted 21 lines
Quoted 10 lines
drivers/macintosh/therm_windtunnel.c +3
-2-printk (", Fan: %d (tuned %+d)\n" ,11 -fan_setting, x.fan_level-fan_setting ); - +printk (", Fan: %d (tuned %+d)\n" , +11 -fan_setting, x.fan_level-fan_setting ); + } x.fan_level = fan_setting; }drivers/macintosh/therm_windtunnel.c poll_temp( void ) · line 192
Quoted 8 lines
drivers/macintosh/therm_windtunnel.c +1
-1@@ -179,7 +186,7 @@ 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 ) { +if ( log_temp && x.temp != temp ) {print_temp ("CPU-temp: " , temp );print_temp (", Case: " , casetemp );printk (", Fan: %d\n" ,11 -x.fan_level );Thanks,
Signature · 2 lines
gpg @keyserver.linux.it: Goffredo Baroncelli (kreijackATinwind.it> Key fingerprint BBF5 1610 0B64 DAC6 5F7D 17B2 0EDA 9B37 8B82 E0B5