summaryrefslogtreecommitdiff
path: root/firmware/src/os
diff options
context:
space:
mode:
authorlaforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1>2006-09-22 21:41:22 +0000
committerlaforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1>2006-09-22 21:41:22 +0000
commit706ffa9f3b986eff193377142459fbfde2362036 (patch)
treefbdb2d853265bf783db3a9eceebdded08efd297e /firmware/src/os
parent1c2b1d22016957bebe0a49c9069b85815f7cf936 (diff)
- move large rctx definitions to req_ctx.h
- add more fine-grained debugging macros in pcd_enumarate.c - resolve race conditions between main-loop ep_refill and irq-triggered ep_refill by adding one irq-[b]locking variant - consolidate endpoint reset code into reset_ep() - add code to handle correct transmission and reception of usb transfers larger than endpoint size - use new jump address (0x104000) in DFU Cstartup.S - move main_usb to pcd subdirectory - fix include/compile.h make dependencies - make usb benchmark code use new large req_ctx git-svn-id: https://svn.openpcd.org:2342/trunk@219 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
Diffstat (limited to 'firmware/src/os')
-rw-r--r--firmware/src/os/dbgu.c1
-rw-r--r--firmware/src/os/main.c1
-rw-r--r--firmware/src/os/pcd_enumerate.c271
-rw-r--r--firmware/src/os/pcd_enumerate.h7
-rw-r--r--firmware/src/os/req_ctx.c3
-rw-r--r--firmware/src/os/req_ctx.h5
-rw-r--r--firmware/src/os/usb_benchmark.c19
7 files changed, 205 insertions, 102 deletions
diff --git a/firmware/src/os/dbgu.c b/firmware/src/os/dbgu.c
index eed5546..d47e7cd 100644
--- a/firmware/src/os/dbgu.c
+++ b/firmware/src/os/dbgu.c
@@ -146,6 +146,7 @@ void AT91F_DBGU_Init(void)
AT91F_DBGU_Printk(" ");
AT91F_DBGU_Printk(opcd_version.by);
AT91F_DBGU_Printk("\n\r");
+ AT91F_DBGU_Printk
("\n\r-I- OpenPCD test mode\n\r 0) Set Pull-up 1) Clear Pull-up "
"2) Toggle LED1 3) Toggle LED2 4) Test RC632\n\r"
"5) Read RxWait 6) Write RxWait 7) Dump RC632 Regs\n\r");
diff --git a/firmware/src/os/main.c b/firmware/src/os/main.c
index ce611bc..973488b 100644
--- a/firmware/src/os/main.c
+++ b/firmware/src/os/main.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <string.h>
+#include <compile.h>
#include <include/lib_AT91SAM7.h>
#include <os/dbgu.h>
#include <os/led.h>
diff --git a/firmware/src/os/pcd_enumerate.c b/firmware/src/os/pcd_enumerate.c
index e3443a8..cef6e75 100644
--- a/firmware/src/os/pcd_enumerate.c
+++ b/firmware/src/os/pcd_enumerate.c
@@ -40,16 +40,31 @@
#include "../openpcd.h"
#include <os/dbgu.h>
-#define DEBUG_UDP_IRQ
+//#define DEBUG_UDP_IRQ
+#define DEBUG_UDP_IRQ_IN
+//#define DEBUG_UDP_IRQ_OUT
#define DEBUG_UDP_EP0
-#define CONFIG_DFU
+#ifdef DEBUG_UDP_IRQ
+#define DEBUGI(x, args ...) DEBUGP(x, ## args)
+#else
+#define DEBUGI(x, args ...) do { } while (0)
+#endif
-#define AT91C_EP_OUT 1
-#define AT91C_EP_OUT_SIZE 0x40
-#define AT91C_EP_IN 2
-#define AT91C_EP_IN_SIZE 0x40
-#define AT91C_EP_INT 3
+#ifdef DEBUG_UDP_IRQ_IN
+#define DEBUGII(x, args ...) DEBUGP(x, ## args)
+#else
+#define DEBUGII(x, args ...) do { } while (0)
+#endif
+
+#ifdef DEBUG_UDP_IRQ_OUT
+#define DEBUGIO(x, args ...) DEBUGP(x, ## args)
+#else
+#define DEBUGIO(x, args ...) do { } while (0)
+#endif
+
+
+#define CONFIG_DFU
#ifdef CONFIG_DFU
static const struct dfuapi *dfu = DFU_API_LOCATION;
@@ -157,6 +172,38 @@ static const struct usb_string_descriptor string0 = {
.wData[0] = 0x0409, /* English */
};
+struct epstate {
+ u_int32_t state_busy;
+ u_int32_t state_pending;
+};
+
+static const struct epstate epstate[] = {
+ [0] = { .state_busy = RCTX_STATE_INVALID },
+ [1] = { .state_busy = RCTX_STATE_INVALID },
+ [2] = { .state_busy = RCTX_STATE_UDP_EP2_BUSY,
+ .state_pending = RCTX_STATE_UDP_EP2_PENDING },
+ [3] = { .state_busy = RCTX_STATE_UDP_EP3_BUSY,
+ .state_pending = RCTX_STATE_UDP_EP3_PENDING },
+};
+
+static void reset_ep(unsigned int ep)
+{
+ AT91PS_UDP pUDP = upcd.pUdp;
+ struct req_ctx *rctx;
+
+ //pUDP->UDP_CSR[ep] = AT91C_UDP_EPEDS;
+
+ atomic_set(&upcd.ep[ep].pkts_in_transit, 0);
+
+ /* free all currently transmitting contexts */
+ while (rctx = req_ctx_find_get(0, epstate[ep].state_busy,
+ RCTX_STATE_FREE)) {}
+
+ pUDP->UDP_RSTEP |= (1 << ep);
+ pUDP->UDP_RSTEP &= ~(1 << ep);
+
+ upcd.ep[ep].incomplete.rctx = NULL;
+}
static void udp_ep0_handler(void);
@@ -166,7 +213,7 @@ void udp_unthrottle(void)
pUDP->UDP_IER = AT91C_UDP_EPINT1;
}
-int udp_refill_ep(int ep)
+static int __udp_refill_ep(int ep)
{
u_int16_t i;
AT91PS_UDP pUDP = upcd.pUdp;
@@ -175,13 +222,17 @@ int udp_refill_ep(int ep)
/* If we're not configured by the host yet, there is no point
* in trying to send data to it... */
- if (!upcd.cur_config)
+ if (!upcd.cur_config) {
+ DEBUGPCR("-ENXIO");
return -ENXIO;
+ }
/* If there are already two packets in transit, the DPR of
* the SAM7 UDC doesn't have space for more data */
- if (atomic_read(&upcd.ep[ep].pkts_in_transit) == 2)
+ if (atomic_read(&upcd.ep[ep].pkts_in_transit) == 2) {
+ DEBUGPCR("-EBUSY");
return -EBUSY;
+ }
/* If we have an incompletely-transmitted req_ctx (>EP size),
* we need to transmit the rest and finish the transaction */
@@ -189,28 +240,24 @@ int udp_refill_ep(int ep)
rctx = upcd.ep[ep].incomplete.rctx;
start = upcd.ep[ep].incomplete.bytes_sent;
} else {
- unsigned int state, state_busy;
- if (ep == 2) {
- state = RCTX_STATE_UDP_EP2_PENDING;
- state_busy = RCTX_STATE_UDP_EP2_BUSY;
- } else {
- state = RCTX_STATE_UDP_EP3_PENDING;
- state_busy = RCTX_STATE_UDP_EP3_BUSY;
- }
-
/* get pending rctx and start transmitting from zero */
- rctx = req_ctx_find_get(0, state, state_busy);
+ rctx = req_ctx_find_get(0, epstate[ep].state_pending,
+ epstate[ep].state_busy);
if (!rctx)
return 0;
start = 0;
+
+ upcd.ep[ep].incomplete.bytes_sent = 0;
}
if (rctx->tot_len - start <= AT91C_EP_IN_SIZE)
end = rctx->tot_len;
else
- end = AT91C_EP_IN_SIZE;
+ end = start + AT91C_EP_IN_SIZE;
/* fill FIFO/DPR */
+ DEBUGII("RCTX_tx(ep=%u,ctx=%u):%u ", ep, req_ctx_num(rctx),
+ end - start);
for (i = start; i < end; i++)
pUDP->UDP_FDR[ep] = rctx->data[i];
@@ -219,22 +266,40 @@ int udp_refill_ep(int ep)
pUDP->UDP_CSR[ep] |= AT91C_UDP_TXPKTRDY;
}
- /* Increment the number of bytes sent in the current large
- * context, if any */
- if (start != 0)
- upcd.ep[ep].incomplete.bytes_sent += end-start;
-
- /* return rctx to pool of free contexts */
- req_ctx_put(rctx);
+ if ((end - start < AT91C_EP_OUT_SIZE) ||
+ (((end - start) == 0) && end && (rctx->tot_len % AT91C_EP_OUT_SIZE) == 0)) {
+ /* CASE 1: return context to pool, if
+ * - packet transfer < AT91C_EP_OUT_SIZE
+ * - after ZLP of transfer == AT91C_EP_OUT_SIZE
+ * - after ZLP of transfer % AT91C_EP_OUT_SIZE == 0
+ * - after last packet of transfer % AT91C_EP_OUT_SIZE != 0
+ */
+ DEBUGII("RCTX(ep=%u)_tx_done ", ep);
+ upcd.ep[ep].incomplete.rctx = NULL;
+ req_ctx_put(rctx);
+ } else {
+ /* CASE 2: mark transfer as incomplete, if
+ * - after data of transfer == AT91C_EP_OUT_SIZE
+ * - after data of transfer > AT91C_EP_OUT_SIZE
+ * - after last packet of transfer % AT91C_EP_OUT_SIZE == 0
+ */
+ upcd.ep[ep].incomplete.rctx = rctx;
+ upcd.ep[ep].incomplete.bytes_sent += end - start;
+ DEBUGII("RCTX(ep=%u)_tx_cont ", ep);
+ }
- return 0;
+ return 1;
}
-#ifdef DEBUG_UDP_IRQ
-#define DEBUGI(x, args ...) DEBUGP(x, ## args)
-#else
-#define DEBUGI(x, args ...) do { } while (0)
-#endif
+int udp_refill_ep(int ep)
+{
+ unsigned long flags;
+ int ret;
+
+ local_irq_save(flags);
+ ret = __udp_refill_ep(ep);
+ local_irq_restore(flags);
+}
static void udp_irq(void)
{
@@ -256,11 +321,16 @@ static void udp_irq(void)
/* Configure endpoint 0 */
pUDP->UDP_CSR[0] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
upcd.cur_config = 0;
+
+ reset_ep(1);
+ reset_ep(2);
+ reset_ep(3);
#ifdef CONFIG_DFU
if (*dfu->dfu_state == DFU_STATE_appDETACH) {
/* now we need to switch to DFU mode */
dfu->dfu_switch();
+ goto out;
}
#endif
}
@@ -271,52 +341,89 @@ static void udp_irq(void)
}
if (isr & AT91C_UDP_EPINT1) {
u_int32_t cur_rcv_bank = upcd.cur_rcv_bank;
+ u_int16_t i, pkt_size;
+ struct req_ctx *rctx;
+
csr = pUDP->UDP_CSR[1];
+ pkt_size = csr >> 16;
+
DEBUGI("EP1INT(Out, CSR=0x%08x) ", csr);
if (cur_rcv_bank == AT91C_UDP_RX_DATA_BK1)
- DEBUGI("cur_bank=1 ");
+ DEBUGIO("cur_bank=1 ");
else if (cur_rcv_bank == AT91C_UDP_RX_DATA_BK0)
- DEBUGI("cur_bank=0 ");
+ DEBUGIO("cur_bank=0 ");
else
- DEBUGI("cur_bank INVALID ");
+ DEBUGIO("cur_bank INVALID ");
if (csr & AT91C_UDP_RX_DATA_BK1)
- DEBUGI("BANK1 ");
+ DEBUGIO("BANK1 ");
if (csr & AT91C_UDP_RX_DATA_BK0)
- DEBUGI("BANK0 ");
+ DEBUGIO("BANK0 ");
- if (csr & cur_rcv_bank) {
- u_int16_t pkt_recv = 0;
- u_int16_t pkt_size = csr >> 16;
- struct req_ctx *rctx =
- req_ctx_find_get(0, RCTX_STATE_FREE,
+ if (!(csr & cur_rcv_bank))
+ goto cont_ep2;
+
+ if (upcd.ep[1].incomplete.rctx) {
+ DEBUGIO("continue_incompl_RCTX ");
+ rctx = upcd.ep[1].incomplete.rctx;
+ } else {
+ /* allocate new req_ctx */
+ DEBUGIO("alloc_new_RCTX ");
+
+ /* whether to get a big or a small req_ctx */
+ if (pkt_size >= AT91C_EP_IN_SIZE)
+ rctx = req_ctx_find_get(1, RCTX_STATE_FREE,
+ RCTX_STATE_UDP_RCV_BUSY);
+ else
+ rctx = req_ctx_find_get(0, RCTX_STATE_FREE,
RCTX_STATE_UDP_RCV_BUSY);
- if (rctx) {
- rctx->tot_len = pkt_size;
- while (pkt_size--)
- rctx->data[pkt_recv++] = pUDP->UDP_FDR[1];
- pUDP->UDP_CSR[1] &= ~cur_rcv_bank;
- if (cur_rcv_bank == AT91C_UDP_RX_DATA_BK0)
- cur_rcv_bank = AT91C_UDP_RX_DATA_BK1;
- else
- cur_rcv_bank = AT91C_UDP_RX_DATA_BK0;
- upcd.cur_rcv_bank = cur_rcv_bank;
- DEBUGI("rctxdump(%s) ", hexdump(rctx->data, rctx->tot_len));
- req_ctx_set_state(rctx, RCTX_STATE_UDP_RCV_DONE);
- DEBUGI("RCTX=%u ", req_ctx_num(rctx));
- } else {
+ if (!rctx) {
/* disable interrupts for now */
pUDP->UDP_IDR = AT91C_UDP_EPINT1;
DEBUGP("NO_RCTX_AVAIL! ");
+ goto cont_ep2;
}
+ rctx->tot_len = 0;
+ }
+ DEBUGIO("RCTX=%u ", req_ctx_num(rctx));
+
+ if (rctx->size - rctx->tot_len < pkt_size) {
+ DEBUGIO("RCTX too small, truncating !!!\n");
+ pkt_size = rctx->size - rctx->tot_len;
+ }
+
+ for (i = 0; i < pkt_size; i++)
+ rctx->data[rctx->tot_len++] = pUDP->UDP_FDR[1];
+
+ pUDP->UDP_CSR[1] &= ~cur_rcv_bank;
+
+ /* toggle current receive bank */
+ if (cur_rcv_bank == AT91C_UDP_RX_DATA_BK0)
+ cur_rcv_bank = AT91C_UDP_RX_DATA_BK1;
+ else
+ cur_rcv_bank = AT91C_UDP_RX_DATA_BK0;
+ upcd.cur_rcv_bank = cur_rcv_bank;
+
+ DEBUGIO("rctxdump(%s) ", hexdump(rctx->data, rctx->tot_len));
+
+ /* if this is the last packet in transfer, hand rctx up the
+ * stack */
+ if (pkt_size < AT91C_EP_IN_SIZE) {
+ DEBUGIO("RCTX_rx_done ");
+ req_ctx_set_state(rctx, RCTX_STATE_UDP_RCV_DONE);
+ upcd.ep[1].incomplete.rctx = NULL;
+ } else {
+ DEBUGIO("RCTX_rx_cont ");
+ upcd.ep[1].incomplete.rctx = rctx;
}
}
+cont_ep2:
if (isr & AT91C_UDP_EPINT2) {
csr = pUDP->UDP_CSR[2];
DEBUGI("EP2INT(In, CSR=0x%08x) ", csr);
if (csr & AT91C_UDP_TXCOMP) {
- DEBUGI("ACK_TX_COMP ");
+ DEBUGII("ACK_TX_COMP ");
/* acknowledge TX completion */
pUDP->UDP_CSR[2] &= ~AT91C_UDP_TXCOMP;
while (pUDP->UDP_CSR[2] & AT91C_UDP_TXCOMP) ;
@@ -325,12 +432,12 @@ static void udp_irq(void)
if (atomic_dec_return(&upcd.ep[2].pkts_in_transit) == 1)
pUDP->UDP_CSR[2] |= AT91C_UDP_TXPKTRDY;
- udp_refill_ep(2);
+ __udp_refill_ep(2);
}
}
if (isr & AT91C_UDP_EPINT3) {
csr = pUDP->UDP_CSR[3];
- DEBUGI("EP3INT(Interrupt, CSR=0x%08x) ", csr);
+ DEBUGII("EP3INT(Interrupt, CSR=0x%08x) ", csr);
/* Transmit has completed, re-fill from pending rcts for EP3 */
if (csr & AT91C_UDP_TXCOMP) {
pUDP->UDP_CSR[3] &= ~AT91C_UDP_TXCOMP;
@@ -340,7 +447,7 @@ static void udp_irq(void)
if (atomic_dec_return(&upcd.ep[3].pkts_in_transit) == 1)
pUDP->UDP_CSR[3] |= AT91C_UDP_TXPKTRDY;
- udp_refill_ep(3);
+ __udp_refill_ep(3);
}
}
if (isr & AT91C_UDP_RXSUSP) {
@@ -367,7 +474,7 @@ static void udp_irq(void)
DEBUGI("WAKEUP ");
/* FIXME: implement suspend/resume */
}
-
+out:
DEBUGI("END\r\n");
AT91F_AIC_ClearIt(AT91C_BASE_AIC, AT91C_ID_UDP);
}
@@ -605,37 +712,7 @@ static void udp_ep0_handler(void)
wIndex &= 0x0F;
if ((wValue == 0) && wIndex && (wIndex <= 3)) {
struct req_ctx *rctx;
- if (wIndex == 1) {
- pUDP->UDP_CSR[1] =
- (AT91C_UDP_EPEDS |
- AT91C_UDP_EPTYPE_BULK_OUT);
- pUDP->UDP_RSTEP |= AT91C_UDP_EP1;
- pUDP->UDP_RSTEP &= ~AT91C_UDP_EP1;
- }
- else if (wIndex == 2) {
- pUDP->UDP_CSR[2] =
- (AT91C_UDP_EPEDS |
- AT91C_UDP_EPTYPE_BULK_IN);
- pUDP->UDP_RSTEP |= AT91C_UDP_EP2;
- pUDP->UDP_RSTEP &= ~AT91C_UDP_EP2;
-
- /* free all currently transmitting contexts */
- while (rctx = req_ctx_find_get(0, RCTX_STATE_UDP_EP2_BUSY,
- RCTX_STATE_FREE)) {}
- atomic_set(&upcd.ep[wIndex].pkts_in_transit, 0);
- }
- else if (wIndex == 3) {
- pUDP->UDP_CSR[3] =
- (AT91C_UDP_EPEDS |
- AT91C_UDP_EPTYPE_INT_IN);
- pUDP->UDP_RSTEP |= AT91C_UDP_EP3;
- pUDP->UDP_RSTEP &= ~AT91C_UDP_EP3;
-
- /* free all currently transmitting contexts */
- while (rctx = req_ctx_find_get(0, RCTX_STATE_UDP_EP3_BUSY,
- RCTX_STATE_FREE)) {}
- atomic_set(&upcd.ep[wIndex].pkts_in_transit, 0);
- }
+ reset_ep(wIndex);
udp_ep0_send_zlp();
} else
udp_ep0_send_stall();
@@ -645,10 +722,12 @@ static void udp_ep0_handler(void)
udp_ep0_send_stall();
break;
default:
- DEBUGE("DEFAULT(req=0x%02x, type=0x%02x) ", bRequest, bmRequestType);
+ DEBUGE("DEFAULT(req=0x%02x, type=0x%02x) ",
+ bRequest, bmRequestType);
#ifdef CONFIG_DFU
if ((bmRequestType & 0x3f) == USB_TYPE_DFU) {
- dfu->dfu_ep0_handler(bmRequestType, bRequest, wValue, wLength);
+ dfu->dfu_ep0_handler(bmRequestType, bRequest, wValue,
+ wLength);
} else
#endif
udp_ep0_send_stall();
diff --git a/firmware/src/os/pcd_enumerate.h b/firmware/src/os/pcd_enumerate.h
index 3b95de7..acec89c 100644
--- a/firmware/src/os/pcd_enumerate.h
+++ b/firmware/src/os/pcd_enumerate.h
@@ -7,6 +7,13 @@
#include "openpcd.h"
#include <dfu/dfu.h>
+#define AT91C_EP_OUT 1
+#define AT91C_EP_OUT_SIZE 0x40
+#define AT91C_EP_IN 2
+#define AT91C_EP_IN_SIZE 0x40
+#define AT91C_EP_INT 3
+
+
struct req_ctx;
extern void udp_open(void);
diff --git a/firmware/src/os/req_ctx.c b/firmware/src/os/req_ctx.c
index fef7258..214cad5 100644
--- a/firmware/src/os/req_ctx.c
+++ b/firmware/src/os/req_ctx.c
@@ -28,9 +28,6 @@
/* FIXME: locking, FIFO order processing */
-#define RCTX_SIZE_LARGE 2048
-#define RCTX_SIZE_SMALL 64
-
#define NUM_RCTX_SMALL 8
#define NUM_RCTX_LARGE 3
diff --git a/firmware/src/os/req_ctx.h b/firmware/src/os/req_ctx.h
index b68fb66..535267b 100644
--- a/firmware/src/os/req_ctx.h
+++ b/firmware/src/os/req_ctx.h
@@ -1,6 +1,9 @@
#ifndef _REQ_CTX_H
#define _REQ_CTX_H
+#define RCTX_SIZE_LARGE 2048
+#define RCTX_SIZE_SMALL 64
+
#define MAX_HDRSIZE sizeof(struct openpcd_hdr)
#define MAX_REQSIZE (64-MAX_HDRSIZE)
@@ -32,6 +35,8 @@ struct req_ctx {
#define RCTX_STATE_PIOIRQ_BUSY 0x80
+#define RCTX_STATE_INVALID 0xff
+
extern struct req_ctx *req_ctx_find_get(int large, unsigned long old_state, unsigned long new_state);
extern struct req_ctx *req_ctx_find_busy(void);
extern void req_ctx_set_state(struct req_ctx *ctx, unsigned long new_state);
diff --git a/firmware/src/os/usb_benchmark.c b/firmware/src/os/usb_benchmark.c
index bfc6b37..967efbb 100644
--- a/firmware/src/os/usb_benchmark.c
+++ b/firmware/src/os/usb_benchmark.c
@@ -21,6 +21,7 @@
#include <string.h>
#include <lib_AT91SAM7.h>
#include <os/led.h>
+#include <os/dbgu.h>
#include <os/pcd_enumerate.h>
#include <os/usb_handler.h>
#include <os/req_ctx.h>
@@ -49,18 +50,30 @@ static void usbtest_tx_transfer(unsigned int num_pkts)
static int usbtest_rx(struct req_ctx *rctx)
{
struct openpcd_hdr *poh = (struct openpcd_hdr *) rctx->data;
+ struct req_ctx *rctx_new;
int i;
switch (poh->cmd) {
case OPENPCD_CMD_USBTEST_IN:
+ DEBUGP("USBTEST_IN ");
/* test bulk in pipe */
- for (i = 0; i < poh->reg; i++) {
- usbtest_tx_transfer(poh->val);
- led_toggle(2);
+ if (poh->val > RCTX_SIZE_LARGE/AT91C_EP_OUT_SIZE)
+ poh->val = RCTX_SIZE_LARGE/AT91C_EP_OUT_SIZE;
+ rctx_new = req_ctx_find_get(1, RCTX_STATE_FREE,
+ RCTX_STATE_MAIN_PROCESSING);
+ if (!rctx_new) {
+ DEBUGP("NO RCTX ");
+ return USB_ERR(0);
}
+
+ rctx_new->tot_len = poh->val * AT91C_EP_OUT_SIZE;
+ req_ctx_set_state(rctx_new, RCTX_STATE_UDP_EP2_PENDING);
+ led_toggle(2);
break;
case OPENPCD_CMD_USBTEST_OUT:
+ DEBUGP("USBTEST_IN ");
/* test bulk out pipe */
+ return USB_ERR(USB_ERR_CMD_NOT_IMPL);
break;
}
personal git repositories of Harald Welte. Your mileage may vary