GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/ckolivas/cgminer.git 

Conflicts:
	cgminer.c
nfactor-troky
Paul Sheppard 13 years ago
parent
1b63a75d2c 67611949dc
commit
eff2d04df0
4 changed files with 67 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      README
  2. 9
      cgminer.c
  3. 91
      driver-modminer.c
  4. 2
      miner.h

5
README
Unescape View File

@ -55,6 +55,7 @@ CGMiner specific configuration options:
--disable-adl Override detection and disable building with adl --disable-adl Override detection and disable building with adl
--enable-bitforce Compile support for BitForce FPGAs(default disabled) --enable-bitforce Compile support for BitForce FPGAs(default disabled)
--enable-icarus Compile support for Icarus Board(default disabled) --enable-icarus Compile support for Icarus Board(default disabled)
--enable-modminer Compile support for ModMiner FPGAs(default disabled)
--enable-ztex Compile support for Ztex Board(default disabled) --enable-ztex Compile support for Ztex Board(default disabled)
Basic *nix build instructions: Basic *nix build instructions:
@ -194,7 +195,7 @@ GPU only options:
--worksize|-w <arg> Override detected optimal worksize - one value or comma separated list --worksize|-w <arg> Override detected optimal worksize - one value or comma separated list
FPGA mining boards(BitForce, Icarus, Ztex) only options: FPGA mining boards(BitForce, Icarus, ModMiner, Ztex) only options:
--scan-serial|-S <arg> Serial port to probe for FPGA mining device --scan-serial|-S <arg> Serial port to probe for FPGA mining device
@ -797,7 +798,7 @@ working in the logs?
A: http://us.php.net/manual/en/sockets.installation.php A: http://us.php.net/manual/en/sockets.installation.php
Q: What is a PGA? Q: What is a PGA?
A: At the moment, cgminer supports 3 FPGA's: Icarus, Ztex and BitForce. A: At the moment, cgminer supports 4 FPGAs: BitForce, Icarus, ModMiner, and Ztex.
They are Field-Programmable Gate Arrays that have been programmed to do Bitcoin They are Field-Programmable Gate Arrays that have been programmed to do Bitcoin
mining. Since the acronym needs to be only 3 characters, the "Field-" part has mining. Since the acronym needs to be only 3 characters, the "Field-" part has
been skipped. been skipped.

9
cgminer.c
Unescape View File

