Skip to content

Multidevice xvc server #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
derrickgw wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Multidevice xvc server #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
180d1ce
Allow device node to be passed in as an argument
derrickgw Jan 30, 2020
9ed248d
Add tcl commands to start hw_server
derrickgw Jan 31, 2020
8210960
Fix bug when shifting 19-31 bits
derrickgw Feb 7, 2020
1937815
Fix "listen()" call for new kernels
derrickgw Feb 7, 2020
80709b9
Fix compiler warings
derrickgw Feb 8, 2020
a4eb680
Improve verbose messages
derrickgw Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/user/verify_xilinx_xvc_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@

#include "xvc_ioctl.h"

static const char char_path[] = "/dev/xilinx_xvc_driver";

#define BYTE_ALIGN(a) ((a + 7) / 8)
#define MIN(a, b) (a < b ? a : b)
#define MAX(a, b) (a > b ? a : b)
Expand Down Expand Up @@ -157,11 +155,17 @@ int main(int argc, char **argv)
unsigned test_lens[] = {32, 0};
unsigned test_index = 0;

if (argc < 2)
{
fprintf(stderr, "Error: supply the device name as an argument\n");
return -1;
}

// try opening the driver
fd = open(char_path, O_RDWR | O_SYNC);
fd = open(argv[1], O_RDWR | O_SYNC);
if (fd <= 0)
{
printf("Could not open driver at %s\n", char_path);
printf("Could not open driver at %s\n", argv[1]);
printf("Error: %s\n", strerror(errno));
return 0;
}
Expand Down
102 changes: 51 additions & 51 deletions src/user/xvcServer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ typedef struct {
#else /* USE_IOCTL */
#include <sys/ioctl.h>
#include "xvc_ioctl.h"
#define CHAR_DEV_PATH "/dev/xilinx_xvc_driver"
#endif /* !USE_IOCTL */

static int verbose = 0;

#define XVC_PORT 2542

static int sread(int fd, void *target, int len) {
unsigned char *t = target;
unsigned char *t = (unsigned char*)target;
while (len) {
int r = read(fd, t, len);
if (r <= 0)
Expand All @@ -60,7 +59,7 @@ int handle_data(int fd, volatile jtag_t* ptr) {
int handle_data(int fd, int fd_ioctl) {
#endif /* !USE_IOCTL */
char xvcInfo[32];
unsigned int bufferSize = 2048;
unsigned int bufferSize = 4096;

sprintf(xvcInfo, "xvcServer_v1.0:%u\n", bufferSize);

Expand All @@ -73,15 +72,16 @@ int handle_data(int fd, int fd_ioctl) {
return 1;

if (memcmp(cmd, "ge", 2) == 0) {
int len = strlen(xvcInfo);
if (sread(fd, cmd, 6) != 1)
return 1;
memcpy(result, xvcInfo, strlen(xvcInfo));
if (write(fd, result, strlen(xvcInfo)) != strlen(xvcInfo)) {
memcpy(result, xvcInfo, len);
if (write(fd, result, len) != len) {
perror("write");
return 1;
}
if (verbose) {
printf("%u : Received command: 'getinfo'\n", (int)time(NULL));
printf("%u : Received command: 'getinfo'", (int)time(NULL));
printf("\t Replied with %s\n", xvcInfo);
}
break;
Expand All @@ -94,15 +94,15 @@ int handle_data(int fd, int fd_ioctl) {
return 1;
}
if (verbose) {
printf("%u : Received command: 'settck'\n", (int)time(NULL));
printf("%u : Received command: 'settck'", (int)time(NULL));
printf("\t Replied with '%.*s'\n\n", 4, cmd + 5);
}
break;
} else if (memcmp(cmd, "sh", 2) == 0) {
if (sread(fd, cmd, 4) != 1)
return 1;
if (verbose) {
printf("%u : Received command: 'shift'\n", (int)time(NULL));
printf("%u : Received command: 'shift'\t", (int)time(NULL));
}
} else {
fprintf(stderr, "invalid cmd '%s'\n", cmd);
Expand All @@ -115,7 +115,7 @@ int handle_data(int fd, int fd_ioctl) {
return 1;
}

int nr_bytes = (len + 7) / 8;
unsigned int nr_bytes = (len + 7) / 8;
if (nr_bytes * 2 > sizeof(buffer)) {
fprintf(stderr, "buffer size exceeded\n");
return 1;
Expand All @@ -128,9 +128,8 @@ int handle_data(int fd, int fd_ioctl) {
memset(result, 0, nr_bytes);

if (verbose) {
printf("\tNumber of Bits : %d\n", len);
printf("\tNumber of Bits : %d\t", len);
printf("\tNumber of Bytes : %d \n", nr_bytes);
printf("\n");
}

#ifndef USE_IOCTL
Expand All @@ -148,7 +147,7 @@ int handle_data(int fd, int fd_ioctl) {
tdi = 0;
tdo = 0;

if (bytesLeft < 4) {
if (bytesLeft <= 4) {
shift_num_bits = bitsLeft;
}
shift_num_bytes = (shift_num_bits + 7) / 8;
Expand All @@ -172,10 +171,11 @@ int handle_data(int fd, int fd_ioctl) {
byteIndex += shift_num_bytes;

if (verbose) {
printf("LEN : 0x%08x\n", shift_num_bits);
printf("TMS : 0x%08x\n", tms);
printf("TDI : 0x%08x\n", tdi);
printf("TDO : 0x%08x\n", tdo);
int mask = (1 << shift_num_bits) - 1;
printf("LEN : %8d\t", shift_num_bits);
printf("TMS : 0x%08x\t", tms);
printf("TDI : 0x%08x\t", tdi);
printf("TDO : 0x%08x\n", tdo & mask);
}
}
#else /* USE_IOCTL */
Expand All @@ -193,10 +193,14 @@ int handle_data(int fd, int fd_ioctl) {
return errsv;
}
#endif /* !USE_IOCTL */
if (write(fd, result, nr_bytes) != nr_bytes) {
if (write(fd, result, nr_bytes) != (int)nr_bytes) {
perror("write");
return 1;
}

if (verbose) {
printf("\n");
}
} while (1);

/* Note: Need to fix JTAG state updates, until then no exit is allowed */
Expand All @@ -214,7 +218,6 @@ void display_driver_properties(int fd_ioctl) {
return;
}

printf("INFO: XVC driver character file: %s\n", CHAR_DEV_PATH);
printf("INFO: debug_bridge base address: 0x%lX\n", props.debug_bridge_base_addr);
printf("INFO: debug_bridge size: 0x%lX\n", props.debug_bridge_size);
printf("INFO: debug_bridge device tree compatibility string: %s\n\n", props.debug_bridge_compat_string);
Expand All @@ -227,47 +230,41 @@ int main(int argc, char **argv) {
int c;
struct sockaddr_in address;
char hostname[256];

#ifndef USE_IOCTL
int fd_uio;
volatile jtag_t* ptr = NULL;

fd_uio = open(UIO_PATH, O_RDWR);
if (fd_uio < 1) {
fprintf(stderr, "Failed to open uio: %s\n", UIO_PATH);
return -1;
}

ptr = (volatile jtag_t*) mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd_uio, 0);
if (ptr == MAP_FAILED) {
fprintf(stderr, "MMAP Failed\n");
return -1;
}
close(fd_uio);
#else /* USE_IOCTL */
int fd_ioctl;

fd_ioctl = open(CHAR_DEV_PATH, O_RDWR | O_SYNC);
if (fd_ioctl < 1) {
fprintf(stderr, "Failed to open xvc ioctl device driver: %s\n", CHAR_DEV_PATH);
return -1;
}

display_driver_properties(fd_ioctl);
#endif /* !USE_IOCTL */
char *device_name = NULL;

opterr = 0;

while ((c = getopt(argc, argv, "v")) != -1) {
switch (c) {
case 'v':
verbose = 1;
printf("Enable verbose mode\n");
break;
case '?':
fprintf(stderr, "usage: %s [-v]\n", *argv);
fprintf(stderr, "usage: %s [-v] device_node\n", *argv);
return 1;
}
}
for (int index = optind; index < argc; index++)
device_name = argv[index];

int fd_dev = open(device_name, O_RDWR);
if (fd_dev < 1) {
fprintf(stderr, "Failed to open device: %s\n", device_name);
return -1;
}

#ifndef USE_IOCTL
volatile jtag_t* ptr = NULL;
ptr = (volatile jtag_t*) mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd_dev, 0);
if (ptr == MAP_FAILED) {
fprintf(stderr, "MMAP Failed\n");
return -1;
}
close(fd_dev);
#else /* USE_IOCTL */
display_driver_properties(fd_dev);
#endif /* !USE_IOCTL */

s = socket(AF_INET, SOCK_STREAM, 0);

Expand All @@ -288,7 +285,7 @@ int main(int argc, char **argv) {
return 1;
}

if (listen(s, 0) < 0) {
if (listen(s, 1) < 0) {
perror("listen");
return 1;
}
Expand All @@ -299,7 +296,10 @@ int main(int argc, char **argv) {
return 1;
}

printf("INFO: To connect to this xvcServer instance, use url: TCP:%s:%u\n\n", hostname, XVC_PORT);
printf("INFO: To connect to this xvcServer instance, use url: %s:%u\n", hostname, XVC_PORT);
printf("INFO: e.g. tcl:\n");
printf("connect_hw_server -url localhost:3121 -allow_non_jtag\n");
printf("open_hw_target -xvc_url %s:%u\n\n", hostname, XVC_PORT);

fd_set conn;
int maxfd = 0;
Expand Down Expand Up @@ -343,7 +343,7 @@ int main(int argc, char **argv) {
#ifndef USE_IOCTL
} else if (handle_data(fd, ptr)) {
#else /* USE_IOCTL */
} else if (handle_data(fd, fd_ioctl)) {
} else if (handle_data(fd, fd_dev)) {
#endif /* !USE_IOCTL */
printf("connection closed - fd %d\n", fd);
close(fd);
Expand All @@ -362,7 +362,7 @@ int main(int argc, char **argv) {
#ifndef USE_IOCTL
munmap((void *) ptr, MAP_SIZE);
#else /* USE_IOCTL */
close(fd_ioctl);
close(fd_dev);
#endif /* !USE_IOCTL */

return 0;
Expand Down