Commit b1a80cef15001e8e95c75619838f5c80ccc6ac65
2013-08-08T00:20:19
avalon allow frequency to be set via the API
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
diff --git a/API-README b/API-README
index b824b04..b1435d1 100644
--- a/API-README
+++ b/API-README
@@ -405,6 +405,7 @@ The list of requests - a (*) means it requires privileged access - and replies a
help message about the options available
The current options are:
+ AVA+BTB opt=freq val=256 to 450 - chip frequency
BTB opt=millivolts val=1000 to 1310 - core voltage
When you enable, disable or restart a GPU, PGA or ASC, you will also get
diff --git a/driver-avalon.c b/driver-avalon.c
index 139c405..0f5602c 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -918,6 +918,21 @@ static void avalon_set_timeout(struct avalon_info *info)
info->timeout = AVALON_TIMEOUT_FACTOR / info->frequency;
}
+static void avalon_set_freq(struct cgpu_info *avalon, int frequency)
+{
+ struct avalon_info *info = avalon->device_data;
+
+ info->frequency = frequency;
+ if (info->frequency > opt_avalon_freq_max)
+ info->frequency = opt_avalon_freq_max;
+ if (info->frequency < opt_avalon_freq_min)
+ info->frequency = opt_avalon_freq_min;
+ avalon_set_timeout(info);
+ applog(LOG_WARNING, "%s%i: Set frequency to %d, timeout %d",
+ avalon->drv->name, avalon->device_id,
+ info->frequency, info->timeout);
+}
+
static void avalon_inc_freq(struct avalon_info *info)
{
info->frequency += 2;
@@ -1376,18 +1391,19 @@ static char *avalon_set_device(struct cgpu_info *avalon, char *option, char *set
{
int val;
- if (usb_ident(avalon) != IDENT_BTB) {
- sprintf(replybuf, "%s has no set options", avalon->drv->name);
- return replybuf;
- }
-
if (strcasecmp(option, "help") == 0) {
- sprintf(replybuf, "millivolts: range %d-%d",
+ sprintf(replybuf, "freq: range %d-%d millivolts: range %d-%d",
+ AVALON_MIN_FREQUENCY, AVALON_MAX_FREQUENCY,
BITBURNER_MIN_COREMV, BITBURNER_MAX_COREMV);
return replybuf;
}
if (strcasecmp(option, "millivolts") == 0 || strcasecmp(option, "mv") == 0) {
+ if (usb_ident(avalon) != IDENT_BTB) {
+ sprintf(replybuf, "%s cannot set millivolts", avalon->drv->name);
+ return replybuf;
+ }
+
if (!setting || !*setting) {
sprintf(replybuf, "missing millivolts setting");
return replybuf;
@@ -1408,6 +1424,23 @@ static char *avalon_set_device(struct cgpu_info *avalon, char *option, char *set
}
}
+ if (strcasecmp(option, "freq") == 0) {
+ if (!setting || !*setting) {
+ sprintf(replybuf, "missing freq setting");
+ return replybuf;
+ }
+
+ val = atoi(setting);
+ if (val < AVALON_MIN_FREQUENCY || val > AVALON_MAX_FREQUENCY) {
+ sprintf(replybuf, "invalid freq: '%s' valid range %d-%d",
+ setting, AVALON_MIN_FREQUENCY, AVALON_MAX_FREQUENCY);
+ return replybuf;
+ }
+
+ avalon_set_freq(avalon, val);
+ return NULL;
+ }
+
sprintf(replybuf, "Unknown option: %s", option);
return replybuf;
}