Skip to content

W
White Rabbit core collection
Commit adcb8584 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

sim: update minic driver for receiving frames

parent 89e028ef
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 61 deletions
sim/drivers/simdrv_minic.svh
View file @ adcb8584
...@@ -37,7 +37,7 @@ class CSimDrv_Minic; ...@@ -37,7 +37,7 @@ class CSimDrv_Minic;
function new(CBusAccessor regs_, uint32_t base_regs_); function new(CBusAccessor regs_, uint32_t base_regs_);
base_regs = base_regs_; base_regs = base_regs_;
acc_regs = regs_; acc_regs = regs_;
little_endian = 1; little_endian = 0;
endfunction endfunction
task minic_writel(uint32_t addr, uint32_t val); task minic_writel(uint32_t addr, uint32_t val);
...@@ -75,7 +75,7 @@ class CSimDrv_Minic; ...@@ -75,7 +75,7 @@ class CSimDrv_Minic;
task init(); task init();
uint32_t lo, hi; uint32_t val;
minic_writel(`ADDR_MINIC_EIC_IDR, `MINIC_EIC_IDR_RX); minic_writel(`ADDR_MINIC_EIC_IDR, `MINIC_EIC_IDR_RX);
minic_writel(`ADDR_MINIC_EIC_ISR, `MINIC_EIC_ISR_RX); minic_writel(`ADDR_MINIC_EIC_ISR, `MINIC_EIC_ISR_RX);
...@@ -86,13 +86,10 @@ class CSimDrv_Minic; ...@@ -86,13 +86,10 @@ class CSimDrv_Minic;
//rx_size = pmem_size / 2; //rx_size = pmem_size / 2;
tx_oob_val = 12345; tx_oob_val = 12345;
//enable RX
minic_readl(`ADDR_MINIC_MCR, val);
minic_writel(`ADDR_MINIC_MCR, val | `MINIC_MCR_RX_EN);
//lo = rx_base >> 2;
//hi = (rx_base >> 2) + (rx_size >> 2) - 1;
//minic_writel(`ADDR_MINIC_MPROT, (lo << `MINIC_MPROT_LO_OFFSET) | (hi << `MINIC_MPROT_HI_OFFSET));
//new_rx_buffer();
minic_writel(`ADDR_MINIC_EIC_IER, `MINIC_EIC_IER_RX); minic_writel(`ADDR_MINIC_EIC_IER, `MINIC_EIC_IER_RX);
endtask // init endtask // init
...@@ -108,6 +105,7 @@ class CSimDrv_Minic; ...@@ -108,6 +105,7 @@ class CSimDrv_Minic;
byte oob[2]; byte oob[2];
//new_tx_buffer(); //new_tx_buffer();
$display("TX frame: size=%d, with_oob=%d, id=%d", size, with_oob, frame_id);
if(size < 60) size = 60; if(size < 60) size = 60;
if(size & 1) begin if(size & 1) begin
...@@ -125,18 +123,19 @@ class CSimDrv_Minic; ...@@ -125,18 +123,19 @@ class CSimDrv_Minic;
//then we write the actual frame //then we write the actual frame
for(i=0;i<size_words-1; i++) begin for(i=0;i<size_words-1; i++) begin
word = (frame[2*i+1] << 8) | frame[2*i]; word = (frame[2*i] << 8) | (frame[2*i+1] & 'h00FF);
minic_write_txword(`c_WRF_DATA, word); minic_write_txword(`c_WRF_DATA, word);
end end
//write the last word with bytesel or normal //write the last word with bytesel or normal
if(bytesel == 1) if(bytesel == 1)
minic_write_txword(`c_WRF_BYTESEL, frame[2*size_words]); minic_write_txword(`c_WRF_BYTESEL, frame[2*i] << 8);
else begin else begin
word = (frame[2*size_words+1] << 8) | frame[2*size_words]; word = (frame[2*i] << 8) | (frame[2*i+1] & 'h00FF);
minic_write_txword(`c_WRF_DATA, word); minic_write_txword(`c_WRF_DATA, word);
end end
if (with_oob) begin if (with_oob) begin
minic_write_txword(`c_WRF_OOB, 'h1000);
minic_write_txword(`c_WRF_OOB, frame_id); minic_write_txword(`c_WRF_OOB, frame_id);
end end
...@@ -151,9 +150,13 @@ class CSimDrv_Minic; ...@@ -151,9 +150,13 @@ class CSimDrv_Minic;
uint32_t raw_ts; uint32_t raw_ts;
uint32_t rx_addr_cur, mcr, cur_avail; uint32_t rx_addr_cur, mcr, cur_avail;
u64_array_t pbuff; u64_array_t pbuff;
uint32_t val;
uint32_t typ, data;
byte tmp_payload[2000];
int i; int i;
int n_recvd; int n_recvd;
int done;
uint32_t isr; uint32_t isr;
//minic_readl(`ADDR_MINIC_EIC_ISR, isr); //minic_readl(`ADDR_MINIC_EIC_ISR, isr);
...@@ -161,59 +164,52 @@ class CSimDrv_Minic; ...@@ -161,59 +164,52 @@ class CSimDrv_Minic;
//if(! (isr & `MINIC_EIC_ISR_RX)) //if(! (isr & `MINIC_EIC_ISR_RX))
// return; // return;
//acc_pmem.read(rx_head, desc_hdr); // if RX FIFO is empty, quit immediatelly
// minic_readl(`ADDR_MINIC_MCR, val);
//if(!`RX_DESC_VALID(desc_hdr)) if ( val & `MINIC_MCR_RX_EMPTY )
// begin return ;
// $error("SimDRV_Minic::rx_frame: weird, invalid RX desc header");
// $stop; size = 0;
// end done = 0;
// get frame from FIFO
//payload_size = `RX_DESC_SIZE(desc_hdr); do begin
//num_words = (payload_size + 3) >> 2; minic_readl(`ADDR_MINIC_RX_FIFO, val);
//pbuff = new [num_words]; typ = (val & `MINIC_RX_FIFO_TYPE) >> `MINIC_RX_FIFO_TYPE_OFFSET;
data = (val & `MINIC_RX_FIFO_DAT);
//// $display("NWords %d hdr %x", num_words, desc_hdr);
// if (typ == `c_WRF_DATA) begin
// tmp_payload[size] = data >> 8;
tmp_payload[size+1] = data & 'h00FF;
//if(`RX_DESC_HAS_OOB(desc_hdr)) size = size + 2;
// payload_size = payload_size - 6; end
// else if (typ == `c_WRF_BYTESEL) begin
// tmp_payload[size] = data >> 8;
//if(!`RX_DESC_ERROR(desc_hdr)) size = size + 1;
// begin end
// for(i=0; i<num_words;i++) else if (typ == `c_WRF_STATUS && size != 0) begin
// acc_pmem.read((rx_head + 4 + i * 4) % rx_size, pbuff[i]); // which means we got status for next frame
done = 1;
// payload = SimUtils.unpack(pbuff, 4, payload_size); end
// end
//size = payload_size;
//
//rx_head = (rx_head + 4 + num_words * 4 - rx_base) % rx_size + rx_base;
//minic_writel(`ADDR_MINIC_RX_AVAIL, (num_words + 1));
//minic_readl(`ADDR_MINIC_RX_AVAIL, cur_avail); end while ( !(val & `MINIC_RX_FIFO_EMPTY) && typ != `c_WRF_OOB && done == 0);
//acc_pmem.read(rx_head, desc_hdr); payload = new[size](tmp_payload);
//if( cur_avail == (rx_size>>2) || !(`RX_DESC_VALID(desc_hdr))) if (typ != `c_WRF_OOB)
// begin $display("!! Incomplete frame");
// minic_readl(`ADDR_MINIC_MCR, mcr);
//
// if(mcr & `MINIC_MCR_RX_FULL)
// new_rx_buffer();
// minic_writel(`ADDR_MINIC_EIC_ISR, `MINIC_EIC_ISR_RX); // now let's see if the frame has OOB
// end while (typ == `c_WRF_OOB && !(val & `MINIC_RX_FIFO_EMPTY)) begin
minic_readl(`ADDR_MINIC_RX_FIFO, val);
typ = (val & `MINIC_RX_FIFO_TYPE) >> `MINIC_RX_FIFO_TYPE_OFFSET;
data = (val & `MINIC_RX_FIFO_DAT);
end
//
endtask // rx_frame endtask // rx_frame
task do_rx(); task do_rx();
byte payload[]; byte payload[];
uint32_t size, ts; uint32_t size, psize, ts;
bit with_ts; bit with_ts;
rx_frame(payload, size, with_ts, ts); rx_frame(payload, size, with_ts, ts);
...@@ -221,8 +217,15 @@ class CSimDrv_Minic; ...@@ -221,8 +217,15 @@ class CSimDrv_Minic;
if(payload.size() > 0) if(payload.size() > 0)
begin begin
EthPacket pkt; EthPacket pkt;
int id;
psize = 0;
if (payload.size() > 14) begin
psize = payload.size() - 14; //14 for the header
end
pkt = new; pkt = new;
pkt.deserialize(payload); pkt.deserialize(payload);
id = ((pkt.payload[1] << 8) & 'hff00) | pkt.payload[0];
$display("RX frame(%d): size %d (%d)", id, psize, payload.size());
rx_queue.push_back(pkt); rx_queue.push_back(pkt);
end end
......
sim/minic_regs.vh
View file @ adcb8584
...@@ -5,14 +5,22 @@ ...@@ -5,14 +5,22 @@
`define MINIC_MCR_TX_IDLE 32'h00000002 `define MINIC_MCR_TX_IDLE 32'h00000002
`define MINIC_MCR_TX_ERROR_OFFSET 2 `define MINIC_MCR_TX_ERROR_OFFSET 2
`define MINIC_MCR_TX_ERROR 32'h00000004 `define MINIC_MCR_TX_ERROR 32'h00000004
`define MINIC_MCR_TX_EMPTY_OFFSET 3
`define MINIC_MCR_TX_EMPTY 32'h00000008
`define MINIC_MCR_TX_FULL_OFFSET 4
`define MINIC_MCR_TX_FULL 32'h00000010
`define MINIC_MCR_RX_READY_OFFSET 8 `define MINIC_MCR_RX_READY_OFFSET 8
`define MINIC_MCR_RX_READY 32'h00000100 `define MINIC_MCR_RX_READY 32'h00000100
`define MINIC_MCR_RX_FULL_OFFSET 9 `define MINIC_MCR_RX_ERROR_OFFSET 9
`define MINIC_MCR_RX_FULL 32'h00000200 `define MINIC_MCR_RX_ERROR 32'h00000200
`define MINIC_MCR_RX_EN_OFFSET 10 `define MINIC_MCR_RX_EN_OFFSET 10
`define MINIC_MCR_RX_EN 32'h00000400 `define MINIC_MCR_RX_EN 32'h00000400
`define MINIC_MCR_TX_TS_READY_OFFSET 11 `define MINIC_MCR_TX_TS_READY_OFFSET 11
`define MINIC_MCR_TX_TS_READY 32'h00000800 `define MINIC_MCR_TX_TS_READY 32'h00000800
`define MINIC_MCR_RX_EMPTY_OFFSET 12
`define MINIC_MCR_RX_EMPTY 32'h00001000
`define MINIC_MCR_RX_FULL_OFFSET 13
`define MINIC_MCR_RX_FULL 32'h00002000
`define MINIC_MCR_RX_CLASS_OFFSET 16 `define MINIC_MCR_RX_CLASS_OFFSET 16
`define MINIC_MCR_RX_CLASS 32'h00ff0000 `define MINIC_MCR_RX_CLASS 32'h00ff0000
`define MINIC_MCR_VER_OFFSET 24 `define MINIC_MCR_VER_OFFSET 24
...@@ -22,10 +30,6 @@ ...@@ -22,10 +30,6 @@
`define MINIC_TX_FIFO_DAT 32'h0000ffff `define MINIC_TX_FIFO_DAT 32'h0000ffff
`define MINIC_TX_FIFO_TYPE_OFFSET 16 `define MINIC_TX_FIFO_TYPE_OFFSET 16
`define MINIC_TX_FIFO_TYPE 32'h00030000 `define MINIC_TX_FIFO_TYPE 32'h00030000
`define MINIC_TX_FIFO_EMPTY_OFFSET 30
`define MINIC_TX_FIFO_EMPTY 32'h40000000
`define MINIC_TX_FIFO_FULL_OFFSET 31
`define MINIC_TX_FIFO_FULL 32'h80000000
`define ADDR_MINIC_RX_FIFO 7'h8 `define ADDR_MINIC_RX_FIFO 7'h8
`define MINIC_RX_FIFO_DAT_OFFSET 0 `define MINIC_RX_FIFO_DAT_OFFSET 0
`define MINIC_RX_FIFO_DAT 32'h0000ffff `define MINIC_RX_FIFO_DAT 32'h0000ffff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment