debug-feature: jtagtcpip, reduce performance impact of ping times

queue read back of data

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index f3fe5a6a247bc141443900d062a3cb34cd036d50..0f2b46a0f41996161a95e6bfe2023179d951fc09 100644 (file)
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -58,8 +58,14 @@ static __inline__ void waitIdle(void)
                ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
        } while ((empty & 0x100) == 0);
 }
+
+static __inline__ void zy1000_flush_readqueue(void)
+{
+       /* Not used w/hardware fifo */
+}
 #else
 extern void waitIdle(void);
+void zy1000_flush_readqueue(void);
 #endif
 
 static __inline__ void waitQueue(void)
@@ -222,6 +228,6 @@ static __inline__ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
        }
 }
 
-#define interface_jtag_add_callback(callback, in) callback(in)
-
-#define interface_jtag_add_callback4(callback, in, data1, data2, data3) jtag_set_error(callback(in, data1, data2, data3))
+/* Must flush any read queue before we can invoke callback */
+#define interface_jtag_add_callback(callback, in) {zy1000_flush_readqueue(); callback(in);}
+#define interface_jtag_add_callback4(callback, in, data1, data2, data3) {zy1000_flush_readqueue(); jtag_set_error(callback(in, data1, data2, data3));}

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 97c94f7c2a2a2d32e0a275683a0157f9b8820a15..015db2a7e7ac63782205e5f315a6813285a0b29a 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -463,6 +463,11 @@ int interface_jtag_execute_queue(void)
 
        waitIdle();
 
+       /* We must make sure to write data read back to memory location before we return
+        * from this fn
+        */
+       zy1000_flush_readqueue();
+
        if (zy1000_rclk)
        {
                /* Only check for errors when using RCLK to speed up
@@ -487,38 +492,7 @@ int interface_jtag_execute_queue(void)
 
 
 
-
-static uint32_t getShiftValue(void)
-{
-       uint32_t value;
-       waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value);
-       VERBOSE(LOG_INFO("getShiftValue %08x", value));
-       return value;
-}
-#if 0
-static uint32_t getShiftValueFlip(void)
-{
-       uint32_t value;
-       waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE + 0x18, value);
-       VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
-       return value;
-}
-#endif
-
-#if 0
-static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endState, int repeat, uint32_t value)
-{
-       VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value));
-       uint32_t a,b;
-       a = state;
-       b = endState;
-       ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
-       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 15) | (repeat << 8) | (a << 4) | b);
-       VERBOSE(getShiftValueFlip());
-}
-#endif
+static void writeShiftValue(uint8_t *data, int bits);
 
 // here we shuffle N bits out/in
 static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int num_bits, bool pause_now, tap_state_t shiftState, tap_state_t end_state)
@@ -562,15 +536,7 @@ static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int n
 
                if (in_value != NULL)
                {
-                       // data in, LSB to MSB
-                       value = getShiftValue();
-                       // we're shifting in data to MSB, shift data to be aligned for returning the value
-                       value >>= 32-k;
-
-                       for (int l = 0; l < k; l += 8)
-                       {
-                               in_value[(j + l)/8]=(value >> l)&0xff;
-                       }
+                       writeShiftValue(in_value + (j/8), k);
                }
        }
 }
@@ -1182,11 +1148,12 @@ void waitIdle(void)
        }
 }
 
-
-
 uint32_t zy1000_tcpin(uint32_t address)
 {
        tcpip_open();
+
+       zy1000_flush_readqueue();
+
        uint32_t data;
        if (!writeLong((ZY1000_CMD_PEEK << 24) | address)||
                        !readLong(&data))
@@ -1209,6 +1176,90 @@ int interface_jtag_add_sleep(uint32_t us)
        return ERROR_OK;
 }
 
+/* queue a readback */
+#define readqueue_size 16384
+static struct
+{
+       uint8_t *dest;
+       int bits;
+} readqueue[readqueue_size];
+
+static int readqueue_pos = 0;
+
+/* flush the readqueue, this means reading any data that
+ * we're expecting and store them into the final position
+ */
+void zy1000_flush_readqueue(void)
+{
+       if (readqueue_pos == 0)
+       {
+               /* simply debugging by allowing easy breakpoints when there
+                * is something to do. */
+               return;
+       }
+       int i;
+       tcpip_open();
+       for (i = 0; i < readqueue_pos; i++)
+       {
+               uint32_t value;
+               if (!readLong(&value))
+               {
+                       fprintf(stderr, "Could not read from zy1000 server\n");
+                       exit(-1);
+               }
+
+               uint8_t *in_value = readqueue[i].dest;
+               int k = readqueue[i].bits;
+
+               // we're shifting in data to MSB, shift data to be aligned for returning the value
+               value >>= 32-k;
+
+               for (int l = 0; l < k; l += 8)
+               {
+                       in_value[l/8]=(value >> l)&0xff;
+               }
+       }
+       readqueue_pos = 0;
+}
+
+static void writeShiftValue(uint8_t *data, int bits)
+{
+       waitIdle();
+
+       if (!writeLong((ZY1000_CMD_PEEK << 24) | (ZY1000_JTAG_BASE + 0xc)))
+       {
+               fprintf(stderr, "Could not read from zy1000 server\n");
+               exit(-1);
+       }
+
+       if (readqueue_pos >= readqueue_size)
+       {
+               zy1000_flush_readqueue();
+       }
+
+       readqueue[readqueue_pos].dest = data;
+       readqueue[readqueue_pos].bits = bits;
+       readqueue_pos++;
+}
+
+#else
+
+static void writeShiftValue(uint8_t *data, int bits)
+{
+       uint32_t value;
+       waitIdle();
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value);
+       VERBOSE(LOG_INFO("getShiftValue %08x", value));
+
+       // data in, LSB to MSB
+       // we're shifting in data to MSB, shift data to be aligned for returning the value
+       value >>= 32 - bits;
+
+       for (int l = 0; l < bits; l += 8)
+       {
+               data[l/8]=(value >> l)&0xff;
+       }
+}
 
 #endif