Changeset 340 for soft

Timestamp:

Jun 24, 2014, 11:11:29 AM (10 years ago)

Author:

cfuguet

Message:

giet_vm/iob_driver:

• The XICU_BASE and XICU_SIZE registers do not exist anymore in the VCI_IO_BRIDGE component. The routing of WTI commands by the IOB is done statically by using the special attribute on the IOX segments.

Location:

soft/giet_vm

Files:

• giet_boot/boot.c (modified) (4 diffs)
• giet_drivers/iob_driver.c (modified) (1 diff)
• giet_drivers/iob_driver.h (modified) (2 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -142 +142 @@
 // Page table addresses arrays
 __attribute__((section (".bootdata"))) 
-paddr_t      _ptabs_paddr[GIET_NB_VSPACE_MAX];
+volatile paddr_t      _ptabs_paddr[GIET_NB_VSPACE_MAX];
 
 __attribute__((section (".bootdata"))) 
-unsigned int _ptabs_vaddr[GIET_NB_VSPACE_MAX];
+volatile unsigned int _ptabs_vaddr[GIET_NB_VSPACE_MAX];
 
 // Next free PT2 index array
 __attribute__((section (".bootdata"))) 
-unsigned int _next_free_pt2[GIET_NB_VSPACE_MAX] =
+volatile unsigned int _next_free_pt2[GIET_NB_VSPACE_MAX] =
 { [0 ... GIET_NB_VSPACE_MAX - 1] = 0 };
 
 // Max PT2 index 
 __attribute__((section (".bootdata"))) 
-unsigned int _max_pt2[GIET_NB_VSPACE_MAX] =
+volatile unsigned int _max_pt2[GIET_NB_VSPACE_MAX] =
 { [0 ... GIET_NB_VSPACE_MAX - 1] = 0 };
 
@@ -305 +305 @@
     unsigned int ix2;
     paddr_t      pt1_pbase;     // PT1 physical base address
-    paddr_t      pt2_pbase;     // PT2 physical base address
+    paddr_t      pt2_pbase = 0; // PT2 physical base address
     paddr_t      pte_paddr;     // PTE physucal address
     unsigned int pt2_id;        // PT2 index
@@ -2216 +2216 @@
                 case PERIPH_TYPE_IOB:    // vci_io_bridge component
                 {
-                    // initialize r_xicu_base & r_xicu_size registers
-                    unsigned int base = (unsigned int)SEG_XCU_BASE;
-
 #if BOOT_DEBUG_PERI
 _puts("- IOB : channels = ");
 _putd(channels);
-_puts(" / XICU_BASE = ");
-_putx( base );
-_puts(" / XICU_SIZE = ");
-_putx( 0x1000 );
-_puts("\n");
-#endif
-                    _iob_set_xicu_base( cluster_xy, base );
-                    _iob_set_xicu_size( cluster_xy, 0x1000 );
-
+_puts("\n");
+#endif
                     if (GIET_USE_IOMMU) 
                     {
@@ -2337 +2327 @@
 // Most of this code is executed by Processor 0 only.
 /////////////////////////////////////////////////////////////////////////
-void boot_init() 
+void boot_init()
 {
     mapping_header_t*  header     = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;

soft/giet_vm/giet_drivers/iob_driver.c

@@ -83 +83 @@
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// This function sets a new value in IOB_XICU_BASE register.
-///////////////////////////////////////////////////////////////////////////////
-void _iob_set_xicu_base( unsigned int cluster_xy,
-                         unsigned int value )
-{
-    _iob_set_register( cluster_xy,
-                       IOB_XICU_BASE,
-                       value );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// This function sets a new value in IOB_XICU_SIZE register.
-///////////////////////////////////////////////////////////////////////////////
-void _iob_set_xicu_size( unsigned int cluster_xy,
-                         unsigned int value )
-{
-    _iob_set_register( cluster_xy,
-                       IOB_XICU_SIZE,
-                       value );
-}
-
-
-
 // Local Variables:
 // tab-width: 4

soft/giet_vm/giet_drivers/iob_driver.h

@@ -24 +24 @@
     IOB_WTI_ADDR_LO      = 7,      // W/R : 32 LSB bits for IOMMU WTI
     IOB_WTI_ADDR_HI      = 8,      // W/R : 32 MSB bits for IOMMU WTI
-    IOB_XICU_BASE        = 9,      // R/W : XICU pbase address in cluster 0
-    IOB_XICU_SIZE        = 10,     // R/W : XICU segment size 
 };
 
@@ -51 +49 @@
                                   unsigned int value );
 
-extern void _iob_set_xicu_base(   unsigned int cluster_xy,
-                                  unsigned int value );
-
-extern void _iob_set_xicu_size(   unsigned int cluster_xy,
-                                  unsigned int value );
-
 ///////////////////////////////////////////////////////////////////////////////////