Subversion Repositories HelenOS

Rev

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

Rev 2787 Rev 4377
Line 52... Line 52...
52
uintptr_t last_frame = 0;
52
uintptr_t last_frame = 0;
53
 
53
 
54
static void init_e820_memory(pfn_t minconf)
54
static void init_e820_memory(pfn_t minconf)
55
{
55
{
56
    unsigned int i;
56
    unsigned int i;
57
    pfn_t start, conf;
-
 
58
    size_t size;
-
 
59
 
-
 
60
    for (i = 0; i < e820counter; i++) {
57
    for (i = 0; i < e820counter; i++) {
-
 
58
        uint64_t base = e820table[i].base_address;
-
 
59
        uint64_t size = e820table[i].size;
-
 
60
       
-
 
61
#ifdef __32_BITS__
-
 
62
       
-
 
63
        /* Ignore physical memory above 4 GB */
-
 
64
        if ((base >> 32) != 0)
-
 
65
            continue;
-
 
66
       
-
 
67
        /* Clip regions above 4 GB */
-
 
68
        if (((base + size) >> 32) != 0)
-
 
69
            size = 0xffffffff - base;
-
 
70
       
-
 
71
#endif
-
 
72
        pfn_t pfn;
-
 
73
        count_t count;
-
 
74
       
61
        if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
75
        if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-
 
76
            /* To be safe, make available zone possibly smaller */
62
            start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
77
            pfn = ADDR2PFN(ALIGN_UP(base, FRAME_SIZE));
63
            size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
78
            count = SIZE2FRAMES(ALIGN_DOWN(size, FRAME_SIZE));
64
           
79
           
-
 
80
            pfn_t conf;
65
            if ((minconf < start) || (minconf >= start + size))
81
            if ((minconf < pfn) || (minconf >= pfn + count))
66
                conf = start;
82
                conf = pfn;
67
            else
83
            else
68
                conf = minconf;
84
                conf = minconf;
69
           
85
           
70
            zone_create(start, size, conf, 0);
86
            zone_create(pfn, count, conf, ZONE_AVAILABLE);
-
 
87
           
-
 
88
            // XXX this has to be removed
-
 
89
            if (last_frame < ALIGN_UP(base + size, FRAME_SIZE))
-
 
90
                last_frame = ALIGN_UP(base + size, FRAME_SIZE);
-
 
91
        }
-
 
92
       
-
 
93
        if (e820table[i].type == MEMMAP_MEMORY_RESERVED) {
-
 
94
            /* To be safe, make reserved zone possibly larger */
-
 
95
            pfn = ADDR2PFN(ALIGN_DOWN(base, FRAME_SIZE));
-
 
96
            count = SIZE2FRAMES(ALIGN_UP(size, FRAME_SIZE));
71
           
97
           
72
            if (last_frame < ALIGN_UP(e820table[i].base_address +
98
            zone_create(pfn, count, 0, ZONE_RESERVED);
-
 
99
        }
-
 
100
       
73
                e820table[i].size, FRAME_SIZE))
101
        if (e820table[i].type == MEMMAP_MEMORY_ACPI) {
74
                last_frame =
102
            /* To be safe, make firmware zone possibly larger */
75
                    ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
103
            pfn = ADDR2PFN(ALIGN_DOWN(base, (uintptr_t) FRAME_SIZE));
-
 
104
            count = SIZE2FRAMES(ALIGN_UP(size, (uintptr_t) FRAME_SIZE));
-
 
105
           
-
 
106
            zone_create(pfn, count, 0, ZONE_FIRMWARE);
76
        }          
107
        }
77
    }
108
    }
78
}
109
}
79
 
110
 
80
static char *e820names[] = {
111
static char *e820names[] = {
81
    "invalid",
112
    "invalid",
Line 111... Line 142...
111
{
142
{
112
    pfn_t minconf;
143
    pfn_t minconf;
113
   
144
   
114
    if (config.cpu_active == 1) {
145
    if (config.cpu_active == 1) {
115
        minconf = 1;
146
        minconf = 1;
-
 
147
       
116
#ifdef CONFIG_SMP
148
#ifdef CONFIG_SMP
117
        minconf = max(minconf,
149
        minconf = max(minconf,
118
            ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
150
            ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
119
            hardcoded_unmapped_kdata_size));
151
            hardcoded_unmapped_kdata_size));
120
#endif
152
#endif
121
#ifdef CONFIG_SIMICS_FIX
-
 
122
        minconf = max(minconf, ADDR2PFN(0x10000));
-
 
123
#endif
-
 
124
        init_e820_memory(minconf);
153
        init_e820_memory(minconf);
125
 
154
       
126
        /* Reserve frame 0 (BIOS data) */
155
        /* Reserve frame 0 (BIOS data) */
127
        frame_mark_unavailable(0, 1);
156
        frame_mark_unavailable(0, 1);
128
       
157
       
129
#ifdef CONFIG_SMP
158
#ifdef CONFIG_SMP
130
        /* Reserve AP real mode bootstrap memory */
159
        /* Reserve AP real mode bootstrap memory */
131
        frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
160
        frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
132
            (hardcoded_unmapped_ktext_size +
161
            (hardcoded_unmapped_ktext_size +
133
            hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
162
            hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
134
       
-
 
135
#ifdef CONFIG_SIMICS_FIX
-
 
136
        /* Don't know why, but these addresses help */
-
 
137
        frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
-
 
138
#endif
-
 
139
#endif
163
#endif
140
    }
164
    }
141
}
165
}
142
 
166
 
143
/** @}
167
/** @}