Merge branch 'master' into hashfast
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 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438
diff --git a/ASIC-README b/ASIC-README
index 55b76d8..a56666c 100644
--- a/ASIC-README
+++ b/ASIC-README
@@ -102,11 +102,13 @@ ASIC SPECIFIC COMMANDS
--avalon-options <arg> Set avalon options baud:miners:asic:timeout:freq
--avalon-temp <arg> Set avalon target temperature (default: 50)
--bflsc-overheat <arg> Set overheat temperature where BFLSC devices throttle, 0 to disable (default: 90)
---bitburner-voltage <arg> Set BitBurner core voltage, in millivolts
+--bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq
+--bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts
+--bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
--klondike-options <arg> Set klondike options clock:temp1:temp2:fan
-AVALON DEVICES
+AVALON AND BITBURNER DEVICES
Currently all known Avalon devices come with their own operating system and
a preinstalled version of cgminer as part of the flash firmware, based on the
@@ -118,6 +120,9 @@ command, and adjust its fan control-temperature relationship with avalon-temp.
By default the avalon will also cut off when its temperature reaches 60
degrees.
+All current BitBurner devices (BitBurner X, BitBurner XX and BitBurner Fury)
+emulate Avalon devices, whether or not they use Avalon chips.
+
Avalon commands:
--avalon-auto Adjust avalon overclock frequency dynamically for best hashrate
@@ -126,7 +131,9 @@ Avalon commands:
--avalon-freq <arg> Set frequency range for avalon-auto, single value or range
--avalon-options <arg> Set avalon options baud:miners:asic:timeout:freq
--avalon-temp <arg> Set avalon target temperature (default: 50)
---bitburner-voltage <arg> Set BitBurner core voltage, in millivolts
+--bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq
+--bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts
+--bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
Avalon auto will enable dynamic overclocking gradually increasing and
@@ -177,8 +184,15 @@ Miners:
Most Avalons are 3 module devices, which come to 24 miners. 4 module devices
would use 32 here.
+For BitBurner X and BitBurner XX devices you should use twice the number of
+boards in the stack. e.g. for a two-board stack you would use 4. For
+BitBurner Fury devices you should use the total number of BitFury chips in the
+stack (i.e. 16 times the number of boards). e.g. for a two-board stack you
+would use 32.
+
Asic count:
-Virtually all have 10, so don't change this.
+Virtually all have 10, so don't change this. BitBurner devices use 10 here
+even if the boards have some other number of ASICs.
Timeout:
This is how long the device will work on a work item before accepting new work
@@ -198,16 +212,61 @@ Sample settings for valid different frequencies (last 2 values):
50:256
Frequency:
-This is the clock speed of the devices. Only specific values work, 256, 270,
-282 (default), 300, 325, 350 and 375.
+This is the clock speed of the devices. For Avalon devices, only specific
+values work, 256, 270, 282 (default), 300, 325, 350 and 375. For BitBurner
+devices, other values can be used.
Note that setting a value with an asterisk next to it will be using your
avalon outside its spec and you do so at your own risk.
+The default frequency for BitBurner X and BitBurner XX boards is 282. The
+default frequency for BitBurner Fury boards is 256. Overclocking is
+possible - please consult the product documentation and/or manufacturer for
+information on safe values. Values outside this range are used at your own
+risk. Underclocking is also possible, at least with the X and XX boards.
+
+eg:
+--bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq
+
+This option takes the same format as --avalon-options. When specified, it
+will be used for BitBurner Fury boards in preference to the values specified
+in --avalon-options. (If not specified, BitBurner Fury boards will be
+controlled by the values used in --avalon options.) See --avalon-options for
+a detailed description of the fields.
+
+This option is particularly useful when using a mixture of different BitBurner
+devices as BitBurner Fury devices generally require significantly different
+clock frequencies from Avalon-based devices. This option is only available
+for boards with recent firmware that are recognized by cgminer as BBF.
+
eg:
---bitburner-voltage <arg> Set BitBurner core voltage, in millivolts
+--bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts
+
+Sets the core voltage for the BitBurner Fury boards. The default value is
+900. Overvolting is possible - please consult the product documentation
+and/or manufaturer about the safe range of values. Values outside this range
+are used at your own risk.
+
+This option is only available for boards with recent firmware that are
+recognized by cgminer as BBF. For boards recognized as BTB, see
+--bitburner-voltage
+
+eg:
+--bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
+
+Sets the core voltage for the Avalon-based BitBurner X and BitBurner XX
+boards. The default value is 1200. Overvolting and undervolting is
+possible - please consult the product documentation and/or the manufacturer
+for information about the safe range. Values outside this range are used at
+your own risk.
+
+Older BitBurner Fury firmware emulates a BitBurner XX board and is identified
+by cgminer as BTB. On these devices, --bitburner-voltage is used to control
+the voltage of the BitBurner Fury board. The actual core voltage will be
+300mV less than the requested voltage, so to run a BitBurner Fury board at
+950mV use --bitburner-voltage 1250. The default value of 1200 therefore
+corresponds to the default core voltage of 900mV.
-Self evident.
If you use the full curses based interface with Avalons you will get this
information:
diff --git a/NEWS b/NEWS
index f4d8f5b..42af7c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,69 @@
+Version 3.6.5 - 26th October 2013
+
+- klondike - fix uninitialised dev bug
+- Adjust the binary ntime data in submit_noffset_nonce even when there is no hex
+ntime string for eg. gbt.
+- Put an entry into the work struct telling drivers how much they can roll the
+ntime themselves.
+- Only set libusb cancellable status if the transfer succeeds.
+- Remove the applog on miner threads dying to prevent deadlocks on exit.
+- Do one extra guaranteed libusb event handling before testing if there are any
+pending async usb transfers.
+- Use a linked list for all usb transfers instead of just cancellable ones.
+- Provide a mechanism for informing drivers of updated work templates for
+stratum and gbt mining.
+- Add cancellable transfers correctly to the ct_list
+- Check for presence of thr in icarus get nonce for startup nonce testing to
+work.
+- Use cancellable usb transfers in the icarus driver to avoid having to loop and
+poll when waiting for a response and to speed up work restart response time.
+- Add a usb_read_ii_timeout_cancellable wrapper
+- Add usb transfer cancellation on shutdown and documentation regarding where
+cancellable transfers are suitable.
+- Use cancellable transfers on bitfury device.
+- Cancel cancellable usb transfers on work restart messages.
+- Don't bother having a separate cancellable transfer struct for usb transfers,
+simply include the list in the usb_transfer struct.
+- Add wrappers for usb_read_cancellable and usb_read_timeout_cancellable
+- Specifically set the cancellable state for it to not be uninitialised in the
+usb transfer struct.
+- Alter the usb cancellable list only under cgusb_fd_lock write lock.
+- Pass the cancellable option to _usb_read options to decide on whether to add
+usb transfers to the list of cancellable transfers.
+- Create a linked list of potentially cancellable usb transfers.
+- Don't attempt to disable curses or print a summary during an app restart to
+prevent deadlocks.
+- Keep the libusb event handle polling thread active until there are no async
+usb transfers in progress.
+- Keep a global counter of how many async usb transfers are in place.
+- Perform libusb_submit_transfer under the write variant of cgusb_fd_lock
+- klondike - error condition handling
+- Avoid entering static libusb directory if --with-system-libusb is enabled.
+- Minor opencl build corrections.
+- Enable dynamic linking against system libusb --with-system-libusb
+- Modify Makefile to only include opencl related code when configured in.
+- Convert opencl to need to be explicitly enabled during build with
+--enable-opencl
+- Implement a cglock_destroy function.
+- Implement a rwlock_destroy function.
+- Implement a mutex_destroy function.
+- Add usb command name to critical libusb error reporting.
+- Use windows' own higher resolution time and handlers allowing us to have
+higher precision absolute timeouts.
+- Fix lldiv error in windows cgminer_t calculation.
+- miner.php correct sort gen field names largest to smallest
+- api ... the code related to device elapsed
+- api add device elapsed since hotplug devices Elapsed is less than cgminer
+Elapsed
+- Drop usb buffering message to debug logging level.
+- Do the ntime binary modification to the work struct when submitting an ntime
+offset nonce within submit_noffset_nonce
+- Code cleanup and improved documentation
+- Improvements to support for BitBurner boards
+- Convert libusb transfer errors to regular libusb error messages to allow for
+accurate message reporting.
+
+
Version 3.6.4 - 18th October 2013
- Fixing the memory leak for remaining semaphores means we can go back to using
diff --git a/README b/README
index 5c73991..0a96dee 100644
--- a/README
+++ b/README
@@ -106,17 +106,21 @@ If building from git:
CGMiner specific configuration options:
- --disable-opencl Override detection and disable building with opencl
- --disable-adl Override detection and disable building with adl
- --enable-bflsc Compile support for BFL ASICs (default disabled)
- --enable-bitforce Compile support for BitForce FPGAs(default disabled)
- --enable-icarus Compile support for Icarus bitstream FPGAs(default disabled)
- --enable-modminer Compile support for ModMiner FPGAs(default disabled)
- --enable-ztex Compile support for Ztex Board(default disabled)
- --enable-avalon Compile support for Avalon (default disabled)
- --enable-klondike Compile support for Klondike (default disabled)
- --enable-scrypt Compile support for scrypt litecoin mining (default disabled)
- --without-curses Compile support for curses TUI (default enabled)
+ --enable-opencl Enable support for GPU mining with opencl
+ --disable-adl Override detection and disable building with adl
+ --enable-scrypt Compile support for scrypt litecoin mining (default
+ disabled)
+ --enable-bflsc Compile support for BFL ASICs (default disabled)
+ --enable-bitforce Compile support for BitForce FPGAs (default
+ disabled)
+ --enable-bitfury Compile support for BitFury ASICs (default disabled)
+ --enable-icarus Compile support for Icarus (default disabled)
+ --enable-avalon Compile support for Avalon (default disabled)
+ --enable-klondike Compile support for Klondike (default disabled)
+ --enable-modminer Compile support for ModMiner FPGAs(default disabled)
+ --without-curses Compile support for curses TUI (default enabled)
+ --with-system-libusb Compile against dynamic system libusb (default use
+ included static libusb)
Basic *nix build instructions:
To actually build:
@@ -220,7 +224,9 @@ ASIC only options:
--avalon-options <arg> Set avalon options baud:miners:asic:timeout:freq
--avalon-temp <arg> Set avalon target temperature (default: 50)
--bflsc-overheat <arg> Set overheat temperature where BFLSC devices throttle, 0 to disable (default: 90)
---bitburner-voltage <arg> Set BitBurner core voltage, in millivolts
+--bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq
+--bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts
+--bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
See ASIC-README for more information regarding these.
diff --git a/cgminer.c b/cgminer.c
index b05e0e0..cfcf514 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -171,6 +171,7 @@ char *opt_icarus_timing = NULL;
bool opt_worktime;
#ifdef USE_AVALON
char *opt_avalon_options = NULL;
+char *opt_bitburner_fury_options = NULL;
#endif
#ifdef USE_KLONDIKE
char *opt_klondike_options = NULL;
@@ -1040,6 +1041,13 @@ static char *set_avalon_options(const char *arg)
return NULL;
}
+
+static char *set_bitburner_fury_options(const char *arg)
+{
+ opt_set_charp(arg, &opt_bitburner_fury_options);
+
+ return NULL;
+}
#endif
#ifdef USE_KLONDIKE
@@ -1259,6 +1267,9 @@ static struct opt_table opt_config_table[] = {
OPT_WITH_ARG("--bitburner-fury-voltage",
opt_set_intval, NULL, &opt_bitburner_fury_core_voltage,
"Set BitBurner Fury core voltage, in millivolts"),
+ OPT_WITH_ARG("--bitburner-fury-options",
+ set_bitburner_fury_options, NULL, NULL,
+ "Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq"),
#endif
#ifdef USE_KLONDIKE
OPT_WITH_ARG("--klondike-options",
diff --git a/configure.ac b/configure.ac
index e0bc70a..67016e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [3])
m4_define([v_min], [6])
-m4_define([v_mic], [4])
+m4_define([v_mic], [5])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_ver], [v_maj.v_min.v_mic])
m4_define([lt_rev], m4_eval(v_maj + v_min))
diff --git a/driver-avalon.c b/driver-avalon.c
index 09e6dfa..75cd06e 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -53,6 +53,7 @@ int opt_bitburner_fury_core_voltage = BITBURNER_FURY_DEFAULT_CORE_VOLTAGE;
bool opt_avalon_auto;
static int option_offset = -1;
+static int bbf_option_offset = -1;
static int avalon_init_task(struct avalon_task *at,
uint8_t reset, uint8_t ff, uint8_t fan,
@@ -400,7 +401,7 @@ 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)
+ int *asic_count, int *timeout, int *frequency, char *options)
{
char buf[BUFSIZ+1];
char *ptr, *comma, *colon, *colon2, *colon3, *colon4;
@@ -408,10 +409,10 @@ static bool get_options(int this_option_offset, int *baud, int *miner_count,
size_t max;
int i, tmp;
- if (opt_avalon_options == NULL)
+ if (options == NULL)
buf[0] = '\0';
else {
- ptr = opt_avalon_options;
+ ptr = options;
for (i = 0; i < this_option_offset; i++) {
comma = strchr(ptr, ',');
if (comma == NULL)
@@ -754,7 +755,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 this_option_offset = ++option_offset;
+ int this_option_offset;
struct avalon_info *info;
struct cgpu_info *avalon;
bool configured;
@@ -768,12 +769,14 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
timeout = AVALON_DEFAULT_TIMEOUT;
frequency = AVALON_DEFAULT_FREQUENCY;
- configured = get_options(this_option_offset, &baud, &miner_count,
- &asic_count, &timeout, &frequency);
-
if (!usb_init(avalon, dev, found))
goto shin;
+ 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,
+ (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
* all ourselves so set it to std usb type */
avalon->usbdev->usb_type = USB_TYPE_STD;
@@ -796,10 +799,18 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
info->frequency = frequency;
} else {
info->baud = AVALON_IO_SPEED;
- info->miner_count = AVALON_DEFAULT_MINER_NUM;
info->asic_count = AVALON_DEFAULT_ASIC_NUM;
- info->timeout = AVALON_DEFAULT_TIMEOUT;
- info->frequency = AVALON_DEFAULT_FREQUENCY;
+ switch (usb_ident(avalon)) {
+ case IDENT_BBF:
+ info->miner_count = BITBURNER_FURY_DEFAULT_MINER_NUM;
+ info->timeout = BITBURNER_FURY_DEFAULT_TIMEOUT;
+ info->frequency = BITBURNER_FURY_DEFAULT_FREQUENCY;
+ break;
+ default:
+ info->miner_count = AVALON_DEFAULT_MINER_NUM;
+ info->timeout = AVALON_DEFAULT_TIMEOUT;
+ info->frequency = AVALON_DEFAULT_FREQUENCY;
+ }
}
info->fan_pwm = AVALON_DEFAULT_FAN_MIN_PWM;
diff --git a/driver-avalon.h b/driver-avalon.h
index e506388..063fb68 100644
--- a/driver-avalon.h
+++ b/driver-avalon.h
@@ -55,6 +55,12 @@
#define AVALON_MAX_MINER_NUM 0x100
#define AVALON_DEFAULT_ASIC_NUM 0xA
+/* Default number of miners for Bitburner Fury is for a stack of 8 boards,
+ but it will work acceptably for smaller stacks, too */
+#define BITBURNER_FURY_DEFAULT_MINER_NUM 128
+#define BITBURNER_FURY_DEFAULT_FREQUENCY 256
+#define BITBURNER_FURY_DEFAULT_TIMEOUT 50
+
#define AVALON_AUTO_CYCLE 1024
#define AVALON_FTDI_READSIZE 510
diff --git a/driver-klondike.c b/driver-klondike.c
index 19965a4..dcdd671 100644
--- a/driver-klondike.c
+++ b/driver-klondike.c
@@ -968,10 +968,9 @@ static void *klondike_get_replies(void *userdata)
// We can't check this until it's initialised
if (klninfo->initialised) {
- wr_lock(&(klninfo->stat_lock));
+ rd_lock(&(klninfo->stat_lock));
slaves = klninfo->status[0].kline.ws.slavecount;
- klninfo->jobque[dev].late_update_sequential = 0;
- wr_unlock(&(klninfo->stat_lock));
+ rd_unlock(&(klninfo->stat_lock));
if (kitem->kline.hd.dev > slaves) {
applog(LOG_ERR, "%s%i: reply [%c] has invalid dev=%d (max=%d) using 0",
@@ -979,7 +978,13 @@ static void *klondike_get_replies(void *userdata)
(char)(kitem->kline.hd.cmd),
(int)(kitem->kline.hd.dev),
slaves);
+ /* TODO: this is rather problematic if there are slaves
+ * however without slaves - it should always be zero */
kitem->kline.hd.dev = 0;
+ } else {
+ wr_lock(&(klninfo->stat_lock));
+ klninfo->jobque[kitem->kline.hd.dev].late_update_sequential = 0;
+ wr_unlock(&(klninfo->stat_lock));
}
}
diff --git a/miner.h b/miner.h
index 09b5b81..fcc5aac 100644
--- a/miner.h
+++ b/miner.h
@@ -1023,6 +1023,7 @@ extern char *opt_icarus_timing;
extern bool opt_worktime;
#ifdef USE_AVALON
extern char *opt_avalon_options;
+extern char *opt_bitburner_fury_options;
#endif
#ifdef USE_KLONDIKE
extern char *opt_klondike_options;