Commit 821b7919b0b9be9c9f32c0450d06e12772f3c4b2
2013-10-18T15:16:11
Better HW error count; disable permanently those cores which fail often
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
diff --git a/driver-knc-spi-fpga.c b/driver-knc-spi-fpga.c
index 332c723..2e3cbcc 100644
--- a/driver-knc-spi-fpga.c
+++ b/driver-knc-spi-fpga.c
@@ -29,6 +29,7 @@
/* How many hardware errors in a row before disabling the core */
#define HW_ERR_LIMIT 10
+#define DISA_ERR_LIMIT 3
#define MAX_ACTIVE_WORKS (192 * 2 * 6 * 2)
@@ -161,6 +162,8 @@ struct knc_state {
struct timeval jupiter_work_start[KNC_ACTIVE_BUFFER_SIZE];
#endif
uint8_t hwerrs[MAX_ASICS * 256];
+ uint8_t disa_cnt[MAX_ASICS * 256];
+ uint32_t hwerr_work_id[MAX_ASICS * 256];
int read_d, write_d;
#define KNC_DISA_CORES_SIZE (MAX_ASICS * 256)
struct core_disa_data disa_cores_fifo[KNC_DISA_CORES_SIZE];
@@ -531,10 +534,15 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
rxbuf->responses[i].core;
if (submit_nonce(thr, work,
rxbuf->responses[i].nonce)) {
- if (cidx < sizeof(knc->hwerrs))
+ if (cidx < sizeof(knc->hwerrs)) {
knc->hwerrs[cidx] = 0;
+ knc->disa_cnt[cidx] = 0;
+ knc->hwerr_work_id[cidx] = 0xFFFFFFFF;
+ }
} else {
- if (cidx < sizeof(knc->hwerrs)) {
+ if ((cidx < sizeof(knc->hwerrs)) &&
+ (knc->hwerr_work_id[cidx] != rxbuf->responses[i].work_id)) {
+ knc->hwerr_work_id[cidx] = rxbuf->responses[i].work_id;
if (++(knc->hwerrs[cidx]) >= HW_ERR_LIMIT) {
struct core_disa_data *core;
core = &knc->disa_cores_fifo[knc->write_d];
@@ -542,10 +550,15 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
core->asic = rxbuf->responses[i].asic;
core->core = rxbuf->responses[i].core;
disable_core(core->asic, core->core);
- applog(LOG_WARNING,
+ if (++(knc->disa_cnt[cidx]) >= DISA_ERR_LIMIT) {
+ applog(LOG_WARNING,
+ "KnC: core %u-%u was disabled permanently", core->asic, core->core);
+ } else {
+ applog(LOG_WARNING,
"KnC: core %u-%u was disabled due to %u HW errors in a row",
- core->asic, core->core, HW_ERR_LIMIT);
- knc_disa_cores_fifo_inc_idx(&knc->write_d);
+ core->asic, core->core, HW_ERR_LIMIT);
+ knc_disa_cores_fifo_inc_idx(&knc->write_d);
+ }
}
}
};
@@ -648,6 +661,7 @@ static bool knc_detect_one(struct spidev_context *ctx)
knc->read_d = 0;
knc->write_d = 1;
knc->salt = rand();
+ memset(knc->hwerr_work_id, 0xFF, sizeof(knc->hwerr_work_id));
#ifdef ENABLE_BENCHMARK
gettimeofday(&knc->lastscan, NULL);
#endif