Merge commit '67be00e' into update_avalon_20130524

driver-avalon.c

@@ -640,7 +640,7 @@ static bool avalon_prepare(struct thr_info *thr)
 	struct avalon_info *info = avalon_infos[avalon->device_id];
 	struct timeval now;
 
-	avalon->works = calloc(info->miner_count * sizeof(struct work *), 1);
+	avalon->works = calloc(info->miner_count * sizeof(struct work *), 4);
 	if (!avalon->works)
 		quit(1, "Failed to calloc avalon works in avalon_prepare");
 	__avalon_init(avalon);
@@ -664,7 +664,31 @@ static void avalon_free_work(struct thr_info *thr)
 	works = avalon->works;
 	info = avalon_infos[avalon->device_id];
 
-	for (i = 0; i < info->miner_count; i++) {
+	for (i = 0; i < info->miner_count * 4; i++) {
+		if (works[i]) {
+			work_completed(avalon, works[i]);
+			works[i] = NULL;
+		}
+	}
+}
+
+static void avalon_free_work_array(struct thr_info *thr)
+{
+	struct cgpu_info *avalon;
+	struct work **works;
+	int i, j, mc, wa;
+
+	avalon = thr->cgpu;
+	avalon->queued = 0;
+	if (unlikely(!avalon->works))
+		return;
+	works = avalon->works;
+	mc = avalon_infos[avalon->device_id]->miner_count;
+	wa = avalon->work_array + 1;
+	if (wa > 3)
+		wa = 0;
+
+	for (i = wa * mc, j = 0; j < mc; i++, j++) {
 		if (likely(works[i])) {
 			work_completed(avalon, works[i]);
 			works[i] = NULL;
@@ -753,13 +777,14 @@ static inline void adjust_fan(struct avalon_info *info)
 static bool avalon_fill(struct cgpu_info *avalon)
 {
 	struct work *work = get_queued(avalon);
+	int mc = avalon_infos[avalon->device_id]->miner_count;
 
 	if (unlikely(!work))
 		return false;
-	if (avalon->queued == avalon_infos[avalon->device_id]->miner_count)
+	if (avalon->queued >= mc)
 		return true;
-	avalon->works[avalon->queued++] = work;
-	if (avalon->queued == avalon_infos[avalon->device_id]->miner_count)
+	avalon->works[avalon->work_array * mc + avalon->queued++] = work;
+	if (avalon->queued >= mc)
 		return true;
 	return false;
 }
@@ -775,6 +800,7 @@ static int64_t avalon_scanhash(struct thr_info *thr)
 	struct avalon_result ar;
 	int i;
 	int avalon_get_work_count;
+	int start_count, end_count;
 
 	struct timeval tv_start, tv_finish, elapsed;
 	uint32_t nonce;
@@ -801,7 +827,9 @@ static int64_t avalon_scanhash(struct thr_info *thr)
 	tcflush(fd, TCOFLUSH);
 #endif
 
-	i = 0;
+	start_count = avalon->work_array * avalon_get_work_count;
+	end_count = start_count + avalon_get_work_count;
+	i = start_count;
 	while (true) {
 		avalon_init_task(&at, 0, 0, info->fan_pwm,
 				 info->timeout, info->asic_count,
@@ -810,7 +838,7 @@ static int64_t avalon_scanhash(struct thr_info *thr)
 		ret = avalon_send_task(fd, &at, avalon);
 		if (unlikely(ret == AVA_SEND_ERROR ||
 			     (ret == AVA_SEND_BUFFER_EMPTY &&
-			      (i + 1 == avalon_get_work_count) &&
+			      (i + 1 == end_count) &&
 			      first_try))) {
 			do_avalon_close(thr);
 			applog(LOG_ERR, "AVA%i: Comms error(buffer)",
@@ -821,7 +849,7 @@ static int64_t avalon_scanhash(struct thr_info *thr)
 			avalon_init(avalon);
 			return 0;	/* This should never happen */
 		}
-		if (ret == AVA_SEND_BUFFER_EMPTY && (i + 1 == avalon_get_work_count)) {
+		if (ret == AVA_SEND_BUFFER_EMPTY && (i + 1 == end_count)) {
 			first_try = 1;
 			return 0xffffffff;
 		}
@@ -903,7 +931,9 @@ static int64_t avalon_scanhash(struct thr_info *thr)
 		return 0;
 	}
 
-	avalon_free_work(thr);
+	avalon_free_work_array(thr);
+	if (++avalon->work_array > 3)
+		avalon->work_array = 0;
 
 	record_temp_fan(info, &ar, &(avalon->temp));
 	applog(LOG_INFO,

miner.h

@@ -435,6 +435,7 @@ struct cgpu_info {
 	};
 #ifdef USE_AVALON
 	struct work **works;
+	int work_array;
 	int queued;
 #endif
 #ifdef USE_BITFORCE