Commit f66f47954d8553bd3a5d15c555aa37c736f5f8f9
2014-02-04T19:05:52
Correctly measure the hfa max temp and smooth out the changes in its value.
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
diff --git a/driver-hashfast.c b/driver-hashfast.c
index c0e7c65..ecdf400 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -678,7 +678,7 @@ static void hfa_update_die_status(struct cgpu_info *hashfast, struct hashfast_in
{
struct hf_g1_die_data *d = (struct hf_g1_die_data *)(h + 1), *ds;
int num_included = (h->data_length * 4) / sizeof(struct hf_g1_die_data);
- int i, j;
+ int i, j, die = h->chip_address;
float die_temperature;
float core_voltage[6];
@@ -688,17 +688,13 @@ static void hfa_update_die_status(struct cgpu_info *hashfast, struct hashfast_in
for (i = 0; i < num_included; i++)
memcpy(ds++, d++, sizeof(struct hf_g1_die_data));
- info->max_temp = 0;
for (i = 0, d = &info->die_status[h->chip_address]; i < num_included; i++, d++) {
- int die = h->chip_address + i;
-
+ die += i;
die_temperature = GN_DIE_TEMPERATURE(d->die.die_temperature);
/* Sanity checking */
if (unlikely(die_temperature > 255))
die_temperature = info->die_data[die].temp;
info->die_data[die].temp = die_temperature;
- if (die_temperature > info->max_temp)
- info->max_temp = die_temperature;
for (j = 0; j < 6; j++)
core_voltage[j] = GN_CORE_VOLTAGE(d->die.core_voltage[j]);
@@ -708,6 +704,17 @@ static void hfa_update_die_status(struct cgpu_info *hashfast, struct hashfast_in
core_voltage[3], core_voltage[4], core_voltage[5]);
// XXX Convert board phase currents, voltage, temperature
}
+ if (die == info->asic_count - 1) {
+ /* We have a full set of die temperatures, find the highest
+ * current die temp. */
+ die_temperature = 0;
+ for (die = 0; die < info->asic_count; die++) {
+ if (info->die_data[die].temp > die_temperature)
+ die_temperature = info->die_data[die].temp;
+ }
+ /* Exponentially change the max_temp to smooth out troughs. */
+ info->max_temp = info->max_temp * 0.63 + die_temperature * 0.37;
+ }
if (unlikely(info->max_temp >= opt_hfa_overheat)) {
/* -1 means new overheat condition */