Con Kolivas
274a40115e
Merge branch 'master' into mr
2012-07-05 16:45:05 +10:00
Paul Sheppard
1ee191a726
limit clear buffer iterations.
2012-07-04 23:31:42 -07:00
Paul Sheppard
2aa95ab812
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-07-04 18:48:27 -07:00
Paul Sheppard
54f8554af4
Ad fd check to clear buffer.
2012-07-04 18:46:41 -07:00
Con Kolivas
72777f1f38
Disable nonce range support in BFL when broken support is detected.
2012-07-05 09:34:20 +10:00
Con Kolivas
96183bbdf4
Minor bfl tidy.
2012-07-05 09:21:46 +10:00
Con Kolivas
75eca07823
Restart_wait is only called with a ms value so incorporate that into the function.
2012-07-05 09:15:21 +10:00
Con Kolivas
e5aba76042
Fix off-by-one error in nonce increment in bfl.
2012-07-05 00:40:01 +10:00
Con Kolivas
ba5c1fc07d
Use BE when setting nonce in bitforce nonce range work.
2012-07-05 00:22:42 +10:00
Con Kolivas
d6a6d70f4b
Set work blk nonce after work is queued to prevent duplicates.
2012-07-05 00:18:58 +10:00
Con Kolivas
870ba0c70e
Revert "Loop in bitforce scanhash till end nonce reaches full nonce range."
...
This reverts commit e10aa2092bcb2f1e5b313c5bacb8853b00393126.
2012-07-05 00:17:35 +10:00
Con Kolivas
e10aa2092b
Loop in bitforce scanhash till end nonce reaches full nonce range.
2012-07-05 00:14:04 +10:00
Con Kolivas
1f2e9a49f4
Enable nonce range in the normal init sequence for bfl.
2012-07-05 00:08:33 +10:00
Con Kolivas
8766bca4d4
Queue extra work at 2/3 differently depending on whether we're using nonce range or not.
2012-07-04 23:57:54 +10:00
Con Kolivas
6314a12b31
Initially enable support for nonce range support on bfl, splitting nonces up into 3/4 size and only disable it if it fails on work submit.
2012-07-04 23:53:55 +10:00
Con Kolivas
96fba30b6b
Attempt to detect nonce range support in BFL by sending work requring its support.
2012-07-04 17:31:02 +10:00
Con Kolivas
a9746b9f5e
Limit retrying on busy for up to BITFORCE_TIMEOUT_MS
2012-07-04 16:58:08 +10:00
Con Kolivas
7046c976bc
Attempt to initialise while bitforce device returns BUSY.
2012-07-04 16:51:55 +10:00
Con Kolivas
ac8db06e46
Extend length of string that can be passed to BFL devices.
2012-07-04 16:41:28 +10:00
Con Kolivas
8b3c20bc06
Abstract out ms to timeval as a function.
2012-07-04 16:28:51 +10:00
Con Kolivas
93a7967ecb
Fix signedness warning.
2012-07-04 15:22:05 +10:00
Paul Sheppard
c4870676c4
Add api stats (sleep time)
2012-07-03 10:40:02 -07:00
Paul Sheppard
6e6029de99
Timing tweaks
...
Added long and short timeouts, short for detecting throttling, long to give up totally.
Reset sleep time when device re-initialised
Still check results after timeout
Back up a larger time if result on first poll.
2012-07-03 10:22:11 -07:00
Kano
ff0afb94ec
Add API Notify counter 'Comms Error'
2012-07-03 13:14:30 +10:00
Con Kolivas
44726324c2
More style police on bitforce.
2012-07-03 11:09:33 +10:00
Con Kolivas
8783db0dc3
Do all logging outside of the bitforce mutex locking to avoid deadlocks.
2012-07-03 11:01:57 +10:00
Con Kolivas
0f405c7c18
Remove applog call from bfwrite to prevent grabbing nested mutexes.
2012-07-03 10:59:37 +10:00
Con Kolivas
978ec0d805
Bitforce style changes.
2012-07-03 10:58:30 +10:00
Paul Sheppard
ad5b470b04
Fine-tune timing adjustment.
...
Also remove old work_restart timing.
2012-07-02 14:27:19 -07:00
Paul Sheppard
ce850883e7
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-07-01 23:39:09 -07:00
Paul Sheppard
cc0ad5eaa7
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-07-01 23:35:06 -07:00
ckolivas
391e1f7eb1
Restart is zeroed in the mining thread so no need to do it inside the bitforce code.
2012-07-02 16:13:53 +10:00
Paul Sheppard
04a6c3b188
More improvements to comms.
...
BFL return nothing when throttling, so should not be considered an error. Instead repeat with a longer delay.
2012-07-01 21:47:18 -07:00
ckolivas
efcce5bbb8
Remove unused tdiff value.
2012-07-02 11:30:20 +10:00
ckolivas
b1cdacdead
Polling every 10ms there's not much point checking the pthread_cond_timedwait as it just adds overhead. Simply check the value of work_restart in the bfl main polling loop.
2012-07-02 11:28:26 +10:00
ckolivas
fd7b21ed56
Use a pthread conditional that is broadcast whenever work restarts are required. Create a generic wait function waiting a specified time on that conditional that returns if the condition is met or a specified time passed to it has elapsed. Use this to do smarter polling in bitforce to abort work, queue more work, and check for results to minimise time spent working needlessly.
2012-07-02 10:54:20 +10:00
Paul Sheppard
855d1bb3e3
Add busy time to wait time.
2012-07-01 17:35:53 -07:00
Paul Sheppard
a11a322ba6
Add tiny delay after writing to BFL
...
Change BFL errors to something more human readable
Send work busy re-tries after 10ms delay
2012-06-30 20:45:08 -07:00
Paul Sheppard
adc26f0e3f
Add facility to clear BFL read buffer.
...
Reduce timeout to 10s.
2012-06-29 17:20:57 -07:00
Paul Sheppard
75a651c13f
Revert "Check for submit_stale before checking for work_restart"
...
Makes no sense to continue working on the old block whether submit_stale is enabled or not.
2012-06-28 16:08:10 -07:00
Paul Sheppard
f225392990
Add low hash threshold in sick/dead processing
...
Add check for fd in comms procedures
2012-06-28 08:20:45 -07:00
Paul Sheppard
01a7e912c8
Lock comms around entire bitforce_init, and move setting of fd to end.
...
Make sleep occur everytime in scanhash.
2012-06-27 08:25:25 -07:00
Paul Sheppard
d3e2b62c54
Change sick/dead processing to use device pointer, not gpu array.
...
Change BFL timing to adjust only when hashing complete (not error/idle etc.).
2012-06-26 14:45:48 -07:00
Paul Sheppard
1ef52e0bac
Check for submit_stale before checking for work_restart
...
(to keep Kano happy)
2012-06-25 19:23:10 -07:00
Paul Sheppard
f149aea91e
Redo recover removal.
...
FML.
2012-06-25 10:33:18 -07:00
Paul Sheppard
90d82aa61d
Revert to pre pool merge
2012-06-25 10:27:08 -07:00
Paul Sheppard
50e996c753
Get rid of recover mode. Not useful at all.
...
Change zero hash to no start error. Neither is accurate, but zero hash makes less sense than no start.
2012-06-25 10:01:34 -07:00
Paul Sheppard
e037028159
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-06-19 10:40:00 -07:00
Paul Sheppard
9bc95ab30b
Comms error trapping
...
Comms error will not disable the device permanently but put it in to
recovery mode. Here it will attempt to be re-initialised after 60s.
2012-06-19 10:36:24 -07:00
Paul Sheppard
68f2aaf930
fix bitforce_init return value
...
Also add filename as kernel name
2012-06-15 16:43:05 -07:00