@ -4318,7 +4318,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
for (i = 0; i < total_devices; ++i) { for (i = 0; i < total_devices; ++i) {
struct cgpu_info *cgpu = devices[i]; struct cgpu_info *cgpu = devices[i];
struct thr_info *thr = cgpu->thread; struct thr_info *thr = cgpu->thr[0];
enum dev_enable *denable; enum dev_enable *denable;
int gpu; int gpu;
@ -5207,6 +5207,8 @@ begin_bench:
k = 0; k = 0;
for (i = 0; i < total_devices; ++i) { for (i = 0; i < total_devices; ++i) {
struct cgpu_info *cgpu = devices[i]; struct cgpu_info *cgpu = devices[i];
cgpu->thr = malloc(sizeof(*cgpu->thr) * (cgpu->threads+1));
cgpu->thr[cgpu->threads] = NULL;
for (j = 0; j < cgpu->threads; ++j, ++k) { for (j = 0; j < cgpu->threads; ++j, ++k) {
thr = &thr_info[k]; thr = &thr_info[k];
@ -5234,10 +5236,7 @@ begin_bench:
if (unlikely(thr_info_create(thr, NULL, miner_thread, thr))) if (unlikely(thr_info_create(thr, NULL, miner_thread, thr)))
quit(1, "thread %d create failed", thr->id); quit(1, "thread %d create failed", thr->id);
cgpu->thread = thr; cgpu->thr[j] = thr;
/* delay each start by 100ms */
usleep(100000);
} }
} }

91
driver-modminer.c
Unescape View File

@ -51,7 +51,7 @@ modminer_detect_one(const char *devpath)
size_t len; size_t len;
// Sending 45 noops, just in case the device was left in "start job" reading // Sending 45 noops, just in case the device was left in "start job" reading
write(fd, "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff", 45) ?:0; (void)(write(fd, "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff", 45) ?:0);
while (serial_read(fd, buf, sizeof(buf)) > 0) while (serial_read(fd, buf, sizeof(buf)) > 0)
; ;
@ -106,17 +106,6 @@ modminer_detect()
serial_detect_auto("modminer", modminer_detect_one, modminer_detect_auto); serial_detect_auto("modminer", modminer_detect_one, modminer_detect_auto);
} }
static void
get_modminer_statline_before(char *buf, struct cgpu_info *modminer)
{
float gt = modminer->temp;
if (gt > 0)
tailsprintf(buf, "%5.1fC ", gt);
else
tailsprintf(buf, " ", gt);
tailsprintf(buf, " | ");
}
#define bailout(...) return _bailout(-1, modminer, __VA_ARGS__); #define bailout(...) return _bailout(-1, modminer, __VA_ARGS__);
#define bailout2(...) return _bailout(fd, modminer, __VA_ARGS__); #define bailout2(...) return _bailout(fd, modminer, __VA_ARGS__);
@ -142,9 +131,9 @@ get_modminer_statline_before(char *buf, struct cgpu_info *modminer)
FD_SET(fd, &fds); \ FD_SET(fd, &fds); \
select(fd+1, &fds, NULL, NULL, NULL); \ select(fd+1, &fds, NULL, NULL, NULL); \
if (1 != read(fd, buf, 1)) \ if (1 != read(fd, buf, 1)) \
bailout2(LOG_ERR, "Error programming ModMiner %s (" eng ")", modminer->device_path); \ bailout2(LOG_ERR, "%s %u: Error programming %s (" eng ")", modminer->api->name, modminer->device_id, modminer->device_path); \
if (buf[0] != 1) \ if (buf[0] != 1) \
bailout2(LOG_ERR, "Wrong " eng " programming ModMiner %s", modminer->device_path); \ bailout2(LOG_ERR, "%s %u: Wrong " eng " programming %s", modminer->api->name, modminer->device_id, modminer->device_path); \
} while(0) } while(0)
static bool static bool
@ -198,7 +187,7 @@ fd_set fds;
int fd = modminer->device_fd; int fd = modminer->device_fd;
applog(LOG_WARNING, "Programming %s... DO NOT EXIT CGMINER UNTIL COMPLETE", modminer->device_path, fpgaid); applog(LOG_WARNING, "%s %u: Programming %s... DO NOT EXIT CGMINER UNTIL COMPLETE", modminer->api->name, modminer->device_id, modminer->device_path);
buf[0] = '\x05'; // Program Bitstream buf[0] = '\x05'; // Program Bitstream
buf[1] = fpgaid; buf[1] = fpgaid;
buf[2] = (len >> 0) & 0xff; buf[2] = (len >> 0) & 0xff;
@ -206,20 +195,20 @@ fd_set fds;
buf[4] = (len >> 16) & 0xff; buf[4] = (len >> 16) & 0xff;
buf[5] = (len >> 24) & 0xff; buf[5] = (len >> 24) & 0xff;
if (6 != write(fd, buf, 6)) if (6 != write(fd, buf, 6))
bailout2(LOG_ERR, "Error programming ModMiner %s (cmd)", modminer->device_path); bailout2(LOG_ERR, "%s %u: Error programming %s (cmd)", modminer->api->name, modminer->device_id, modminer->device_path);
status_read("cmd reply"); status_read("cmd reply");
size_t buflen; size_t buflen;
while (len) { while (len) {
buflen = len < 32 ? len : 32; buflen = len < 32 ? len : 32;
if (fread(buf, buflen, 1, f) != 1) if (fread(buf, buflen, 1, f) != 1)
bailout2(LOG_ERR, "File underrun programming ModMiner %s (%d bytes left)", modminer->device_path, len); bailout2(LOG_ERR, "%s %u: File underrun programming %s (%d bytes left)", modminer->api->name, modminer->device_id, modminer->device_path, len);
if (write(fd, buf, buflen) != buflen) if (write(fd, buf, buflen) != buflen)
bailout2(LOG_ERR, "Error programming ModMiner %s (data)"); bailout2(LOG_ERR, "%s %u: Error programming %s (data)", modminer->api->name, modminer->device_id, modminer->device_path);
status_read("status"); status_read("status");
len -= buflen; len -= buflen;
} }
status_read("final status"); status_read("final status");
applog(LOG_WARNING, "Done programming %s", modminer->device_path); applog(LOG_WARNING, "%s %u: Done programming %s", modminer->api->name, modminer->device_id, modminer->device_path);
return true; return true;
} }
@ -229,10 +218,10 @@ modminer_device_prepare(struct cgpu_info *modminer)
{ {
int fd = serial_open(modminer->device_path, 0, /*FIXME=-1*/3000, true); int fd = serial_open(modminer->device_path, 0, /*FIXME=-1*/3000, true);
if (unlikely(-1 == fd)) if (unlikely(-1 == fd))
bailout(LOG_ERR, "Failed to open ModMiner on %s", modminer->device_path); bailout(LOG_ERR, "%s %u: Failed to open %s", modminer->api->name, modminer->device_id, modminer->device_path);
modminer->device_fd = fd; modminer->device_fd = fd;
applog(LOG_INFO, "Opened ModMiner on %s", modminer->device_path); applog(LOG_INFO, "%s %u: Opened %s", modminer->api->name, modminer->device_id, modminer->device_path);
struct timeval now; struct timeval now;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
@ -255,6 +244,8 @@ struct modminer_fpga_state {
int no_nonce_counter; int no_nonce_counter;
int good_share_counter; int good_share_counter;
time_t last_cutoff_reduced; time_t last_cutoff_reduced;
unsigned char temp;
}; };
static bool static bool
@ -294,13 +285,13 @@ modminer_reduce_clock(struct thr_info*thr, bool needlock)
if (needlock) if (needlock)
mutex_lock(&modminer->device_mutex); mutex_lock(&modminer->device_mutex);
if (6 != write(fd, cmd, 6)) if (6 != write(fd, cmd, 6))
bailout2(LOG_ERR, "Error writing to ModMiner (set clock speed)"); bailout2(LOG_ERR, "%s %u.%u: Error writing (set clock speed)", modminer->api->name, modminer->device_id, fpgaid);
if (serial_read(fd, &buf, 1) != 1) if (serial_read(fd, &buf, 1) != 1)
bailout2(LOG_ERR, "Error reading from ModMiner (set clock speed)"); bailout2(LOG_ERR, "%s %u.%u: Error reading (set clock speed)", modminer->api->name, modminer->device_id, fpgaid);
if (needlock) if (needlock)
mutex_unlock(&modminer->device_mutex); mutex_unlock(&modminer->device_mutex);
applog(LOG_WARNING, "ModMiner: Setting clock speed of %s %d (FPGA #%u) to %u", modminer->api->name, modminer->device_id, fpgaid, state->clock); applog(LOG_WARNING, "%s %u.%u: Setting clock speed to %u", modminer->api->name, modminer->device_id, fpgaid, state->clock);
return true; return true;
} }
@ -326,17 +317,17 @@ modminer_fpga_init(struct thr_info *thr)
cmd[0] = '\x04'; // Read USER code (bitstream id) cmd[0] = '\x04'; // Read USER code (bitstream id)
cmd[1] = fpgaid; cmd[1] = fpgaid;
if (write(fd, cmd, 2) != 2) if (write(fd, cmd, 2) != 2)
bailout2(LOG_ERR, "Error writing to ModMiner (read USER code)"); bailout2(LOG_ERR, "%s %u.%u: Error writing (read USER code)", modminer->api->name, modminer->device_id, fpgaid);
if (serial_read(fd, buf, 4) != 4) if (serial_read(fd, buf, 4) != 4)
bailout2(LOG_ERR, "Error reading from ModMiner (read USER code)"); bailout2(LOG_ERR, "%s %u.%u: Error reading (read USER code)", modminer->api->name, modminer->device_id, fpgaid);
if (memcmp(buf, BISTREAM_USER_ID, 4)) { if (memcmp(buf, BISTREAM_USER_ID, 4)) {
applog(LOG_ERR, "FPGA #%d not programmed", fpgaid); applog(LOG_ERR, "%s %u.%u: FPGA not programmed", modminer->api->name, modminer->device_id, fpgaid);
if (!modminer_fpga_upload_bitstream(modminer)) if (!modminer_fpga_upload_bitstream(modminer))
return false; return false;
} }
else else
applog(LOG_DEBUG, "FPGA #%d is already programmed :)", fpgaid); applog(LOG_DEBUG, "%s %u.%u: FPGA is already programmed :)", modminer->api->name, modminer->device_id, fpgaid);
state->clock = 212; // Will be reduced to 210 by modminer_reduce_clock state->clock = 212; // Will be reduced to 210 by modminer_reduce_clock
modminer_reduce_clock(thr, false); modminer_reduce_clock(thr, false);
@ -346,6 +337,39 @@ modminer_fpga_init(struct thr_info *thr)
return true; return true;
} }
static void
get_modminer_statline_before(char *buf, struct cgpu_info *modminer)
{
char info[18] = " | ";
int tc = modminer->threads;
bool havetemp = false;
int i;
if (tc > 4)
tc = 4;
for (i = tc - 1; i >= 0; --i) {
struct thr_info*thr = modminer->thr[i];
struct modminer_fpga_state *state = thr->cgpu_data;
unsigned char temp = state->temp;
info[i*3+2] = '/';
if (temp) {
havetemp = true;
if (temp > 9)
info[i*3+0] = 0x30 + (temp / 10);
info[i*3+1] = 0x30 + (temp % 10);
}
}
if (havetemp) {
info[tc*3-1] = ' ';
info[tc*3] = 'C';
strcat(buf, info);
}
else
strcat(buf, " | ");
}
static bool static bool
modminer_prepare_next_work(struct modminer_fpga_state*state, struct work*work) modminer_prepare_next_work(struct modminer_fpga_state*state, struct work*work)
{ {
@ -364,13 +388,14 @@ modminer_start_work(struct thr_info*thr)
fd_set fds; fd_set fds;
struct cgpu_info*modminer = thr->cgpu; struct cgpu_info*modminer = thr->cgpu;
struct modminer_fpga_state *state = thr->cgpu_data; struct modminer_fpga_state *state = thr->cgpu_data;
char fpgaid = thr->device_thread;
int fd = modminer->device_fd; int fd = modminer->device_fd;
char buf[1]; char buf[1];
mutex_lock(&modminer->device_mutex); mutex_lock(&modminer->device_mutex);
if (46 != write(fd, state->next_work_cmd, 46)) if (46 != write(fd, state->next_work_cmd, 46))
bailout2(LOG_ERR, "Error writing to ModMiner (start work)"); bailout2(LOG_ERR, "%s %u.%u: Error writing (start work)", modminer->api->name, modminer->device_id, fpgaid);
gettimeofday(&state->tv_workstart, NULL); gettimeofday(&state->tv_workstart, NULL);
state->hashes = 0; state->hashes = 0;
status_read("start work"); status_read("start work");
@ -400,10 +425,12 @@ modminer_process_results(struct thr_info*thr)
mutex_lock(&modminer->device_mutex); mutex_lock(&modminer->device_mutex);
if (2 == write(fd, cmd, 2) && read(fd, &temperature, 1) == 1) if (2 == write(fd, cmd, 2) && read(fd, &temperature, 1) == 1)
{ {
modminer->temp = (float)temperature; state->temp = temperature;
if (!fpgaid)
modminer->temp = (float)temperature;
if (temperature > modminer->cutofftemp - 2) { if (temperature > modminer->cutofftemp - 2) {
if (temperature > modminer->cutofftemp) { if (temperature > modminer->cutofftemp) {
applog(LOG_WARNING, "Hit thermal cutoff limit on %s %d, disabling!", modminer->api->name, modminer->device_id); applog(LOG_WARNING, "%s %u.%u: Hit thermal cutoff limit, disabling device!", modminer->api->name, modminer->device_id, fpgaid);
modminer->deven = DEV_RECOVER; modminer->deven = DEV_RECOVER;
modminer->device_last_not_well = time(NULL); modminer->device_last_not_well = time(NULL);
@ -423,7 +450,7 @@ modminer_process_results(struct thr_info*thr)
iter = 200; iter = 200;
while (1) { while (1) {
if (write(fd, cmd, 2) != 2) if (write(fd, cmd, 2) != 2)
bailout2(LOG_ERR, "Error reading from ModMiner (get nonce)"); bailout2(LOG_ERR, "%s %u.%u: Error reading (get nonce)", modminer->api->name, modminer->device_id, fpgaid);
serial_read(fd, &nonce, 4); serial_read(fd, &nonce, 4);
mutex_unlock(&modminer->device_mutex); mutex_unlock(&modminer->device_mutex);
if (memcmp(&nonce, "\xff\xff\xff\xff", 4)) { if (memcmp(&nonce, "\xff\xff\xff\xff", 4)) {

2
miner.h
Unescape View File

@ -333,7 +333,7 @@ struct cgpu_info {
struct timeval last_message_tv; struct timeval last_message_tv;
int threads; int threads;
struct thr_info *thread; struct thr_info **thr;
unsigned int max_hashes; unsigned int max_hashes;

Write Preview
Loading…
Cancel
Save