Changeset 53 for trunk/kernel/mm

Timestamp:

Jun 26, 2017, 4:22:00 PM (7 years ago)

Author:

alain

Message:

Compilation OK pout TSAR

Location:

trunk/kernel/mm

Files:

• kcm.c (modified) (1 diff)
• khm.c (modified) (1 diff)
• mapper.c (modified) (1 diff)
• page.c (modified) (3 diffs)
• ppm.c (modified) (2 diffs)
• ppm.h (modified) (4 diffs)

trunk/kernel/mm/kcm.c

@@ -158 +158 @@
 
         // get page base address
-        kcm_page = (kcm_page_t *)ppm_page2base( page );
+        kcm_page = (kcm_page_t *)ppm_page2vaddr( page );
 
         // initialize KCM-page descriptor

trunk/kernel/mm/khm.c

@@ -51 +51 @@
         // get kernel heap base from PPM
         page_t * page      = ppm_alloc_pages( CONFIG_PPM_HEAP_ORDER );
-        void   * heap_base = ppm_page2base( page );
+        void   * heap_base = ppm_page2vaddr( page );
 
         // initialize first block (complete heap)

trunk/kernel/mm/mapper.c

@@ -332 +332 @@
 
         // compute pointer in mapper
-        map_ptr = (uint8_t *)ppm_page2base( page ) + page_offset;
+        map_ptr = (uint8_t *)ppm_page2vaddr( page ) + page_offset;
 
         // compute pointer in buffer

trunk/kernel/mm/page.c

@@ -245 +245 @@
         void    * dst_base;
 
-        if( dst->order != src->order )
-        {
-                printk("\n[PANIC] in %s : src size != dst size\n", __FUNCTION__ );
-                hal_core_sleep();
-        }
+        assert( (dst->order == src->order) , __FUNCTION__ , "src size != dst size\n" );
 
         size = (1 << dst->order) * CONFIG_PPM_PAGE_SIZE;
-        src_base = ppm_page2base( src );
-        dst_base = ppm_page2base( dst );
+        src_base = ppm_page2vaddr( src );
+        dst_base = ppm_page2vaddr( dst );
 
         memcpy( dst_base , src_base , size );
@@ -265 +261 @@
 
         size = (1 << page->order) * CONFIG_PPM_PAGE_SIZE;
-        base = ppm_page2base( page );
-
-// kmem_print_kcm_table();
-
-// printk("\n@@@ in page_zero : size = %x / base = %x / kcm_tbl = %x\n",
-//        size , (uint32_t)base , (uint32_t)(&LOCAL_CLUSTER->kcm_tbl[0] ) );
+        base = ppm_page2vaddr( page );
 
         memset( base , 0 , size );
-
-// kmem_print_kcm_table();
-
 }
 
@@ -283 +271 @@
         printk("*** Page %d : base = %x / flags = %x / order = %d / count = %d\n",
                 page->index,
-                ppm_page2base( page ),
+                ppm_page2vaddr( page ),
                 page->flags,
                 page->order,

trunk/kernel/mm/ppm.c

@@ -264 +264 @@
 }  // end ppm_print()
 
-//////////////////////////u/////////
-void ppm_assert_order( ppm_t * ppm )
+///////////////////////////////////////
+error_t ppm_assert_order( ppm_t * ppm )
 {
         uint32_t       order;
@@ -279 +279 @@
                         page = LIST_ELEMENT( iter , page_t , list );
 
-                        assert( (page->order == order) , __FUNCTION__ , "PPM inconsistency" );
+                        if( page->order != order )  return -1; 
                 }
         }
 
+    return 0;
+
 }  // end ppm_assert_order()
 

trunk/kernel/mm/ppm.h

@@ -69 +69 @@
 
 /*****************************************************************************************
- * This function initializes a PPM (Physical Pages Manager) in a cluster.
- * The physical memory base address in all clusters is zero.
- * The physical memory size is NOT constrained to be smaller than 4 Gbytes.
- *****************************************************************************************
- * @ ppm          : pointer on physical pages manager.
- * @ pages_nr     : total physical memory size (number of 4 Kbytes pages).
- * @ pages_offset : number of pages already allocated in this physical memory.
- ****************************************************************************************/
-void ppm_init( ppm_t    * ppm,
-               uint32_t   pages_nr,
-                   uint32_t   pages_offset );
-
-/*****************************************************************************************
  * This is the low-level physical pages allocation function.
  * It allocates N contiguous physical pages. N is a power of 2.
@@ -93 +80 @@
 
 /*****************************************************************************************
- * This is the low-level physical pages release function.
+ * This is the low-level physical pages release function. It takes the lock protecting
+ * the free_list before register the released page in the relevant free_list.
  * In normal use, you do not need to call it directly, as the recommended way to free
  * physical pages is to call the generic allocator defined in kmem.h.
@@ -100 +88 @@
  ****************************************************************************************/
 void ppm_free_pages( page_t * page );
+
+/*****************************************************************************************
+ * This function does the same as the ppm_free_page() function, without taking the lock.
+ * It is used by the hal_ppm_init() function to initialize the pages_tbl[] array, when
+ * there is no concurrent access issue.
+ *****************************************************************************************
+ * @ page         : pointer to the page descriptor to be released
+ ****************************************************************************************/
+void ppm_free_pages_nolock( page_t * page );
 
 /*****************************************************************************************
@@ -170 +167 @@
  *****************************************************************************************
  * @ ppm      : pointer on PPM allocator.
+ * @ return 0 if PPM is OK / return -1 if PPM not consistent.
  ****************************************************************************************/
-void ppm_assert_order( ppm_t * ppm );
+error_t ppm_assert_order( ppm_t * ppm );
 
 #endif  /* _PPM_H_ */