Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly sending the ethernet frame on a mismatch. Now just need to get vivado to actually trigger.

Browse Source
This commit is contained in:
Ross Thompson 2024-07-09 14:16:13 -05:00
parent fd170a6583
commit e488ee7225
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fpga/rvvidaemon/rvvidaemon.c
View File

@ -71,6 +71,7 @@ struct sockaddr_ll socket_address;
uint8_t sendbuf[BUF_SIZ]; uint8_t sendbuf[BUF_SIZ];
struct ether_header *sendeh = (struct ether_header *) sendbuf; struct ether_header *sendeh = (struct ether_header *) sendbuf;
int tx_len = 0; int tx_len = 0;
int sockfd;
typedef struct { typedef struct {
uint64_t PC; uint64_t PC;
@ -131,7 +132,6 @@ int main(int argc, char **argv){
/* fputs("refresh_hw_device [lindex [get_hw_devices xc7a100t_0] 0]\n", VivadoPipeFP); */ /* fputs("refresh_hw_device [lindex [get_hw_devices xc7a100t_0] 0]\n", VivadoPipeFP); */
/* fputs("[get_hw_devices xc7a100t_0] -filter {CELL_NAME=~\"u_ila_0\"}]]\n", VivadoPipeFP); */ /* fputs("[get_hw_devices xc7a100t_0] -filter {CELL_NAME=~\"u_ila_0\"}]]\n", VivadoPipeFP); */
int sockfd;
uint8_t buf[BUF_SIZ]; uint8_t buf[BUF_SIZ];
int sockopt; int sockopt;
struct ifreq ifopts; /* set promiscuous mode */ struct ifreq ifopts; /* set promiscuous mode */
@ -224,7 +224,7 @@ int main(int argc, char **argv){
} }
printf("\n"); printf("\n");
printf("sockfd %x\n", sockfd); printf("sockfd %x\n", sockfd);
// eventually we want to put the elffiles here // eventually we want to put the elffiles here
rvviRefInit(NULL); rvviRefInit(NULL);
rvviRefPcSet(0, 0x1000); rvviRefPcSet(0, 0x1000);
@ -342,6 +342,13 @@ int state_compare(int hart, uint64_t Minstret){
} }
if (result == 0) { if (result == 0) {
/* Send packet */
if (sendto(sockfd, sendbuf, tx_len, 0, (struct sockaddr*)&socket_address, sizeof(struct sockaddr_ll)) < 0){
printf("Send failed\n");
}else {
printf("send success!\n");
}
sprintf(buf, "MISMATCH @ instruction # %ld\n", Minstret); sprintf(buf, "MISMATCH @ instruction # %ld\n", Minstret);
idvMsgError(buf); idvMsgError(buf);
/* fputs("run_hw_ila [get_hw_ilas -of_objects [get_hw_devices xc7a100t_0] -filter {CELL_NAME=~\"u_ila_0\"}] -trigger_now\n", VivadoPipeFP); */ /* fputs("run_hw_ila [get_hw_ilas -of_objects [get_hw_devices xc7a100t_0] -filter {CELL_NAME=~\"u_ila_0\"}] -trigger_now\n", VivadoPipeFP); */

39
fpga/rvvidaemon/send-copy.c
View File

@ -15,6 +15,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <net/if.h> #include <net/if.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <unistd.h>
#define DEST_MAC0 0x43 #define DEST_MAC0 0x43
#define DEST_MAC1 0x68 #define DEST_MAC1 0x68
@ -23,8 +24,16 @@
#define DEST_MAC4 0x02 #define DEST_MAC4 0x02
#define DEST_MAC5 0x45 #define DEST_MAC5 0x45
#define SRC_MAC0 0x54
#define SRC_MAC1 0x16
#define SRC_MAC2 0x00
#define SRC_MAC3 0x00
#define SRC_MAC4 0x54
#define SRC_MAC5 0x8F
#define DEFAULT_IF "eth0" #define DEFAULT_IF "eth0"
#define BUF_SIZ 1024 #define BUF_SIZ 1024
#define ETHER_TYPE 0x5c00 // The type defined in packetizer.sv
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -45,7 +54,8 @@ int main(int argc, char *argv[])
strcpy(ifName, DEFAULT_IF); strcpy(ifName, DEFAULT_IF);
/* Open RAW socket to send on */ /* Open RAW socket to send on */
if ((sockfd = socket(AF_PACKET, SOCK_RAW, IPPROTO_RAW)) == -1) { //if ((sockfd = socket(AF_PACKET, SOCK_RAW, IPPROTO_RAW)) == -1) {
if ((sockfd = socket(AF_PACKET, SOCK_RAW, htons(ETHER_TYPE))) == -1) {
perror("socket"); perror("socket");
} }
@ -63,12 +73,18 @@ int main(int argc, char *argv[])
/* Construct the Ethernet header */ /* Construct the Ethernet header */
memset(sendbuf, 0, BUF_SIZ); memset(sendbuf, 0, BUF_SIZ);
/* Ethernet header */ /* Ethernet header */
eh->ether_shost[0] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[0]; /* eh->ether_shost[0] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[0]; */
eh->ether_shost[1] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[1]; /* eh->ether_shost[1] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[1]; */
eh->ether_shost[2] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[2]; /* eh->ether_shost[2] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[2]; */
eh->ether_shost[3] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[3]; /* eh->ether_shost[3] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[3]; */
eh->ether_shost[4] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[4]; /* eh->ether_shost[4] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[4]; */
eh->ether_shost[5] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[5]; /* eh->ether_shost[5] = ((uint8_t *)&if_mac.ifr_hwaddr.sa_data)[5]; */
eh->ether_shost[0] = SRC_MAC0;
eh->ether_shost[1] = SRC_MAC1;
eh->ether_shost[2] = SRC_MAC2;
eh->ether_shost[3] = SRC_MAC3;
eh->ether_shost[4] = SRC_MAC4;
eh->ether_shost[5] = SRC_MAC5;
eh->ether_dhost[0] = DEST_MAC0; eh->ether_dhost[0] = DEST_MAC0;
eh->ether_dhost[1] = DEST_MAC1; eh->ether_dhost[1] = DEST_MAC1;
eh->ether_dhost[2] = DEST_MAC2; eh->ether_dhost[2] = DEST_MAC2;
@ -76,7 +92,8 @@ int main(int argc, char *argv[])
eh->ether_dhost[4] = DEST_MAC4; eh->ether_dhost[4] = DEST_MAC4;
eh->ether_dhost[5] = DEST_MAC5; eh->ether_dhost[5] = DEST_MAC5;
/* Ethertype field */ /* Ethertype field */
eh->ether_type = htons(ETH_P_IP); //eh->ether_type = htons(ETH_P_IP);
eh->ether_type = htons(ETHER_TYPE);
tx_len += sizeof(struct ether_header); tx_len += sizeof(struct ether_header);
/* Packet data */ /* Packet data */
@ -103,10 +120,14 @@ int main(int argc, char *argv[])
printf("%02hhx ", sendbuf[i]); printf("%02hhx ", sendbuf[i]);
} }
printf("\n"); printf("\n");
printf("sockfd %x\n", sockfd);
/* Send packet */ /* Send packet */
if (sendto(sockfd, sendbuf, tx_len, 0, (struct sockaddr*)&socket_address, sizeof(struct sockaddr_ll)) < 0) if (sendto(sockfd, sendbuf, tx_len, 0, (struct sockaddr*)&socket_address, sizeof(struct sockaddr_ll)) < 0){
printf("Send failed\n"); printf("Send failed\n");
}else {
printf("send success!\n"); printf("send success!\n");
}
close(sockfd);
return 0; return 0;
} }