add Avalon A3255 prototype machine support
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 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251
diff --git a/driver-avalon.c b/driver-avalon.c
index 4a4b0b8..791cf86 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -59,7 +59,7 @@ static int avalon_init_task(struct avalon_task *at,
uint8_t reset, uint8_t ff, uint8_t fan,
uint8_t timeout, uint8_t asic_num,
uint8_t miner_num, uint8_t nonce_elf,
- uint8_t gate_miner, int frequency)
+ uint8_t gate_miner, int frequency, int asic)
{
uint16_t *lefreq16;
uint8_t *buf;
@@ -109,8 +109,58 @@ static int avalon_init_task(struct avalon_task *at,
buf[9] = 0x01;
buf[10] = 0x00;
buf[11] = 0x00;
- lefreq16 = (uint16_t *)&buf[6];
- *lefreq16 = htole16(frequency * 8);
+
+ if (asic == 110) {
+ lefreq16 = (uint16_t *)&buf[6];
+ *lefreq16 = htole16(frequency * 8);
+ } else {
+ switch (frequency / 2) { /* This is the real clock in Mhz, 1Mhz means 2Mhs */
+ case 1000:
+ buf[6] = 0xe0;
+ buf[7] = 0x84;
+ break;
+ case 950:
+ buf[6] = 0xa0;
+ buf[7] = 0x84;
+ break;
+ case 900:
+ buf[6] = 0x60;
+ buf[7] = 0x84;
+ break;
+ case 850:
+ buf[6] = 0x20;
+ buf[7] = 0x84;
+ break;
+ case 800:
+ buf[6] = 0xe0;
+ buf[7] = 0x83;
+ break;
+ case 750:
+ buf[6] = 0xa0;
+ buf[7] = 0x83;
+ break;
+ case 700:
+ buf[6] = 0x60;
+ buf[7] = 0x83;
+ break;
+ case 650:
+ buf[6] = 0x20;
+ buf[7] = 0x83;
+ break;
+ case 600:
+ buf[6] = 0xe0;
+ buf[7] = 0x82;
+ break;
+ case 550:
+ buf[6] = 0xa0;
+ buf[7] = 0x82;
+ break;
+ default: /* 500Mhz etc */
+ buf[6] = 0xe0;
+ buf[7] = 0x94;
+ break;
+ }
+ }
return 0;
}
@@ -321,7 +371,8 @@ static int avalon_reset(struct cgpu_info *avalon, bool initial)
AVALON_DEFAULT_ASIC_NUM,
AVALON_DEFAULT_MINER_NUM,
0, 0,
- AVALON_DEFAULT_FREQUENCY);
+ AVALON_DEFAULT_FREQUENCY,
+ 110);
wait_avalon_ready(avalon);
ret = avalon_send_task(&at, avalon);
@@ -389,10 +440,11 @@ static int avalon_calc_timeout(int frequency)
}
static bool get_options(int this_option_offset, int *baud, int *miner_count,
- int *asic_count, int *timeout, int *frequency, char *options)
+ int *asic_count, int *timeout, int *frequency, int *asic,
+ char *options)
{
char buf[BUFSIZ+1];
- char *ptr, *comma, *colon, *colon2, *colon3, *colon4;
+ char *ptr, *comma, *colon, *colon2, *colon3, *colon4, *colon5;
bool timeout_default;
size_t max;
int i, tmp;
@@ -495,6 +547,10 @@ static bool get_options(int this_option_offset, int *baud, int *miner_count,
}
}
if (colon4 && *colon4) {
+ colon5 = strchr(colon4, ':');
+ if (colon5)
+ *(colon5++) = '\0';
+
tmp = atoi(colon4);
if (tmp < AVALON_MIN_FREQUENCY || tmp > AVALON_MAX_FREQUENCY) {
quit(1, "Invalid avalon-options for frequency, must be %d <= frequency <= %d",
@@ -503,6 +559,12 @@ static bool get_options(int this_option_offset, int *baud, int *miner_count,
*frequency = tmp;
if (timeout_default)
*timeout = avalon_calc_timeout(*frequency);
+ if (colon5 && *colon5) {
+ tmp = atoi(colon5);
+ if (tmp != 110 && tmp != 55)
+ quit(1, "Invalid avalon-options for asic, must be 110 or 55");
+ *asic = tmp;
+ }
}
}
}
@@ -564,7 +626,7 @@ static void avalon_idle(struct cgpu_info *avalon, struct avalon_info *info)
info->idle++;
avalon_init_task(&at, 0, 0, info->fan_pwm, info->timeout,
info->asic_count, info->miner_count, 1, 1,
- info->frequency);
+ info->frequency, info->asic);
if (avalon_send_task(&at, avalon) == AVA_SEND_ERROR)
break;
}
@@ -743,7 +805,7 @@ static void bitburner_get_version(struct cgpu_info *avalon)
static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found)
{
- int baud, miner_count, asic_count, timeout, frequency;
+ int baud, miner_count, asic_count, timeout, frequency, asic;
int this_option_offset;
struct avalon_info *info;
struct cgpu_info *avalon;
@@ -763,7 +825,7 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
this_option_offset = usb_ident(avalon) == IDENT_BBF ? ++bbf_option_offset : ++option_offset;
configured = get_options(this_option_offset, &baud, &miner_count,
- &asic_count, &timeout, &frequency,
+ &asic_count, &timeout, &frequency, &asic,
(usb_ident(avalon) == IDENT_BBF && opt_bitburner_fury_options != NULL) ? opt_bitburner_fury_options : opt_avalon_options);
/* Even though this is an FTDI type chip, we want to do the parsing
@@ -779,12 +841,14 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
info = avalon->device_data;
if (configured) {
+ info->asic = asic;
info->baud = baud;
info->miner_count = miner_count;
info->asic_count = asic_count;
info->timeout = timeout;
info->frequency = frequency;
} else {
+ info->asic = 110;
info->baud = AVALON_IO_SPEED;
info->asic_count = AVALON_DEFAULT_ASIC_NUM;
switch (usb_ident(avalon)) {
@@ -803,7 +867,8 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
info->fan_pwm = AVALON_DEFAULT_FAN_MIN_PWM;
info->temp_max = 0;
/* This is for check the temp/fan every 3~4s */
- info->temp_history_count = (4 / (float)((float)info->timeout * ((float)1.67/0x32))) + 1;
+ info->temp_history_count =
+ (4 / (float)((float)info->timeout * (110 / info->asic) * ((float)1.67/0x32))) + 1;
if (info->temp_history_count <= 0)
info->temp_history_count = 1;
@@ -823,9 +888,9 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
avalon_idle(avalon, info);
applog(LOG_DEBUG, "Avalon Detected: %s "
- "(miner_count=%d asic_count=%d timeout=%d frequency=%d)",
+ "(miner_count=%d asic_count=%d timeout=%d frequency=%d chip=%d)",
avalon->device_path, info->miner_count, info->asic_count, info->timeout,
- info->frequency);
+ info->frequency, info->asic);
if (usb_ident(avalon) == IDENT_BTB) {
if (opt_bitburner_core_voltage < BITBURNER_MIN_COREMV ||
@@ -1140,7 +1205,7 @@ static void *avalon_send_tasks(void *userdata)
if (likely(j < avalon->queued && !info->overheat && avalon->works[i])) {
avalon_init_task(&at, 0, 0, info->fan_pwm,
info->timeout, info->asic_count,
- info->miner_count, 1, 0, info->frequency);
+ info->miner_count, 1, 0, info->frequency, info->asic);
avalon_create_task(&at, avalon->works[i]);
info->auto_queued++;
} else {
@@ -1152,7 +1217,7 @@ static void *avalon_send_tasks(void *userdata)
idle_freq = AVALON_MIN_FREQUENCY;
avalon_init_task(&at, 0, 0, info->fan_pwm,
info->timeout, info->asic_count,
- info->miner_count, 1, 1, idle_freq);
+ info->miner_count, 1, 1, idle_freq, info->asic);
/* Reset the auto_queued count if we end up
* idling any miners. */
avalon_reset_auto(info);
@@ -1226,7 +1291,7 @@ static void *bitburner_send_tasks(void *userdata)
if (likely(j < avalon->queued && !info->overheat && avalon->works[i])) {
avalon_init_task(&at, 0, 0, info->fan_pwm,
info->timeout, info->asic_count,
- info->miner_count, 1, 0, info->frequency);
+ info->miner_count, 1, 0, info->frequency, info->asic);
avalon_create_task(&at, avalon->works[i]);
info->auto_queued++;
} else {
@@ -1238,7 +1303,7 @@ static void *bitburner_send_tasks(void *userdata)
idle_freq = AVALON_MIN_FREQUENCY;
avalon_init_task(&at, 0, 0, info->fan_pwm,
info->timeout, info->asic_count,
- info->miner_count, 1, 1, idle_freq);
+ info->miner_count, 1, 1, idle_freq, info->asic);
/* Reset the auto_queued count if we end up
* idling any miners. */
avalon_reset_auto(info);
@@ -1577,6 +1642,7 @@ static struct api_data *avalon_api_stats(struct cgpu_info *cgpu)
root = api_add_string(root, "version", buf, true);
}
root = api_add_uint32(root, "Controller Version", &(info->ctlr_ver), false);
+ root = api_add_uint32(root, "Avalon Chip", &(info->asic), false);
return root;
}
diff --git a/driver-avalon.h b/driver-avalon.h
index 5b6cf83..610a9d8 100644
--- a/driver-avalon.h
+++ b/driver-avalon.h
@@ -48,7 +48,7 @@
#define AVALON_DEFAULT_TIMEOUT 0x2D
#define AVALON_MIN_FREQUENCY 256
-#define AVALON_MAX_FREQUENCY 1024
+#define AVALON_MAX_FREQUENCY 2000
#define AVALON_TIMEOUT_FACTOR 12690
#define AVALON_DEFAULT_FREQUENCY 282
#define AVALON_DEFAULT_MINER_NUM 0x20
@@ -137,6 +137,7 @@ struct avalon_info {
int matching_work[AVALON_MAX_MINER_NUM];
int frequency;
+ int asic;
uint32_t ctlr_ver;
struct thr_info *thr;