Changeset 166 for soft/giet_vm/sys/kernel_init.c

Timestamp:

Jul 6, 2012, 10:13:16 AM (12 years ago)

Author:

alain

Message:

Introducing support for IOMMU

File:

• soft/giet_vm/sys/kernel_init.c (modified) (3 diffs)

soft/giet_vm/sys/kernel_init.c

@@ -22 +22 @@
 #include <mips32_registers.h>
 #include <irq_handler.h>
+#include <vm_handler.h>
 #include <hwr_mapping.h>
 #include <mwmr_channel.h>
@@ -523 +524 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-// This function intializes the external periherals such as the TTY controller,
-// the IOC (external disk controller), the NIC (external network controller), 
-// the FBDMA (frame buffer controller), etc.
+// This function intializes the external periherals such as the IOB component
+// (I/O bridge, containing the IOMMU, the IOC (external disk controller), 
+// the NIC (external network controller), the FBDMA (frame buffer controller), 
 ////////////////////////////////////////////////////////////////////////////////
 in_kinit void _kernel_peripherals_init()
 {
+    // IOC peripheral initialisation
+    // we simply activate the IOC interrupts...
+    unsigned int*       ioc_address = (unsigned int*)&seg_ioc_base;
+
+    ioc_address[BLOCK_DEVICE_IRQ_ENABLE] = 1;
+    
+    // IOB peripheral
+    if ( GIET_IOMMU_ACTIVE )
+    {
+        unsigned int*   iob_address = (unsigned int*)&seg_iob_base;
+        unsigned int    icu_address = (unsigned int)&seg_icu_base;
+
+        // define IPI address mapping the IOC interrupt ...TODO...
+
+        // set IOMMU page table address
+        iob_address[IOB_IOMMU_PTPR] = (unsigned int)(&_iommu_ptab);    
+
+        // activate IOMMU
+        iob_address[IOB_IOMMU_ACTIVE] = 1;    
+    }
+
     _puts("\n[INIT] Peripherals initialisation completed at cycle ");
     _putw( _proctime() );
@@ -536 +558 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-// This function intialises the centralised interrupt vector,
-// and the ICUs mask registers for all processors in all clusters.
+// This function intialises the interrupt vector, and initialises
+// the ICU mask registers for all processors in all clusters.
 // It strongly depends on the actual peripheral hardware wiring.
 // In this peculiar version, all clusters are identical,