Subversion Repositories HelenOS

Rev

Rev 2712 | Rev 2723 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2712 Rev 2721
Line 43... Line 43...
43 
#include <debug.h>
 43 
#include <debug.h>
44 
#include <align.h>
 44 
#include <align.h>
45 
#include <macros.h>
 45 
#include <macros.h>
46 
 
 46 
 
47 
#include <print.h>
 47 
#include <print.h>
48 
#include <console/cmd.h>
 - 
 
49 
#include <console/kconsole.h>
 - 
 
50 
 
 48 
 
51 
size_t hardcoded_unmapped_ktext_size = 0;
 49 
size_t hardcoded_unmapped_ktext_size = 0;
52 
size_t hardcoded_unmapped_kdata_size = 0;
 50 
size_t hardcoded_unmapped_kdata_size = 0;
53 
 
 51 
 
54 
uintptr_t last_frame = 0;
 52 
uintptr_t last_frame = 0;
55 
 
 53 
 
56 
static void init_e820_memory(pfn_t minconf)
 54 
static void init_e820_memory(pfn_t minconf)
57 
{
 55 
{
58 
    int i;
 56 
    unsigned int i;
59 
    pfn_t start, conf;
 57 
    pfn_t start, conf;
60 
    size_t size;
 58 
    size_t size;
61 
 
 59 
 
62 
    for (i = 0; i < e820counter; i++) {
 60 
    for (i = 0; i < e820counter; i++) {
63 
        if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
 61 
        if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
64 
            start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
 62 
            start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
65 
            size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
 63 
            size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
- 
 
 64 
           
66 
            if ((minconf < start) || (minconf >= start + size))
 65 
            if ((minconf < start) || (minconf >= start + size))
67 
                conf = start;
 66 
                conf = start;
68 
            else
 67 
            else
69 
                conf = minconf;
 68 
                conf = minconf;
- 
 
 69 
           
70 
            zone_create(start, size, conf, 0);
 70 
            zone_create(start, size, conf, 0);
- 
 
 71 
           
71 
            if (last_frame < ALIGN_UP(e820table[i].base_address +
 72 
            if (last_frame < ALIGN_UP(e820table[i].base_address +
72 
                e820table[i].size, FRAME_SIZE))
 73 
                e820table[i].size, FRAME_SIZE))
73 
                last_frame =
 74 
                last_frame =
74 
                    ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
 75 
                    ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
75 
        }          
 76 
        }          
76 
    }
 77 
    }
77 
}
 78 
}
78 
 
 79 
 
79 
static int cmd_e820mem(cmd_arg_t *argv);
 - 
 
80 
static cmd_info_t e820_info = {
 - 
 
81 
    .name = "e820list",
 - 
 
82 
    .description = "List e820 memory.",
 - 
 
83 
    .func = cmd_e820mem,
 - 
 
84 
    .argc = 0
 - 
 
85 
};
 - 
 
86 
 
 - 
 
87 
static char *e820names[] = {
 80 
static char *e820names[] = {
88 
    "invalid",
 81 
    "invalid",
89 
    "available",
 82 
    "available",
90 
    "reserved",
 83 
    "reserved",
91 
    "acpi",
 84 
    "acpi",
92 
    "nvs",
 85 
    "nvs",
93 
    "unusable"
 86 
    "unusable"
94 
};
 87 
};
95 
 
 88 
 
96 
 
 89 
 
97 
static int cmd_e820mem(cmd_arg_t *argv)
 90 
void physmem_print(void)
98 
{
 91 
{
99 
    unsigned int i;
 92 
    unsigned int i;
100 
    char *name;
 93 
    char *name;
101 
   
 94 
   
102 
    printf("Base               Size               Name\n");
 95 
    printf("Base               Size               Name\n");
Line 109... Line 102...
109 
            name = "invalid";
 102 
            name = "invalid";
110 
       
 103 
       
111 
        printf("%#18llx %#18llx %s\n", e820table[i].base_address,
 104 
        printf("%#18llx %#18llx %s\n", e820table[i].base_address,
112 
            e820table[i].size, name);
 105 
            e820table[i].size, name);
113 
    }          
 106 
    }          
114 
    return 0;
 - 
 
115 
}
 107 
}
116 
 
 108 
 
117 
 
 109 
 
118 
void frame_arch_init(void)
 110 
void frame_arch_init(void)
119 
{
 111 
{
120 
    static pfn_t minconf;
 112 
    pfn_t minconf;
121 
   
 113 
   
122 
    if (config.cpu_active == 1) {
 114 
    if (config.cpu_active == 1) {
123 
        cmd_initialize(&e820_info);
 - 
 
124 
        cmd_register(&e820_info);
 - 
 
125 
 
 - 
 
126 
        minconf = 1;
 115 
        minconf = 1;
127 
#ifdef CONFIG_SMP
 116 
#ifdef CONFIG_SMP
128 
        minconf = max(minconf,
 117 
        minconf = max(minconf,
129 
            ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
 118 
            ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
130 
                hardcoded_unmapped_kdata_size));
 119 
            hardcoded_unmapped_kdata_size));
131 
#endif
 120 
#endif
132 
#ifdef CONFIG_SIMICS_FIX
 121 
#ifdef CONFIG_SIMICS_FIX
133 
        minconf = max(minconf, ADDR2PFN(0x10000));
 122 
        minconf = max(minconf, ADDR2PFN(0x10000));
134 
#endif
 123 
#endif
135 
        init_e820_memory(minconf);
 124 
        init_e820_memory(minconf);
Line 138... Line 127...
138 
        frame_mark_unavailable(0, 1);
 127 
        frame_mark_unavailable(0, 1);
139 
       
 128 
       
140 
#ifdef CONFIG_SMP
 129 
#ifdef CONFIG_SMP
141 
        /* Reserve AP real mode bootstrap memory */
 130 
        /* Reserve AP real mode bootstrap memory */
142 
        frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
 131 
        frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
143 
            (hardcoded_unmapped_ktext_size +
 132 
            (hardcoded_unmapped_ktext_size +
144 
            hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
 133 
            hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
145 
       
 134 
       
146 
#ifdef CONFIG_SIMICS_FIX
 135 
#ifdef CONFIG_SIMICS_FIX
147 
        /* Don't know why, but these addresses help */
 136 
        /* Don't know why, but these addresses help */
148 
        frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
 137 
        frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
149 
#endif
 138 
#endif