Changeset 188 for trunk/kernel/devices/dev_nic.c

Timestamp:

Jul 12, 2017, 8:12:41 PM (7 years ago)

Author:

alain

Message:

Redefine the PIC device API.

File:

• trunk/kernel/devices/dev_nic.c (modified) (9 diffs)

trunk/kernel/devices/dev_nic.c

@@ -2 +2 @@
  * dev_nic.c - NIC (Network Controler) generic device API implementation.
  * 
- * Author  Alain Greiner    (2016)
+ * Author  Alain Greiner    (2016,2017)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -36 +36 @@
 extern chdev_directory_t  chdev_dir;         // allocated in kernel_init.c
 
-extern chdev_pic_input_t  chdev_pic_input;   // allocated in kernel_init.c
-
-////////////////////////////////////
-void dev_nic_init( chdev_t * chdev )
+//////////////////////////////////
+void dev_nic_init( chdev_t * nic )
 {
-    // the local ICU chdev must be initialized before the NIC chdev, because
-    // the NIC chdevs initialisation requires allocation of a WTI from local ICU
-    xptr_t  icu_xp  = chdev_dir.icu[local_cxy];
-    assert( (icu_xp != XPTR_NULL) , __FUNCTION__ , "ICU not initialised before NIC" );
+    // the PIC chdev must be initialized before the NIC chdev, because
+    // the NIC chdev initialisation requires the routing of an external IRQ.
+    xptr_t  pic_xp  = chdev_dir.pic;
+
+    assert( (pic_xp != XPTR_NULL) , __FUNCTION__ , "ICU not initialised before NIC" );
 
     // get "impl" , "channel" , "is_rx" fields from chdev descriptor
-    uint32_t  impl    = chdev->impl;
-    uint32_t  is_rx   = chdev->is_rx;
-    uint32_t  channel = chdev->channel;
+    uint32_t  impl    = nic->impl;
+    uint32_t  channel = nic->channel;
+    bool_t    is_rx   = nic->is_rx;
 
     // set chdev name
-    snprintf( chdev->name , 16 , "nic_%d" , chdev->channel );
+    if( is_rx ) snprintf( nic->name , 16 , "nic_rx_%d" , channel );
+    else        snprintf( nic->name , 16 , "nic_tx_%d" , channel );
 
     // set driver specific fields in chdev descriptor and call driver init function
     if( impl == IMPL_NIC_SOC )
     {
-        chdev->cmd = &soclib_nic_cmd;
-        chdev->isr = &soclib_nic_isr;
-        soclib_nic_init( chdev );
+        nic->cmd = &soclib_nic_cmd;
+        nic->isr = &soclib_nic_isr;
+        soclib_nic_init( nic );
     }
     else
@@ -66 +66 @@
     }
 
-    // get a WTI mailbox from local ICU
-    uint32_t wti_id = dev_icu_wti_alloc();
-
-    assert( (wti_id != -1) , __FUNCTION__ , "cannot allocate WTI mailbox" );
-
-    // select a core
+    // select a core to execute the NIC server thread
     lid_t lid = cluster_select_local_core();
 
-    // enable WTI IRQ and update WTI interrupt vector
-    dev_icu_enable_irq( lid , WTI_TYPE , wti_id , chdev );
-
-    // link NIC IRQ to WTI mailbox in PIC component 
-    uint32_t irq_id; 
-    if( is_rx ) irq_id = chdev_pic_input.nic_rx[channel];
-    else        irq_id = chdev_pic_input.nic_tx[channel];
-    dev_pic_bind_irq( irq_id , local_cxy , wti_id );
+    // bind the NIC IRQ to the selected core
+    // but does NOT enable it
+    dev_pic_bind_irq( lid , nic );
 
     // create server thread
@@ -90 +80 @@
                                   THREAD_DEV,
                                   &chdev_sequencial_server,
-                                  chdev,
+                                  nic,
                                   lid ); 
 
@@ -96 +86 @@
 
     // set "server" field in chdev descriptor
-    chdev->server = new_thread;
+    nic->server = new_thread;
     
     // start server thread
@@ -142 +132 @@
     if( thread_ptr->command.nic.status == false )  
     {
-        // get NIC-RX IRQ index and type
-        uint32_t   irq_type = dev_ptr->irq_type;
-        uint32_t   irq_id   = dev_ptr->irq_id;
-
         // enable NIC-RX IRQ 
-        dev_icu_enable_irq( core->lid , irq_type , irq_id , dev_ptr );
-
-        // block on THREAD_BLOCKED I/O condition and deschedule
+        dev_pic_enable_irq( core->lid , dev_ptr );
+
+        // block on THREAD_BLOCKED_IO condition and deschedule
         thread_block( thread_ptr , THREAD_BLOCKED_IO );
         sched_yield();
 
-        // disable NIC-RX channel IRQ 
-        dev_icu_disable_irq( core->lid , irq_type , irq_id );
+        // disable NIC-RX IRQ 
+        dev_pic_disable_irq( core->lid , dev_ptr );
     }
 
@@ -206 +192 @@
 
     // call driver to test writable
-    thread_ptr->command.nic.cmd    = NIC_CMD_WRITABLE;
+    thread_ptr->command.nic.cmd = NIC_CMD_WRITABLE;
     dev_ptr->cmd( thread_xp );
 
@@ -216 +202 @@
     if( thread_ptr->command.nic.status == false )  
     {
-        // get NIC-TX IRQ index and type
-        uint32_t   irq_type = dev_ptr->irq_type;
-        uint32_t   irq_id   = dev_ptr->irq_id;
-
         // enable NIC-TX IRQ 
-        dev_icu_enable_irq( core->lid , irq_type , irq_id , dev_ptr );
+        dev_pic_enable_irq( core->lid ,dev_ptr );
 
         // block on THREAD_BLOCKED I/O condition and deschedule
@@ -228 +210 @@
 
         // disable NIC-TX IRQ 
-        dev_icu_disable_irq( core->lid , irq_type , irq_id );
+        dev_pic_disable_irq( core->lid , dev_ptr );
     }