Changeset 613 for soft/giet_vm/giet_drivers/nic_driver.c

Timestamp:

Jul 15, 2015, 6:14:15 PM (9 years ago)

Author:

bellefin

Message:

NIC driver: update the channel registers of the NIC component (add the status variable and change the descriptor structure)

File:

• soft/giet_vm/giet_drivers/nic_driver.c (modified) (1 diff)

soft/giet_vm/giet_drivers/nic_driver.c

@@ -126 +126 @@
     unsigned int extend   = (X_IO << Y_WIDTH) + Y_IO;
 
+    unsigned int buf_0_addr;
+    unsigned int buf_1_addr;
+    unsigned int sts_0_addr;
+    unsigned int sts_1_addr;
+
+    unsigned int desc_lo_0;
+    unsigned int desc_lo_1;
+    unsigned int desc_hi_0;
+    unsigned int desc_hi_1;
+
     if ( is_rx )
     {
-        _nic_set_channel_register( channel, NIC_RX_DESC_LO_0, base          );
-        _nic_set_channel_register( channel, NIC_RX_DESC_LO_1, base + 0x1000 );
-        _nic_set_channel_register( channel, NIC_RX_DESC_HI_0, extend        );
-        _nic_set_channel_register( channel, NIC_RX_DESC_HI_1, extend        );
+        buf_0_addr = base;
+        buf_1_addr = base + 0x1000;
+        sts_0_addr = base + 0x4000;
+        sts_1_addr = base + 0x4040;
+
+        desc_lo_0 = (sts_0_addr >> 6) + ((buf_0_addr & 0xFC0) << 20);
+        desc_lo_1 = (sts_1_addr >> 6) + ((buf_1_addr & 0xFC0) << 20);
+        desc_hi_0 = ((buf_0_addr & 0xFFFFF000) >> 12) + ((extend & 0xFFF) << 20);
+        desc_hi_1 = ((buf_1_addr & 0xFFFFF000) >> 12) + ((extend & 0xFFF) << 20);
+
+        _nic_set_channel_register( channel, NIC_RX_DESC_LO_0, desc_lo_0     );
+        _nic_set_channel_register( channel, NIC_RX_DESC_LO_1, desc_lo_1     );
+        _nic_set_channel_register( channel, NIC_RX_DESC_HI_0, desc_hi_0     );
+        _nic_set_channel_register( channel, NIC_RX_DESC_HI_1, desc_hi_1     );
         _nic_set_channel_register( channel, NIC_RX_RUN      , 1             );
     }
     else
     {
-        _nic_set_channel_register( channel, NIC_TX_DESC_LO_0, base + 0x2000 );
-        _nic_set_channel_register( channel, NIC_TX_DESC_LO_1, base + 0x3000 );
-        _nic_set_channel_register( channel, NIC_TX_DESC_HI_0, extend        );
-        _nic_set_channel_register( channel, NIC_TX_DESC_HI_1, extend        );
+        buf_0_addr = base + 0x2000;
+        buf_1_addr = base + 0x3000;
+        sts_0_addr = base + 0x4080;
+        sts_1_addr = base + 0x40c0;
+
+        desc_lo_0 = (sts_0_addr >> 6) + ((buf_0_addr & 0xFC0) << 20);
+        desc_lo_1 = (sts_1_addr >> 6) + ((buf_1_addr & 0xFC0) << 20);
+        desc_hi_0 = ((buf_0_addr & 0xFFFFF000) >> 12) + ((extend & 0xFFF) << 20);
+        desc_hi_1 = ((buf_1_addr & 0xFFFFF000) >> 12) + ((extend & 0xFFF) << 20);
+
+        _nic_set_channel_register( channel, NIC_TX_DESC_LO_0, desc_lo_0     );
+        _nic_set_channel_register( channel, NIC_TX_DESC_LO_1, desc_lo_1     );
+        _nic_set_channel_register( channel, NIC_TX_DESC_HI_0, desc_hi_0     );
+        _nic_set_channel_register( channel, NIC_TX_DESC_HI_1, desc_hi_1     );
         _nic_set_channel_register( channel, NIC_TX_RUN      , 1             );
     }