CMR allow sending flash and clock commands
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 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296
diff --git a/driver-icarus.c b/driver-icarus.c
index 6278121..2655c14 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -180,6 +180,7 @@ static const char *MODE_VALUE_STR = "value";
static const char *MODE_UNKNOWN_STR = "unknown";
struct ICARUS_INFO {
+ enum sub_ident ident;
int intinfo;
// time to calculate the golden_ob
@@ -217,16 +218,44 @@ struct ICARUS_INFO {
int work_division;
int fpga_count;
uint32_t nonce_mask;
+
+ uint8_t cmr2_speed;
+ bool speed_next_work;
+ bool flash_next_work;
};
#define ICARUS_MIDSTATE_SIZE 32
-#define ICARUS_UNUSED_SIZE 20
+#define ICARUS_UNUSED_SIZE 16
#define ICARUS_WORK_SIZE 12
#define ICARUS_WORK_DATA_OFFSET 64
+#define ICARUS_CMR2_SPEED_FACTOR 2.5
+#define ICARUS_CMR2_SPEED_MIN_INT 100
+#define ICARUS_CMR2_SPEED_DEF_INT 180
+#define ICARUS_CMR2_SPEED_MAX_INT 220
+#define CMR2_INT_TO_SPEED(_speed) ((uint8_t)((float)_speed / ICARUS_CMR2_SPEED_FACTOR))
+#define ICARUS_CMR2_SPEED_MIN CMR2_INT_TO_SPEED(ICARUS_CMR2_SPEED_MIN_INT)
+#define ICARUS_CMR2_SPEED_DEF CMR2_INT_TO_SPEED(ICARUS_CMR2_SPEED_DEF_INT)
+#define ICARUS_CMR2_SPEED_MAX CMR2_INT_TO_SPEED(ICARUS_CMR2_SPEED_MAX_INT)
+#define ICARUS_CMR2_SPEED_INC 1
+#define ICARUS_CMR2_SPEED_DEC -1
+#define ICARUS_CMR2_SPEED_FAIL -10
+
+#define ICARUS_CMR2_PREFIX ((uint8_t)0xB7)
+#define ICARUS_CMR2_CMD_SPEED ((uint8_t)0)
+#define ICARUS_CMR2_CMD_FLASH ((uint8_t)1)
+#define ICARUS_CMR2_DATA_FLASH_OFF ((uint8_t)0)
+#define ICARUS_CMR2_DATA_FLASH_ON ((uint8_t)1)
+#define ICARUS_CMR2_CHECK ((uint8_t)0x6D)
+
struct ICARUS_WORK {
uint8_t midstate[ICARUS_MIDSTATE_SIZE];
+ // These 4 bytes are for CMR2 bitstreams that handle MHz adjustment
+ uint8_t check;
+ uint8_t data;
+ uint8_t cmd;
+ uint8_t prefix;
uint8_t unused[ICARUS_UNUSED_SIZE];
uint8_t work[ICARUS_WORK_SIZE];
};
@@ -574,8 +603,6 @@ static void set_timing_mode(int this_option_offset, struct cgpu_info *icarus)
break;
case IDENT_CMR2:
info->Hs = CAIRNSMORE2_HASH_TIME;
- if (info->fpga_count == 2)
- info->Hs *= 2;
break;
default:
quit(1, "Icarus get_options() called with invalid %s ident=%d",
@@ -821,7 +848,6 @@ static bool icarus_detect_one(struct libusb_device *dev, struct usb_find_devices
int baud, uninitialised_var(work_division), uninitialised_var(fpga_count);
struct cgpu_info *icarus;
int ret, err, amount, tries, i;
- enum sub_ident ident;
bool ok;
bool cmr2_ok[CAIRNSMORE2_INTS];
int cmr2_count;
@@ -845,8 +871,8 @@ static bool icarus_detect_one(struct libusb_device *dev, struct usb_find_devices
quit(1, "Failed to malloc ICARUS_INFO");
icarus->device_data = (void *)info;
- ident = usb_ident(icarus);
- switch (ident) {
+ info->ident = usb_ident(icarus);
+ switch (info->ident) {
case IDENT_ICA:
case IDENT_BLT:
case IDENT_LLT:
@@ -867,7 +893,7 @@ static bool icarus_detect_one(struct libusb_device *dev, struct usb_find_devices
break;
default:
quit(1, "%s icarus_detect_one() invalid %s ident=%d",
- icarus->drv->dname, icarus->drv->dname, ident);
+ icarus->drv->dname, icarus->drv->dname, info->ident);
}
// For CMR2 test each USB Interface
@@ -894,7 +920,7 @@ cmr2_retry:
if (strncmp(nonce_hex, golden_nonce, 8) == 0)
ok = true;
else {
- if (tries < 0 && ident != IDENT_CMR2) {
+ if (tries < 0 && info->ident != IDENT_CMR2) {
applog(LOG_ERR,
"Icarus Detect: "
"Test failed at %s: get %s, should: %s",
@@ -905,7 +931,7 @@ cmr2_retry:
}
if (!ok) {
- if (ident != IDENT_CMR2)
+ if (info->ident != IDENT_CMR2)
goto unshin;
if (info->intinfo < CAIRNSMORE2_INTS-1) {
@@ -913,7 +939,7 @@ cmr2_retry:
goto cmr2_retry;
}
} else {
- if (ident == IDENT_CMR2) {
+ if (info->ident == IDENT_CMR2) {
applog(LOG_DEBUG,
"Icarus Detect: "
"Test succeeded at %s i%d: got %s",
@@ -928,7 +954,7 @@ cmr2_retry:
}
}
- if (ident == IDENT_CMR2) {
+ if (info->ident == IDENT_CMR2) {
if (cmr2_count == 0) {
applog(LOG_ERR,
"Icarus Detect: Test failed at %s: for all %d CMR2 Interfaces",
@@ -958,13 +984,16 @@ cmr2_retry:
applog(LOG_INFO, "%s%d: Found at %s",
icarus->drv->name, icarus->device_id, icarus->device_path);
- if (ident == IDENT_CMR2) {
+ if (info->ident == IDENT_CMR2) {
applog(LOG_INFO, "%s%d: with %d Interface%s",
icarus->drv->name, icarus->device_id,
cmr2_count, cmr2_count > 1 ? "s" : "");
- if (cmr2_count < 3)
+ // Assume 1 or 2 are running FPGA pairs
+ if (cmr2_count < 3) {
work_division = fpga_count = 2;
+ info->Hs /= 2;
+ }
}
applog(LOG_DEBUG, "%s%d: Init baud=%d work_division=%d fpga_count=%d",
@@ -980,7 +1009,7 @@ cmr2_retry:
set_timing_mode(this_option_offset, icarus);
- if (ident == IDENT_CMR2) {
+ if (info->ident == IDENT_CMR2) {
int i;
for (i = info->intinfo + 1; i < icarus->usbdev->found->intinfo_count; i++) {
struct cgpu_info *cgtmp;
@@ -1048,6 +1077,45 @@ static bool icarus_prepare(__maybe_unused struct thr_info *thr)
return true;
}
+static void cmr2_command(struct cgpu_info *icarus, uint8_t cmd, uint8_t data)
+{
+ struct ICARUS_INFO *info = (struct ICARUS_INFO *)(icarus->device_data);
+ struct ICARUS_WORK workdata;
+ int amount;
+
+ memset((void *)(&workdata), 0, sizeof(workdata));
+
+ workdata.prefix = ICARUS_CMR2_PREFIX;
+ workdata.cmd = cmd;
+ workdata.data = data;
+ workdata.check = workdata.data ^ workdata.cmd ^ workdata.prefix ^ ICARUS_CMR2_CHECK;
+
+ usb_write_ii(icarus, info->intinfo, (char *)(&workdata), sizeof(workdata), &amount, C_SENDWORK);
+}
+
+static void cmr2_commands(struct cgpu_info *icarus)
+{
+ struct ICARUS_INFO *info = (struct ICARUS_INFO *)(icarus->device_data);
+
+ if (info->speed_next_work) {
+ info->speed_next_work = false;
+ cmr2_command(icarus, ICARUS_CMR2_CMD_SPEED, info->cmr2_speed);
+ return;
+ }
+
+ if (info->flash_next_work) {
+ info->flash_next_work = false;
+ cmr2_command(icarus, ICARUS_CMR2_CMD_FLASH, ICARUS_CMR2_DATA_FLASH_ON);
+ cgsleep_ms(250);
+ cmr2_command(icarus, ICARUS_CMR2_CMD_FLASH, ICARUS_CMR2_DATA_FLASH_OFF);
+ cgsleep_ms(250);
+ cmr2_command(icarus, ICARUS_CMR2_CMD_FLASH, ICARUS_CMR2_DATA_FLASH_ON);
+ cgsleep_ms(250);
+ cmr2_command(icarus, ICARUS_CMR2_CMD_FLASH, ICARUS_CMR2_DATA_FLASH_OFF);
+ return;
+ }
+}
+
static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
__maybe_unused int64_t max_nonce)
{
@@ -1086,6 +1154,9 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
rev((void *)(&(workdata.midstate)), ICARUS_MIDSTATE_SIZE);
rev((void *)(&(workdata.work)), ICARUS_WORK_SIZE);
+ if (info->speed_next_work || info->flash_next_work)
+ cmr2_commands(icarus);
+
// We only want results for the work we are about to send
usb_buffer_clear(icarus);
@@ -1306,17 +1377,80 @@ static struct api_data *icarus_api_stats(struct cgpu_info *cgpu)
return root;
}
+static void icarus_statline_before(char *buf, size_t bufsiz, struct cgpu_info *cgpu)
+{
+ struct ICARUS_INFO *info = (struct ICARUS_INFO *)(cgpu->device_data);
+
+ if (info->ident == IDENT_CMR2 && info->cmr2_speed > 0)
+ tailsprintf(buf, bufsiz, "%5.1fMhz", (float)(info->cmr2_speed) * ICARUS_CMR2_SPEED_FACTOR);
+ else
+ tailsprintf(buf, bufsiz, " ");
+
+ tailsprintf(buf, bufsiz, " | ");
+}
+
static void icarus_shutdown(__maybe_unused struct thr_info *thr)
{
// TODO: ?
}
+static void icarus_identify(struct cgpu_info *cgpu)
+{
+ struct ICARUS_INFO *info = (struct ICARUS_INFO *)(cgpu->device_data);
+
+ if (info->ident == IDENT_CMR2)
+ info->flash_next_work = true;
+}
+
+static char *icarus_set(struct cgpu_info *cgpu, char *option, char *setting, char *replybuf)
+{
+ struct ICARUS_INFO *info = (struct ICARUS_INFO *)(cgpu->device_data);
+ int val;
+
+ if (info->ident != IDENT_CMR2) {
+ strcpy(replybuf, "no set options available");
+ return replybuf;
+ }
+
+ if (strcasecmp(option, "help") == 0) {
+ sprintf(replybuf, "clock: range %d-%d",
+ ICARUS_CMR2_SPEED_MIN_INT, ICARUS_CMR2_SPEED_MAX_INT);
+ return replybuf;
+ }
+
+ if (strcasecmp(option, "clock") == 0) {
+ if (!setting || !*setting) {
+ sprintf(replybuf, "missing clock setting");
+ return replybuf;
+ }
+
+ val = atoi(setting);
+ if (val < ICARUS_CMR2_SPEED_MIN_INT || val > ICARUS_CMR2_SPEED_MAX_INT) {
+ sprintf(replybuf, "invalid clock: '%s' valid range %d-%d",
+ setting,
+ ICARUS_CMR2_SPEED_MIN_INT,
+ ICARUS_CMR2_SPEED_MAX_INT);
+ }
+
+ info->cmr2_speed = CMR2_INT_TO_SPEED(val);
+ info->speed_next_work = true;
+
+ return NULL;
+ }
+
+ sprintf(replybuf, "Unknown option: %s", option);
+ return replybuf;
+}
+
struct device_drv icarus_drv = {
.drv_id = DRIVER_icarus,
.dname = "Icarus",
.name = "ICA",
.drv_detect = icarus_detect,
.get_api_stats = icarus_api_stats,
+ .get_statline_before = icarus_statline_before,
+ .set_device = icarus_set,
+ .identify_device = icarus_identify,
.thread_prepare = icarus_prepare,
.scanhash = icarus_scanhash,
.thread_shutdown = icarus_shutdown,