Changeset 295 for soft/giet_vm/giet_common/vmem.c

Timestamp:

Mar 26, 2014, 6:44:44 PM (11 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

• soft/giet_vm/giet_common/vmem.c (modified) (5 diffs)

soft/giet_vm/giet_common/vmem.c

@@ -25 +25 @@
 // _iommu_add_pte2()
 //////////////////////////////////////////////////////////////////////////////
-void _iommu_add_pte2(
-        unsigned int ix1,
-        unsigned int ix2,
-        unsigned int ppn,
-        unsigned int flags) 
+void _iommu_add_pte2( unsigned int ix1,
+                      unsigned int ix2,
+                      unsigned int ppn,
+                      unsigned int flags ) 
 {
     unsigned int ptba;
@@ -41 +40 @@
     if ((pt->pt1[ix1] & PTE_V) == 0) 
     {
-        _tty_get_lock( 0 );
-        _puts("\n[GIET ERROR] in iommu_add_pte2 function\n");
-        _puts("the IOMMU PT1 entry is not mapped / ix1 = ");
-        _putx( ix1 );
-        _puts("\n");
-        _tty_release_lock( 0 );
+        _printf("\n[GIET ERROR] in iommu_add_pte2() : "
+                "IOMMU PT1 entry not mapped / ix1 = %d\n", ix1 );
         _exit();
     }
@@ -63 +58 @@
 // _iommu_inval_pte2()
 //////////////////////////////////////////////////////////////////////////////
-void _iommu_inval_pte2(unsigned int ix1, unsigned int ix2) {
+void _iommu_inval_pte2( unsigned int ix1, 
+                        unsigned int ix2 ) 
+{
     unsigned int ptba;
     unsigned int * pt_flags;
@@ -73 +70 @@
     if ((pt->pt1[ix1] & PTE_V) == 0)
     {
-        _puts("\n[GIET ERROR] in iommu_inval_pte2 function\n");
-        _puts("the IOMMU PT1 entry is not mapped / ix1 = ");
-        _putx( ix1 );
-        _puts("\n");
+        _printf("\n[GIET ERROR] in iommu_inval_pte2() "
+              "IOMMU PT1 entry not mapped / ix1 = %d\n", ix1 );
         _exit();
     }
@@ -95 +90 @@
                              unsigned int   vpn,
                              unsigned int*  ppn,
-                             unsigned int*  flags) 
+                             unsigned int*  flags ) 
 {
     unsigned long long ptba;