Commit 2a7f6f1d20327e723777474c81a49a79dad58d76
2014-06-25T09:26:49
minion - dup checking, disable reread by default and extra ioctl debugging
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
diff --git a/driver-minion.c b/driver-minion.c
index dc25838..85e9d45 100644
--- a/driver-minion.c
+++ b/driver-minion.c
@@ -35,7 +35,7 @@ static void minion_detect(__maybe_unused bool hotplug)
#define MINION_ROCKCHIP 0
// The code is always in - this just decides if it does it
-static bool minreread = true;
+static bool minreread = false;
/*
* Use pins for board selection
@@ -1048,10 +1048,18 @@ static void init_pins(struct minion_info *minioninfo)
}
}
+#define EXTRA_LOG_IO 0
+#if EXTRA_LOG_IO
+static int ioc = 0;
+#endif
+
static int __do_ioctl(struct minion_info *minioninfo, int pin, uint8_t *obuf, uint32_t osiz, uint8_t *rbuf, uint32_t rsiz, MINION_FFL_ARGS)
{
struct spi_ioc_transfer tran;
int ret;
+#if EXTRA_LOG_IO
+ int myioc;
+#endif
#if MINION_SHOW_IO
char dataw[DATA_ALL], datar[DATA_ALL];
#endif
@@ -1116,6 +1124,9 @@ static int __do_ioctl(struct minion_info *minioninfo, int pin, uint8_t *obuf, ui
}
IO_STAT_NOW(&sta);
ret = ioctl(minioninfo->spifd, SPI_IOC_MESSAGE(1), (void *)&tran);
+#if EXTRA_LOG_IO
+ myioc = ioc++;
+#endif
IO_STAT_NOW(&fin);
if (usepins) {
MINION_PIN_AFTER;
@@ -1143,7 +1154,37 @@ static int __do_ioctl(struct minion_info *minioninfo, int pin, uint8_t *obuf, ui
display_ioctl(ret, osiz, (uint8_t *)(&dataw[DATA_OFF]), rsiz, (uint8_t *)(&datar[DATA_OFF]));
#endif
-
+#if EXTRA_LOG_IO
+ if (obuf[1] == READ_ADDR(MINION_RES_PEEK) ||
+ obuf[1] == READ_ADDR(MINION_RES_DATA) ||
+ obuf[1] == READ_ADDR(MINION_SYS_FIFO_STA)) {
+ char *uf1, *uf2, c;
+ uf1 = bin2hex(obuf, DATA_SIZ);
+ uf2 = bin2hex(rbuf, (size_t)ret);
+ switch (obuf[1]) {
+ case READ_ADDR(MINION_RES_PEEK):
+ c = 'P';
+ break;
+ case READ_ADDR(MINION_RES_DATA):
+ c = 'D';
+ break;
+ case READ_ADDR(MINION_SYS_FIFO_STA):
+ c = 'F';
+ break;
+ }
+ applog(LOG_WARNING, "*** seq %d cmd %c %s rep %.8s %s",
+ myioc, c, uf1, uf2, uf2+8);
+ free(uf2);
+ free(uf1);
+ }
+ if (obuf[1] == WRITE_ADDR(MINION_QUE_0)) {
+ char *uf;
+ uf = bin2hex(obuf, osiz);
+ applog(LOG_WARNING, "*** seq %d work %s",
+ myioc, uf);
+ free(uf);
+ }
+#endif
return ret;
}
@@ -2102,6 +2143,8 @@ static void minion_detect(bool hotplug)
minioninfo->initialised = true;
+ dupalloc(minioncgpu, 10);
+
return;
cleanup:
@@ -2758,6 +2801,7 @@ repeek:
enum nonce_state {
NONCE_GOOD_NONCE,
NONCE_NO_NONCE,
+ NONCE_DUP_NONCE,
NONCE_BAD_NONCE,
NONCE_BAD_WORK,
NONCE_NO_WORK,
@@ -2934,6 +2978,14 @@ retry:
redo = false;
retest:
+ if (isdupnonce(minioncgpu, DATAW(item)->work, nonce)) {
+ applog(LOG_WARNING, " ... nonce %02x%02x%02x%02x chip %d core %d task 0x%04x",
+ (nonce & 0xff), ((nonce >> 8) & 0xff),
+ ((nonce >> 16) & 0xff), ((nonce >> 24) & 0xff),
+ chip, core, task_id);
+ return NONCE_DUP_NONCE;
+ }
+
if (test_nonce(DATAW(item)->work, nonce)) {
//applog(MINTASK_LOG, "%s%i: Valid Nonce chip %d core %d task 0x%04x nonce 0x%08x", minioncgpu->drv->name, minioncgpu->device_id, chip, core, task_id, nonce);
submit_tested_work(thr, DATAW(item)->work);