diff options
| -rw-r--r-- | host/usrp_e_utils/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/usrp_e_utils/usrp-e-loopback.c | 170 | ||||
| -rw-r--r-- | host/usrp_e_utils/usrp-e-timed.c | 382 |
3 files changed, 489 insertions, 64 deletions
diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt index 5123af592..1ecd2ac46 100644 --- a/host/usrp_e_utils/CMakeLists.txt +++ b/host/usrp_e_utils/CMakeLists.txt @@ -34,6 +34,7 @@ IF(ENABLE_USRP_E_UTILS) SET(usrp_e_utils_sources usrp-e-utility.cpp usrp-e-loopback.c + usrp-e-timed.c usrp-e-wb-test.cpp usrp-e-debug-pins.c usrp-e-i2c.c diff --git a/host/usrp_e_utils/usrp-e-loopback.c b/host/usrp_e_utils/usrp-e-loopback.c index 454d81ba7..a63882475 100644 --- a/host/usrp_e_utils/usrp-e-loopback.c +++ b/host/usrp_e_utils/usrp-e-loopback.c @@ -1,14 +1,18 @@ #include <stdio.h> +#include <string.h> #include <sys/types.h> +#include <sys/ioctl.h> #include <fcntl.h> #include <pthread.h> #include <stdlib.h> #include <unistd.h> #include <stddef.h> #include <sys/mman.h> -#include <linux/usrp_e.h> +#include <sys/time.h> +#include <poll.h> +#include "linux/usrp_e.h" -#define MAX_PACKET_SIZE 1016 +// max length #define PKT_DATA_LENGTH 1016 static int packet_data_length; static int error; @@ -16,34 +20,16 @@ struct pkt { int len; int checksum; int seq_num; - short data[]; + short data[1024-6]; }; -static int length_array[2048]; -static int length_array_tail = 0; -static int length_array_head = 0; - -pthread_mutex_t length_array_mutex; //gotta lock the index to keep it from getting hosed - -//yes this is a circular buffer that does not check empty -//no i don't want to hear about it -void push_length_array(int length) { - pthread_mutex_lock(&length_array_mutex); - if(length_array_tail > 2047) length_array_tail = 0; - length_array[length_array_tail++] = length; - pthread_mutex_unlock(&length_array_mutex); -} - -int pop_length_array(void) { - int retval; - pthread_mutex_lock(&length_array_mutex); - if(length_array_head > 2047) length_array_head = 0; - retval = length_array[length_array_head++]; - pthread_mutex_unlock(&length_array_mutex); - return retval; -} +struct ring_buffer_info (*rxi)[]; +struct ring_buffer_info (*txi)[]; +struct pkt (*rx_buf)[200]; +struct pkt (*tx_buf)[200]; static int fp; +static struct usrp_e_ring_buffer_size_t rb_size; static int calc_checksum(struct pkt *p) { @@ -53,43 +39,56 @@ static int calc_checksum(struct pkt *p) sum = 0; for (i=0; i < p->len; i++) - sum ^= p->data[i]; + sum += p->data[i]; - sum ^= p->seq_num; - sum ^= p->len; + sum += p->seq_num; + sum += p->len; return sum; } static void *read_thread(void *threadid) { - char *rx_data; int cnt, prev_seq_num, pkt_count, seq_num_failure; struct pkt *p; unsigned long bytes_transfered, elapsed_seconds; struct timeval start_time, finish_time; - int expected_count; + int rb_read; printf("Greetings from the reading thread!\n"); + printf("sizeof pkt = %d\n", sizeof(struct pkt)); + + rb_read = 0; bytes_transfered = 0; gettimeofday(&start_time, NULL); - // IMPORTANT: must assume max length packet from fpga - rx_data = malloc(2048); - p = (struct pkt *) ((void *)rx_data); - prev_seq_num = 0; pkt_count = 0; seq_num_failure = 0; while (1) { - cnt = read(fp, rx_data, 2048); - if (cnt < 0) - printf("Error returned from read: %d, sequence number = %d\n", cnt, p->seq_num); + if (!((*rxi)[rb_read].flags & RB_USER)) { +// printf("Waiting for data\n"); + struct pollfd pfd; + pfd.fd = fp; + pfd.events = POLLIN; + poll(&pfd, 1, -1); + } + + (*rxi)[rb_read].flags = RB_USER_PROCESS; -// printf("p->seq_num = %d\n", p->seq_num); +// printf("pkt received, rb_read = %d\n", rb_read); + + cnt = (*rxi)[rb_read].len; + p = &(*rx_buf)[rb_read]; + +// cnt = read(fp, rx_data, 2048); +// if (cnt < 0) +// printf("Error returned from read: %d, sequence number = %d\n", cnt, p->seq_num); + +// printf("p = %X, p->seq_num = %d p->len = %d\n", p, p->seq_num, p->len); pkt_count++; @@ -97,17 +96,14 @@ static void *read_thread(void *threadid) if (p->seq_num != prev_seq_num + 1) { printf("Sequence number fail, current = %d, previous = %d, pkt_count = %d\n", p->seq_num, prev_seq_num, pkt_count); + printf("pkt received, rb_read = %d\n", rb_read); + printf("p = %p, p->seq_num = %d p->len = %d\n", p, p->seq_num, p->len); seq_num_failure ++; if (seq_num_failure > 2) error = 1; } - expected_count = pop_length_array()*2+12; - if(cnt != expected_count) { - printf("Received %d bytes, expected %d\n", cnt, expected_count); - } - prev_seq_num = p->seq_num; if (calc_checksum(p) != p->checksum) { @@ -116,6 +112,12 @@ static void *read_thread(void *threadid) error = 1; } + (*rxi)[rb_read].flags = RB_KERNEL; + + rb_read++; + if (rb_read == rb_size.num_rx_frames) + rb_read = 0; + bytes_transfered += cnt; if (bytes_transfered > (100 * 1000000)) { @@ -135,12 +137,12 @@ static void *read_thread(void *threadid) // fflush(stdout); // printf("\n"); } - + return NULL; } static void *write_thread(void *threadid) { - int seq_number, i, cnt; + int seq_number, i, cnt, rb_write; void *tx_data; struct pkt *p; @@ -154,6 +156,7 @@ static void *write_thread(void *threadid) p->data[i] = i; seq_number = 1; + rb_write = 0; while (1) { p->seq_num = seq_number++; @@ -161,30 +164,46 @@ static void *write_thread(void *threadid) if (packet_data_length > 0) p->len = packet_data_length; else - p->len = (random()<<1 & 0x1ff) + (1004 - 512); - - push_length_array(p->len); + p->len = (random() & 0x1ff) + (1004 - 512); p->checksum = calc_checksum(p); - cnt = write(fp, tx_data, p->len * 2 + 12); - if (cnt < 0) - printf("Error returned from write: %d\n", cnt); + if (!((*txi)[rb_write].flags & RB_KERNEL)) { +// printf("Waiting for space\n"); + struct pollfd pfd; + pfd.fd = fp; + pfd.events = POLLOUT; + poll(&pfd, 1, -1); + } + + memcpy(&(*tx_buf)[rb_write], tx_data, p->len * 2 + 12); + + (*txi)[rb_write].len = p->len * 2 + 12; + (*txi)[rb_write].flags = RB_USER; + + rb_write++; + if (rb_write == rb_size.num_tx_frames) + rb_write = 0; + + cnt = write(fp, NULL, 0); +// if (cnt < 0) +// printf("Error returned from write: %d\n", cnt); // sleep(1); } + return NULL; } int main(int argc, char *argv[]) { pthread_t tx, rx; - pthread_mutex_init(&length_array_mutex, 0); - long int t; + long int t = 0; struct sched_param s = { .sched_priority = 1 }; + int ret, map_size, page_size; void *rb; - struct usrp_transfer_frame *tx_rb, *rx_rb; + struct usrp_e_ctl16 d; if (argc < 2) { printf("%s data_size\n", argv[0]); @@ -192,22 +211,43 @@ int main(int argc, char *argv[]) } packet_data_length = atoi(argv[1]); - if(packet_data_length > MAX_PACKET_SIZE) { - printf("Packet size must be smaller than %i\n", MAX_PACKET_SIZE); - exit(-1); - } fp = open("/dev/usrp_e0", O_RDWR); printf("fp = %d\n", fp); - rb = mmap(0, 202 * 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0); - if (!rb) { - printf("mmap failed\n"); - exit; + d.offset = 14; + d.count = 1; + d.buf[0] = (1<<8) | (1<<9); + ioctl(fp, USRP_E_WRITE_CTL16, &d); + + page_size = getpagesize(); + + ret = ioctl(fp, USRP_E_GET_RB_INFO, &rb_size); + + map_size = (rb_size.num_pages_rx_flags + rb_size.num_pages_tx_flags) * page_size + + (rb_size.num_rx_frames + rb_size.num_tx_frames) * (page_size >> 1); + + rb = mmap(0, map_size, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0); + if (rb == MAP_FAILED) { + perror("mmap failed"); + return -1; } + printf("rb = %p\n", rb); + + rxi = rb; + rx_buf = rb + (rb_size.num_pages_rx_flags * page_size); + txi = rb + (rb_size.num_pages_rx_flags * page_size) + + (rb_size.num_rx_frames * page_size >> 1); + tx_buf = rb + (rb_size.num_pages_rx_flags * page_size) + + (rb_size.num_rx_frames * page_size >> 1) + + (rb_size.num_pages_tx_flags * page_size); + + printf("rxi = %p, rx_buf = %p, txi = %p, tx_buf = %p\n", rxi, rx_buf, txi, tx_buf); + + if ((ret = sched_setscheduler(0, SCHED_RR, &s))) + perror("sched_setscheduler"); - sched_setscheduler(0, SCHED_RR, &s); error = 0; #if 1 @@ -228,4 +268,6 @@ int main(int argc, char *argv[]) sleep(1000000000); printf("Done sleeping\n"); + + return 0; } diff --git a/host/usrp_e_utils/usrp-e-timed.c b/host/usrp_e_utils/usrp-e-timed.c new file mode 100644 index 000000000..06dfdf512 --- /dev/null +++ b/host/usrp_e_utils/usrp-e-timed.c @@ -0,0 +1,382 @@ +#include <stdio.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/ioctl.h> +#include <string.h> +#include <fcntl.h> +#include <pthread.h> +#include <stdlib.h> +#include <unistd.h> +#include <stddef.h> +#include <poll.h> +#include <sys/mman.h> +#include "linux/usrp_e.h" + +// max length #define PKT_DATA_LENGTH 1016 +static int packet_data_length; + +struct ring_buffer_info (*rxi)[]; +struct ring_buffer_info (*txi)[]; +__u8 *rx_buf; +__u8 *tx_buf; +static struct usrp_e_ring_buffer_size_t rb_size; + +static int fp; +static u_int32_t crc_tab[256]; + +// CRC code from http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx +// GPLv2 + +static u_int32_t chksum_crc32_gentab(void) +{ + unsigned long crc, poly; + unsigned long i, j; + + poly = 0x04C11DB7L; + + for (i = 0; i < 256; i++) { + crc = i; + for (j = 8; j > 0; j--) { + if (crc & 1) { + crc = (crc >> 1) ^ poly; + } else { + crc >>= 1; + } + } + crc_tab[i] = crc; +// printf("crc_tab[%d] = %X\n", i , crc); + } + + return 0; +} + +struct timeval delta_time(struct timeval f, struct timeval s) +{ + struct timeval d; + + if (f.tv_usec > s.tv_usec) { + d.tv_usec = f.tv_usec - s.tv_usec; + d.tv_sec = f.tv_sec - s.tv_sec; + } else { + d.tv_usec = f.tv_usec - s.tv_usec + 1e6; + d.tv_sec = f.tv_sec - s.tv_sec - 1; + } + + return d; +} + + +static void *read_thread(void *threadid) +{ + unsigned int cnt; + int rx_pkt_cnt, rb_read; + unsigned int i; + unsigned long crc, ck_sum; + unsigned int rx_crc, pkt_len, pkt_seq; + unsigned long bytes_transfered; + struct timeval start_time; + unsigned int prev_seq = 0; + int first = 1; + long tid; + __u8 *p; + + + tid = (long)threadid; + printf("Greetings from the reading thread(%ld)!\n", tid); + + // IMPORTANT: must assume max length packet from fpga + + rx_pkt_cnt = 0; + rb_read = 0; + + bytes_transfered = 0; + gettimeofday(&start_time, NULL); + + while (1) { + + while (!((*rxi)[rb_read].flags & RB_USER)) { + struct pollfd pfd; + pfd.fd = fp; + pfd.events = POLLIN; + poll(&pfd, 1, -1); + } + (*rxi)[rb_read].flags = RB_USER_PROCESS; + + rx_pkt_cnt++; + cnt = (*rxi)[rb_read].len; + p = rx_buf + (rb_read * 2048); + + rx_crc = *(int *) &p[cnt-4]; + crc = 0xFFFFFFFF; + ck_sum = 0; + + pkt_len = *(unsigned int *) &p[0]; + pkt_seq = *(unsigned int *) &p[4]; + +// printf("Pkt len = %X, pkt seq = %X, driver len = %X\n", pkt_len, pkt_seq, cnt); + + if (pkt_len != (cnt - 4)) + printf("Packet length check fail, driver len = %ud, content = %ud\n", + cnt, pkt_len); + + if (!first && (pkt_seq != (prev_seq + 1))) + printf("Sequence number check fail, pkt_seq = %ud, prev_seq = %ud\n", + pkt_seq, prev_seq); + first = 0; + prev_seq = pkt_seq; + + for (i = 0; i < cnt-4; i++) { + ck_sum += p[i]; + + crc = ((crc >> 8) & 0x00FFFFFF) ^ + crc_tab[(crc ^ p[i]) & 0xFF]; +//printf("idx = %d, data = %X, crc = %X, ck_sum = %X\n", i, p[i], crc, ck_sum); +// crc = ((crc >> 8) & 0x00FFFFFF) ^ +// crc_tab[(crc ^ p[i+1]) & 0xFF]; +//printf("idx = %d, data = %X, crc = %X\n", i, p[i+1],crc); + } + + (*rxi)[rb_read].flags = RB_KERNEL; + write(fp, NULL, 1); + + if (rx_crc != ck_sum) + printf("Ck_sum eror, calc ck_sum = %lX, rx ck_sum = %X\n", + ck_sum, rx_crc); + +#if 0 + if (rx_crc != (crc & 0xFFFFFFFF)) { + printf("CRC Error, calc crc: %X, rx_crc: %X\n", + (crc & 0xFFFFFFFF), rx_crc); + } +#endif + + rb_read++; + if (rb_read == rb_size.num_rx_frames) + rb_read = 0; + + bytes_transfered += cnt; + + if (bytes_transfered > (100 * 1000000)) { + struct timeval finish_time, d_time; + float elapsed_seconds; + + gettimeofday(&finish_time, NULL); + + printf("sec = %ld, usec = %ld\n", finish_time.tv_sec, finish_time.tv_usec); + + d_time = delta_time(finish_time, start_time); + + elapsed_seconds = (float)d_time.tv_sec + ((float)d_time.tv_usec * 1e-6f); + + printf("Bytes transfered = %ld, elapsed seconds = %f\n", bytes_transfered, elapsed_seconds); + printf("RX data transfer rate = %f K Samples/second\n", + (float) bytes_transfered / (float) elapsed_seconds / 4000); + + + start_time = finish_time; + bytes_transfered = 0; + } + } + return NULL; +} + +static void *write_thread(void *threadid) +{ + int i, tx_pkt_cnt, rb_write; + int tx_len; + unsigned long crc; + unsigned long bytes_transfered; + struct timeval start_time; + unsigned int pkt_seq = 0; + long tid; + __u8 *p; + + tid = (long)threadid; + printf("Greetings from the write thread(%ld)!\n", tid); + + rb_write = 0; + tx_pkt_cnt = 0; + + bytes_transfered = 0; + gettimeofday(&start_time, NULL); + + while (1) { + + tx_pkt_cnt++; + p = tx_buf + (rb_write * 2048); + +// printf("p = %p\n", p); + + if (packet_data_length > 0) + tx_len = packet_data_length; + else + tx_len = (random() & 0x1ff) + (2044 - 512); + +#if 0 + if (tx_pkt_cnt == 512) { + printf("."); + fflush(stdout); + } + if (tx_pkt_cnt == 1024) { + printf("'"); + fflush(stdout); + } + if (tx_pkt_cnt == 1536) { + printf(":"); + fflush(stdout); + tx_pkt_cnt = 0; + } +#endif + +// printf("Checking for space at rb entry = %d\n", rb_write); + while (!((*txi)[rb_write].flags & RB_KERNEL)) { + struct pollfd pfd; + pfd.fd = fp; + pfd.events = POLLOUT; + poll(&pfd, 1, -1); + } +// printf("Got space\n"); + + for (i=8; i < tx_len-4; i++) { + p[i] = i & 0xFF; + } + + *(unsigned int *) &p[0] = tx_len-4; + *(unsigned int *) &p[4] = pkt_seq; + + pkt_seq++; + + crc = 0xFFFFFFFF; + for (i = 0; i < tx_len-4; i++) { +// printf("%X ", p[i]); + crc = ((crc >> 8) & 0x00FFFFFF) ^ + crc_tab[(crc ^ p[i]) & 0xFF]; + + } + *(unsigned int *) &p[tx_len-4] = crc; +// printf("\n crc = %lX\n", crc); + + (*txi)[rb_write].len = tx_len; + (*txi)[rb_write].flags = RB_USER; + + rb_write++; + if (rb_write == rb_size.num_tx_frames) + rb_write = 0; + + bytes_transfered += tx_len; + + if (bytes_transfered > (100 * 1000000)) { + struct timeval finish_time, d_time; + float elapsed_seconds; + + gettimeofday(&finish_time, NULL); + + d_time = delta_time(finish_time, start_time); + + elapsed_seconds = (float)d_time.tv_sec - ((float)d_time.tv_usec * 1e-6f); + + printf("Bytes transfered = %ld, elapsed seconds = %f\n", bytes_transfered, elapsed_seconds); + printf("TX data transfer rate = %f K Samples/second\n", + (float) bytes_transfered / (float) elapsed_seconds / 4000); + + + start_time = finish_time; + bytes_transfered = 0; + } + +// sleep(1); + } + return NULL; +} + + +int main(int argc, char *argv[]) +{ + pthread_t tx, rx; + long int t=0; + int fpga_config_flag ,decimation; + int ret, map_size, page_size; + void *rb; + + struct usrp_e_ctl16 d; + struct sched_param s = { + .sched_priority = 1 + }; + + if (argc < 4) { + printf("%s r|w|rw decimation data_size\n", argv[0]); + return -1; + } + + chksum_crc32_gentab(); + + decimation = atoi(argv[2]); + packet_data_length = atoi(argv[3]); + + fp = open("/dev/usrp_e0", O_RDWR); + printf("fp = %d\n", fp); + + page_size = getpagesize(); + + ret = ioctl(fp, USRP_E_GET_RB_INFO, &rb_size); + + map_size = (rb_size.num_pages_rx_flags + rb_size.num_pages_tx_flags) * page_size + + (rb_size.num_rx_frames + rb_size.num_tx_frames) * (page_size >> 1); + + rb = mmap(0, map_size, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0); + if (rb == MAP_FAILED) { + perror("mmap failed"); + return -1; + } + + printf("rb = %p\n", rb); + + rxi = rb; + rx_buf = rb + (rb_size.num_pages_rx_flags * page_size); + txi = rb + (rb_size.num_pages_rx_flags * page_size) + + (rb_size.num_rx_frames * page_size >> 1); + tx_buf = rb + (rb_size.num_pages_rx_flags * page_size) + + (rb_size.num_rx_frames * page_size >> 1) + + (rb_size.num_pages_tx_flags * page_size); + + fpga_config_flag = (1<<8); + if (strcmp(argv[1], "w") == 0) + fpga_config_flag |= (1 << 11); + else if (strcmp(argv[1], "r") == 0) + fpga_config_flag |= (1 << 10); + else if (strcmp(argv[1], "rw") == 0) + fpga_config_flag |= ((1 << 10) | (1 << 11)); + + fpga_config_flag |= decimation; + + d.offset = 14; + d.count = 1; + d.buf[0] = fpga_config_flag; + ioctl(fp, USRP_E_WRITE_CTL16, &d); + + sleep(1); // in case the kernel threads need time to start. FIXME if so + + sched_setscheduler(0, SCHED_RR, &s); + + if (fpga_config_flag & (1 << 10)) { + if (pthread_create(&rx, NULL, read_thread, (void *) t)) { + printf("Failed to create rx thread\n"); + exit(-1); + } + } + + sleep(1); + + if (fpga_config_flag & (1 << 11)) { + if (pthread_create(&tx, NULL, write_thread, (void *) t)) { + printf("Failed to create tx thread\n"); + exit(-1); + } + } + + sleep(10000); + + printf("Done sleeping\n"); + + return 0; +} |