Changeset f8ddd17 in mainline for kernel/generic/src/main/main.c

Timestamp:

2006-12-09T20:20:50Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b82a13c

Parents:

9ab9c2ec

Message:

Rework support for virtually indexed cache.
Instead of repeatedly flushing the data cache, which was a huge overkill, refuse to create an illegal address alias
in the kernel (again) and allocate appropriate page color in userspace instead. Extend the detection also to
SYS_PHYSMEM_MAP syscall.

Add support for tracking physical memory areas mappable by SYS_PHYSMEM_MAP.

Lots of coding style changes.

File:

• kernel/generic/src/main/main.c (modified) (9 diffs)

kernel/generic/src/main/main.c

@@ -81 +81 @@
 #include <console/klog.h>
 #include <smp/smp.h>
+#include <ddi/ddi.h>
 
 /** Global configuration structure. */
@@ -103 +104 @@
  * appropriate sizes and addresses.
  */
-uintptr_t hardcoded_load_address = 0;   /**< Virtual address of where the kernel is loaded. */
-size_t hardcoded_ktext_size = 0;        /**< Size of the kernel code in bytes. */
-size_t hardcoded_kdata_size = 0;        /**< Size of the kernel data in bytes. */
-
-uintptr_t stack_safe = 0;               /**< Lowest safe stack virtual address */
+uintptr_t hardcoded_load_address = 0;   /**< Virtual address of where the kernel
+                                          *  is loaded. */
+size_t hardcoded_ktext_size = 0;        /**< Size of the kernel code in bytes.
+                                          */
+size_t hardcoded_kdata_size = 0;        /**< Size of the kernel data in bytes.
+                                         */
+uintptr_t stack_safe = 0;               /**< Lowest safe stack virtual address.
+                                          */
 
 void main_bsp(void);
@@ -142 +146 @@
         config.memory_size = get_memory_size();
         
-        config.kernel_size = ALIGN_UP(hardcoded_ktext_size + hardcoded_kdata_size, PAGE_SIZE);
+        config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
+                hardcoded_kdata_size, PAGE_SIZE);
         config.stack_size = CONFIG_STACK_SIZE;
         
@@ -151 +156 @@
         count_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_overlaps(config.stack_base, config.stack_size, init.tasks[i].addr, init.tasks[i].size))
-                        config.stack_base = ALIGN_UP(init.tasks[i].addr + init.tasks[i].size, config.stack_size);
+                if (PA_overlaps(config.stack_base, config.stack_size,
+                        init.tasks[i].addr, init.tasks[i].size))
+                        config.stack_base = ALIGN_UP(init.tasks[i].addr +
+                                init.tasks[i].size, config.stack_size);
         }
 
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
-                if (PA_overlaps(config.stack_base, config.stack_size, ballocs.base, ballocs.size))
-                        config.stack_base = ALIGN_UP(ballocs.base + ballocs.size, PAGE_SIZE);
+                if (PA_overlaps(config.stack_base, config.stack_size,
+                        ballocs.base, ballocs.size))
+                        config.stack_base = ALIGN_UP(ballocs.base +
+                                ballocs.size, PAGE_SIZE);
         }
         
@@ -165 +174 @@
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base, THREAD_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
+                THREAD_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -201 +211 @@
          */     
         arch_pre_mm_init();
-        frame_init();           /* Initialize at least 1 memory segment big enough for slab to work */
+        frame_init();           
+        /* Initialize at least 1 memory segment big enough for slab to work. */
         slab_cache_init();
         btree_init();
@@ -207 +218 @@
         page_init();
         tlb_init();
+        ddi_init();
         arch_post_mm_init();
 
         version_print();
-        printf("kernel: %.*p hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
-        printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2, config.stack_base, config.stack_size >> 10);
+        printf("kernel: %.*p hardcoded_ktext_size=%zdK, "
+                "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
+                config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >>
+                10);
+        printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2,
+                config.stack_base, config.stack_size >> 10);
 
         arch_pre_smp_init();
         smp_init();
-        
-        slab_enable_cpucache(); /* Slab must be initialized AFTER we know the number of processors */
+        /* Slab must be initialized after we know the number of processors. */
+        slab_enable_cpucache();
 
         printf("config.memory_size=%zdM\n", config.memory_size >> 20);
@@ -233 +249 @@
         if (init.cnt > 0) {
                 for (i = 0; i < init.cnt; i++)
-                        printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(uintptr_t) * 2, init.tasks[i].addr, i, init.tasks[i].size);
+                        printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i,
+                                sizeof(uintptr_t) * 2, init.tasks[i].addr, i,
+                                init.tasks[i].size);
         } else
                 printf("No init binaries found\n");
@@ -305 +323 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
+                (uintptr_t) CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */