Changeset 313 for trunk/hal

Timestamp:

Aug 2, 2017, 3:24:57 PM (7 years ago)

Author:

alain

Message:

RSeveral modifs in the page-fault handling.

Location:

trunk/hal

Files:

• generic/hal_gpt.h (modified) (1 diff)
• generic/hal_ppm.h (modified) (1 diff)
• generic/hal_remote.h (modified) (1 diff)
• tsar_mips32/core/hal_ppm.c (modified) (2 diffs)
• tsar_mips32/core/hal_remote.c (modified) (1 diff)

trunk/hal/generic/hal_gpt.h

@@ -168 +168 @@
 
 /****************************************************************************************
- * This function copies all valid entries from the source <src_gpt> to the <dst_pgt>.
+ * This function copies all valid entries from the source <src_gpt> to the <dst_gpt>.
  * The <src_gpt> and the <dst_gpt> point on the same physical pages.
  * If the <cow> argument is true, the GPT_WRITABLE attribute is reset for all writable

trunk/hal/generic/hal_ppm.h

@@ -62 +62 @@
 void hal_core_init( boot_info_t * info );
 
+/*****************************************************************************************
+ * This function returns the PPN from the page descriptor extended pointer.
+ *****************************************************************************************
+ * @ page_xp   : pointer to page descriptor
+ * @ returns physical page number
+ ****************************************************************************************/
+inline ppn_t hal_page2ppn( xptr_t page_xp );
 
+/*****************************************************************************************
+ * This function returns the page descriptor extended pointer from the PPN.
+ *****************************************************************************************
+ * @ ppn          : physical page number
+ * @ returns extended pointer on page descriptor
+ ****************************************************************************************/
+inline xptr_t hal_ppn2page( ppn_t ppn );
 
 #endif  /* HAL_PPM_H_ */

trunk/hal/generic/hal_remote.h

@@ -184 +184 @@
                         xptr_t src );
 
+/*****************************************************************************************
+ * This function makes a memset to a remote buffer in kernel space.
+ *****************************************************************************************
+ * @ buf_xp  : extended pointer to destination buffer.
+ * @ byte    : Rvalue to be set in all buffer slots.
+ * @ size    : number of bytes to move.
+ ****************************************************************************************/
+void hal_remote_memset( xptr_t   buf_xp,
+                        uint8_t  byte,
+                        uint32_t size );
+
 #endif  /* _HAL_REMOTE_H_ */

trunk/hal/tsar_mips32/core/hal_ppm.c

@@ -35 +35 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// This file contains the TSAR specific code for cores registers,
-// and for physical memory allocators initialisation in a given cluster.
-
+// This file contains the TSAR specific code for :
+// - cores registers initialisation,
+// - memory allocators initialisation.
+//
 // For The TSAR architecture, the kernel pointers are identity mapped:
 // - the 32 bits PTR value is identical to the 32 bits LPA value,
@@ -133 +134 @@
 
 }  // end hal_core_init()
+
+///////////////////////////////////////////
+inline ppn_t hal_page2ppn( xptr_t page_xp )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+
+    cxy_t    page_cxy = GET_CXY( page_xp );
+    page_t * page_ptr = (page_t *)GET_PTR( page_xp );
+
+    return (ppn_t)(page_ptr - ppm->pages_tbl) | (ppn_t)(page_cxy << 20);
+
+}  // end hal_page2ppn()
+
+////////////////////////////////////////
+inline xptr_t  hal_ppn2page( ppn_t ppn )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+
+    cxy_t    page_cxy = (ppn & 0xFFF00000) >> 20;
+    page_t * page_ptr = &ppm->pages_tbl[ppn & 0x000FFFFF];
+
+    return XPTR( page_xy , page_ptr );
+
+}  // end hal_ppn2page
+
+

trunk/hal/tsar_mips32/core/hal_remote.c

@@ -447 +447 @@
 
 } // end hal_remote_strcpy()
+
+////////////////////////////////////////
+void hal_remote_memset( xptr_t   buf_xp,
+                        uint8_t  byte,
+                        uint32_t size )
+{
+    uint32_t save_sr;
+        uint32_t i;
+        uint32_t wsize;
+    uint32_t buf_ptr = (uint32_t)GET_PTR( buf_xp );
+    uint32_t buf_cxy = (uint32_t)GET_CXY( buf_xp );
+    uint32_t word    = ((uint32_t)byte)<<24 |
+                       ((uint32_t)byte)<<16 |
+                       ((uint32_t)byte)<<8  |
+                       ((uint32_t)byte)     ;
+
+    hal_disable_irq( &save_sr );
+
+        if( (buf_ptr & 0x3) ) wsize = 0;  // do it all in bytes
+    else                  wsize = size >> 2;
+
+        for( i = 0 ; i < wsize ; i++ )          // transfer one word per iteration
+        {
+        asm volatile( 
+            ".set noreorder              \n"
+            "mfc2   $15,    $24          \n"  /* $15 <= PADDR_EXT     */ 
+            "mtc2   %0,     $24          \n"  /* PADDR_EXT <= buf_cxy */   
+            "sw     %2,     0(%1)        \n"  /* set one word         */
+            "mtc2   $15,    $24          \n"  /* PADDR_EXT <= $15     */   
+            ".set reorder                \n"
+                    : : "r"(buf_cxy), "r" (buf_ptr+(i<<2)), "r"(byte) : "$15" );                
+        }
+
+        for( i = wsize << 2 ; i < size ; i++ )  // transfer one byte per iteration
+        {
+        asm volatile( 
+            ".set noreorder              \n"
+            "mfc2   $15,    $24          \n"  /* $15 <= PADDR_EXT     */ 
+            "mtc2   %0,     $24          \n"  /* PADDR_EXT <= buf_cxy */   
+            "sb     %2,     0(%1)        \n"  /* set one byte         */
+            "mtc2   $15,    $24          \n"  /* PADDR_EXT <= $15     */   
+            ".set reorder                \n"
+                    : : "r"(buf_cxy), "r"(buf_ptr+i), "r"(word) : "$15" );              
+        }
+
+    hal_restore_irq( save_sr );
+
+}  // end hal_remote_memset()
+