Commit 032c1565e73fa8d8814a1b8fb284a72d26e77caf
2014-01-25T20:32:19
Decrease the hfa clock rate if it is overclocked and we have had to try resetting it.
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
diff --git a/driver-hashfast.c b/driver-hashfast.c
index 860307a..6a8ca49 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -19,8 +19,8 @@
#include "driver-hashfast.h"
int opt_hfa_ntime_roll = 1;
-int opt_hfa_hash_clock = 550;
-int opt_hfa_overheat = 85;
+int opt_hfa_hash_clock = HFA_CLOCK_DEFAULT;
+int opt_hfa_overheat = HFA_OVERHEAT_DEFAULT;
bool opt_hfa_pll_bypass;
bool opt_hfa_dfu_boot;
@@ -278,7 +278,8 @@ static bool hfa_reset(struct cgpu_info *hashfast, struct hashfast_info *info)
info->resets++;
/* Hash clock rate in Mhz */
- info->hash_clock_rate = opt_hfa_hash_clock;
+ if (!info->hash_clock_rate)
+ info->hash_clock_rate = opt_hfa_hash_clock;
info->group_ntime_roll = opt_hfa_ntime_roll;
info->core_ntime_roll = 1;
@@ -933,12 +934,19 @@ static int64_t hfa_scanwork(struct thr_info *thr)
if (unlikely(last_getwork - hashfast->last_device_valid_work > 60)) {
applog(LOG_WARNING, "HFA %d: No valid hashes for over 1 minute, attempting to reset",
hashfast->device_id);
+ if (info->hash_clock_rate > HFA_CLOCK_DEFAULT) {
+ info->hash_clock_rate -= 5;
+ applog(LOG_WARNING, "%s %d: Decreasing clock speed to %d with reset",
+ hashfast->drv->name, hashfast->device_id, info->hash_clock_rate);
+ }
ret = hfa_reset(hashfast, info);
- if (unlikely(!ret)) {
- applog(LOG_ERR, "HFA %d: Failed to reset after hash failure, disabling",
- hashfast->device_id);
+ if (!ret) {
+ applog(LOG_ERR, "%s %d: Failed to reset after hash failure, disabling",
+ hashfast->drv->name, hashfast->device_id);
return -1;
}
+ applog(LOG_NOTICE, "%s %d: Reset successful", hashfast->drv->name,
+ hashfast->device_id);
}
if (unlikely(thr->work_restart)) {
diff --git a/driver-hashfast.h b/driver-hashfast.h
index 595c30b..ea1fbb0 100644
--- a/driver-hashfast.h
+++ b/driver-hashfast.h
@@ -23,6 +23,8 @@ bool opt_hfa_pll_bypass;
bool opt_hfa_dfu_boot;
#define HASHFAST_MINER_THREADS 1
+#define HFA_CLOCK_DEFAULT 550
+#define HFA_OVERHEAT_DEFAULT 85
// Matching fields for hf_statistics, but large #s for local accumulation, per-die
struct hf_long_statistics {