Commit 6cc09aa1e97cf5eff645e5c7b2359d6a647c7cec
2013-06-24T10:38:47
Make the fan control on the avalon a simple PID controller with a target temperature of 45.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/driver-avalon.c b/driver-avalon.c
index 7d0e483..2ca1832 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -984,22 +984,60 @@ static inline void record_temp_fan(struct avalon_info *info, struct avalon_resul
info->temp_max = info->temp2;
}
+static void temp_rise(struct avalon_info *info, int temp)
+{
+ if (temp >= AVALON_TEMP_TARGET + AVALON_TEMP_HYSTERESIS * 3) {
+ info->fan_pwm = AVALON_DEFAULT_FAN_MAX_PWM;
+ return;
+ }
+ if (temp >= AVALON_TEMP_TARGET + AVALON_TEMP_HYSTERESIS * 2)
+ info->fan_pwm += 10;
+ else if (temp > AVALON_TEMP_TARGET)
+ info->fan_pwm += 5;
+ else if (temp >= AVALON_TEMP_TARGET - AVALON_TEMP_HYSTERESIS)
+ info->fan_pwm += 1;
+ else
+ return;
+
+ if (info->fan_pwm > AVALON_DEFAULT_FAN_MAX_PWM)
+ info->fan_pwm = AVALON_DEFAULT_FAN_MAX_PWM;
+}
+
+static void temp_drop(struct avalon_info *info, int temp)
+{
+ if (temp <= AVALON_TEMP_TARGET - AVALON_TEMP_HYSTERESIS * 3) {
+ info->fan_pwm = AVALON_DEFAULT_FAN_MIN_PWM;
+ return;
+ }
+ if (temp <= AVALON_TEMP_TARGET - AVALON_TEMP_HYSTERESIS * 2)
+ info->fan_pwm -= 10;
+ else if (temp <= AVALON_TEMP_TARGET - AVALON_TEMP_HYSTERESIS)
+ info->fan_pwm -= 5;
+ else if (temp < AVALON_TEMP_TARGET)
+ info->fan_pwm -= 1;
+
+ if (info->fan_pwm < AVALON_DEFAULT_FAN_MIN_PWM)
+ info->fan_pwm = AVALON_DEFAULT_FAN_MIN_PWM;
+}
+
static inline void adjust_fan(struct avalon_info *info)
{
int temp_new;
temp_new = info->temp_sum / info->temp_history_count;
- if (temp_new < 35) {
- info->fan_pwm = AVALON_DEFAULT_FAN_MIN_PWM;
- info->temp_old = temp_new;
- } else if (temp_new > 55) {
- info->fan_pwm = AVALON_DEFAULT_FAN_MAX_PWM;
- info->temp_old = temp_new;
- } else if (abs(temp_new - info->temp_old) >= 2) {
- info->fan_pwm = AVALON_DEFAULT_FAN_MIN_PWM + (temp_new - 35) * 6.4;
- info->temp_old = temp_new;
+ if (temp_new > info->temp_old)
+ temp_rise(info, temp_new);
+ else if (temp_new < info->temp_old)
+ temp_drop(info, temp_new);
+ else {
+ /* temp_new == info->temp_old */
+ if (temp_new > AVALON_TEMP_TARGET)
+ temp_rise(info, temp_new);
+ else if (temp_new < AVALON_TEMP_TARGET - AVALON_TEMP_HYSTERESIS)
+ temp_drop(info, temp_new);
}
+ info->temp_old = temp_new;
}
static void avalon_update_temps(struct cgpu_info *avalon, struct avalon_info *info,
diff --git a/driver-avalon.h b/driver-avalon.h
index 844aa38..70c01b6 100644
--- a/driver-avalon.h
+++ b/driver-avalon.h
@@ -25,6 +25,8 @@
#define AVALON_FAN_FACTOR 120
#define AVALON_DEFAULT_FAN_MAX_PWM 0xA0 /* 100% */
#define AVALON_DEFAULT_FAN_MIN_PWM 0x20 /* 20% */
+#define AVALON_TEMP_TARGET 45
+#define AVALON_TEMP_HYSTERESIS 3
#define AVALON_DEFAULT_TIMEOUT 0x2D
#define AVALON_DEFAULT_FREQUENCY 282