Changeset 167 for soft/giet_vm/sys/drivers.c

Timestamp:

Jul 16, 2012, 10:26:27 AM (12 years ago)

Author:

alain

Message:

Fix several bugs to use the vci_block_device with MMU activated

File:

• soft/giet_vm/sys/drivers.c (modified) (5 diffs)

soft/giet_vm/sys/drivers.c

@@ -491 +491 @@
                           unsigned int  count )
 {
-    unsigned int        user_vpn_min;
-    unsigned int        user_vpn_max;
-    unsigned int        vpn;                    // virtual page number in user space
-    unsigned int        ppn;                    // physical page number
-    unsigned int        flags;                  // page protection flags
-    unsigned int        ix2;                    // Page index (for IOMMU page table)
-    unsigned int        addr;                   // buffer address for IOC 
-    page_table_t*       user_ptp;               // user page table pointer
-    unsigned int        ko;                             // bool returned by _v2p_translate()
-    unsigned int        ppn_first;              // first physical page number for user buffer
+    unsigned int                user_vpn_min;   // first virtuel page index in user space
+    unsigned int                user_vpn_max;   // last virtual page index in user space
+    unsigned int                vpn;                    // current virtual page index in user space
+    unsigned int                ppn;                    // physical page number
+    unsigned int                flags;                  // page protection flags
+    unsigned int                ix2;                    // page index in IOMMU PT1 page table
+    unsigned int                addr;                   // buffer address for IOC peripheral
+    unsigned int                user_ptp;               // page table pointer in user space
+    unsigned int                ko;                             // bool returned by _v2p_translate()
+    unsigned int                ppn_first;              // first physical page number for user buffer
+    unsigned int                ltid;                   // current task local index
+    static_scheduler_t* psched;                 // pointer on the current task scheduler
         
     // check buffer alignment
@@ -509 +511 @@
     unsigned int        length       = count*block_size;
 
-    // get user space page table base address
-    user_ptp     = (page_table_t*)(_get_ptpr() << 13);
+    // get user space page table virtual address
+    psched   = &_scheduler[_procid()];
+    ltid     = psched->current;
+    user_ptp = psched->context[ltid][CTX_PTAB_ID];
     
     user_vpn_min = user_vaddr >> 12;
@@ -520 +524 @@
     {
         // get ppn and flags for each vpn
-        ko = _v2p_translate( user_ptp,  // user page table pointer
-                             vpn,               // virtual page number
-                             &ppn,              // physical page number
-                             &flags );  // protection flags
+        ko = _v2p_translate( (page_table_t*)user_ptp,
+                             vpn,
+                             &ppn,
+                             &flags );
 
         // check access rights
@@ -543 +547 @@
                                                  ppn,                           // Physical page number 
                              flags );                   // Protection flags
-
-            // buffer base address for IOC with IOMMU
         }
         else                    // no IOMMU : check that physical pages are contiguous
@@ -563 +565 @@
     // compute buffer base address for IOC depending on IOMMU activation
     if ( GIET_IOMMU_ACTIVE ) addr = (_ioc_iommu_ix1) << 21 | (user_vaddr & 0xFFF);
-    else                     addr = ppn_first | (user_vaddr & 0xFFF);
+    else                     addr = (ppn_first << 12) | (user_vaddr & 0xFFF);
 
     // get the lock on ioc device