From 44f96c64b235b0b1b76d704719fe9eaeb5991225 Mon Sep 17 00:00:00 2001 From: Kano Date: Thu, 10 Oct 2013 07:56:41 +1100 Subject: [PATCH 1/4] klondike - display MHz also --- driver-klondike.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/driver-klondike.c b/driver-klondike.c index 797ee377..955c1c61 100644 --- a/driver-klondike.c +++ b/driver-klondike.c @@ -619,7 +619,9 @@ static void get_klondike_statline_before(char *buf, size_t siz, struct cgpu_info struct klondike_info *klninfo = (struct klondike_info *)(klncgpu->device_data); uint8_t temp = 0xFF; uint16_t fan = 0; + uint16_t clock = 0; int dev; + char tmp[16]; if (klninfo->status == NULL) return; @@ -629,11 +631,17 @@ static void get_klondike_statline_before(char *buf, size_t siz, struct cgpu_info if (klninfo->status[dev].temp < temp) temp = klninfo->status[dev].temp; fan += klninfo->cfg[dev].fantarget; + clock += klninfo->cfg[dev].hashclock; } fan /= klninfo->status->slavecount+1; + clock /= klninfo->status->slavecount+1; rd_unlock(&(klninfo->stat_lock)); - tailsprintf(buf, siz, " %3.0fC %3d%% | ", cvtKlnToC(temp), fan*100/255); + snprintf(tmp, sizeof(tmp), "%2.0fC", cvtKlnToC(temp)); + if (strlen(tmp) < 4) + strcat(tmp, " "); + + tailsprintf(buf, siz, "%3dMHz %3d%% %s| ", (int)clock, fan*100/255, tmp); } static struct api_data *klondike_api_stats(struct cgpu_info *klncgpu) From 8e82da43205d0e5a3d66d760ad1ae6c62c759753 Mon Sep 17 00:00:00 2001 From: Kano Date: Fri, 4 Oct 2013 10:57:07 +1000 Subject: [PATCH 2/4] Klondike - extra zero value and range checking in temp conversion --- driver-klondike.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/driver-klondike.c b/driver-klondike.c index 955c1c61..523df436 100644 --- a/driver-klondike.c +++ b/driver-klondike.c @@ -120,6 +120,9 @@ static double cvtKlnToC(uint8_t temp) { double Rt, stein, celsius; + if (temp == 0) + return 0.0; + Rt = 1000.0 * 255.0 / (double)temp - 1000.0; stein = log(Rt / 2200.0) / 3987.0; @@ -128,13 +131,39 @@ static double cvtKlnToC(uint8_t temp) celsius = (1.0 / stein) - 273.15; + // For display of bad data + if (celsius < 0.0) + celsius = 0.0; + if (celsius > 200.0) + celsius = 200.0; + return celsius; } static int cvtCToKln(double deg) { - double R = exp((1/(deg+273.15)-1/(273.15+25))*3987)*2200; - return 256*R/(R+1000); + double Rt, stein, temp; + + if (deg < 0.0) + deg = 0.0; + + stein = 1.0 / (deg + 273.15); + + stein -= 1.0 / (double)(25.0 + 273.15); + + Rt = exp(stein * 3987.0) * 2200.0; + + if (Rt == -1000.0) + Rt++; + + temp = 1000.0 * 256.0 / (Rt + 1000.0); + + if (temp > 255) + temp = 255; + if (temp < 0) + temp = 0; + + return (int)temp; } static char *SendCmdGetReply(struct cgpu_info *klncgpu, char Cmd, int device, int datalen, void *data) From 595dcdfa94a30d4fd2b3f1dbec756500c75e6eea Mon Sep 17 00:00:00 2001 From: Kano Date: Fri, 4 Oct 2013 14:56:33 +1000 Subject: [PATCH 3/4] Klondike - increase circular read buffer size --- driver-klondike.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver-klondike.c b/driver-klondike.c index 523df436..7dafc1d0 100644 --- a/driver-klondike.c +++ b/driver-klondike.c @@ -39,7 +39,7 @@ #define REPLY_SIZE 15 // adequate for all types of replies #define REPLY_BUFSIZE 16 // reply + 1 byte to mark used -#define MAX_REPLY_COUNT 32 // more unhandled replies than this will result in data loss +#define MAX_REPLY_COUNT 4096 // more unhandled replies than this will result in data loss #define REPLY_WAIT_TIME 100 // poll interval for a cmd waiting it's reply #define CMD_REPLY_RETRIES 8 // how many retries for cmds #define MAX_WORK_COUNT 4 // for now, must be binary multiple and match firmware From 2ca8d859067a94df2fbcbb44e12d1c6fc78e102f Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sat, 12 Oct 2013 08:45:03 +1100 Subject: [PATCH 4/4] Convert all usb control transfers to asynchronous communication with our own timeout management as well. --- usbutils.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/usbutils.c b/usbutils.c index 708ebd67..5050ec2f 100644 --- a/usbutils.c +++ b/usbutils.c @@ -26,7 +26,9 @@ (err) == LIBUSB_TRANSFER_ERROR) #define NOCONTROLDEV(err) ((err) == LIBUSB_ERROR_NO_DEVICE || \ - (err) == LIBUSB_ERROR_OTHER) + (err) == LIBUSB_ERROR_OTHER || \ + (err) == LIBUSB_TRANSFER_NO_DEVICE || \ + (err) == LIBUSB_TRANSFER_ERROR) /* * WARNING - these assume DEVLOCK(cgpu, pstate) is called first and @@ -2207,7 +2209,7 @@ static void init_usb_transfer(struct usb_transfer *ut) ut->transfer->user_data = ut; } -static void LIBUSB_CALL bulk_callback(struct libusb_transfer *transfer) +static void LIBUSB_CALL transfer_callback(struct libusb_transfer *transfer) { struct usb_transfer *ut = transfer->user_data; @@ -2285,7 +2287,7 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle, int intinfo, mutex_lock(&ut.mutex); /* We give the transfer no timeout since we manage timeouts ourself */ libusb_fill_bulk_transfer(ut.transfer, dev_handle, endpoint, buf, length, - bulk_callback, &ut, 0); + transfer_callback, &ut, 0); STATS_TIMEVAL(&tv_start); cg_rlock(&cgusb_fd_lock); @@ -2702,6 +2704,40 @@ out_noerrmsg: return err; } +/* As we do for bulk reads, emulate a sync function for control transfers using + * our own timeouts that takes the same parameters as libusb_control_transfer. + */ +static int usb_control_transfer(libusb_device_handle *dev_handle, uint8_t bmRequestType, + uint8_t bRequest, uint16_t wValue, uint16_t wIndex, + unsigned char *buffer, uint16_t wLength, unsigned int timeout) +{ + struct usb_transfer ut; + int err, transferred; + unsigned char *buf; + + buf = malloc(70); + if (unlikely(!buf)) + quit(1, "Failed to malloc buf in usb_control_transfer"); + init_usb_transfer(&ut); + mutex_lock(&ut.mutex); + libusb_fill_control_setup(buf, bmRequestType, bRequest, wValue, + wIndex, wLength); + libusb_fill_control_transfer(ut.transfer, dev_handle, buf, transfer_callback, + &ut, 0); + err = libusb_submit_transfer(ut.transfer); + if (!err) + err = callback_wait(&ut, &transferred, timeout); + if (!err && transferred) { + unsigned char *ofbuf = libusb_control_transfer_get_data(ut.transfer); + + memcpy(buffer, ofbuf, transferred); + return transferred; + } + if ((err) == LIBUSB_TRANSFER_CANCELLED) + err = LIBUSB_ERROR_TIMEOUT; + return err; +} + int __usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint32_t *data, int siz, unsigned int timeout, __maybe_unused enum usb_cmds cmd) { struct cg_usb_device *usbdev; @@ -2758,7 +2794,7 @@ int __usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bReques } STATS_TIMEVAL(&tv_start); cg_rlock(&cgusb_fd_lock); - err = libusb_control_transfer(usbdev->handle, request_type, + err = usb_control_transfer(usbdev->handle, request_type, bRequest, wValue, wIndex, buf, (uint16_t)siz, timeout); cg_runlock(&cgusb_fd_lock); STATS_TIMEVAL(&tv_finish); @@ -2839,7 +2875,7 @@ int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRe memset(tbuf, 0, 64); STATS_TIMEVAL(&tv_start); cg_rlock(&cgusb_fd_lock); - err = libusb_control_transfer(usbdev->handle, request_type, + err = usb_control_transfer(usbdev->handle, request_type, bRequest, wValue, wIndex, tbuf, (uint16_t)bufsiz, timeout); cg_runlock(&cgusb_fd_lock);