lkml.org 
[lkml]   [2006]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 2.6.19-rc5-git7] EFI: mapping memory region of runtime services when using memmap kernel parameter
Date
From
From: Artiom Myaskouvskey <artiom.myaskouvskey@intel.com>



When using memmap kernel parameter in EFI boot we should also add to memory map

memory regions of runtime services to enable their mapping later.



Signed-off-by: Artiom Myaskouvskey <artiom.myaskouvskey@intel.com>

---



diff -uprN linux-2.6.19-rc5-git7.orig/include/linux/efi.h linux-2.6.19-rc5-git7/include/linux/efi.h

--- linux-2.6.19-rc5-git7.orig/include/linux/efi.h 2006-11-16 20:45:58.000000000 +0200

+++ linux-2.6.19-rc5-git7/include/linux/efi.h 2006-11-16 22:10:54.000000000 +0200

@@ -302,6 +302,7 @@ extern void efi_initialize_iomem_resourc

struct resource *data_resource);

extern unsigned long __init efi_get_time(void);

extern int __init efi_set_rtc_mmss(unsigned long nowtime);
+extern int is_available_memory(efi_memory_desc_t * md);

extern struct efi_memory_map memmap;



/**
diff -uprN linux-2.6.19-rc5-git7.orig/arch/i386/kernel/setup.c linux-2.6.19-rc5-git7/arch/i386/kernel/setup.c
--- linux-2.6.19-rc5-git7.orig/arch/i386/kernel/setup.c 2006-11-16 20:45:19.000000000 +0200
+++ linux-2.6.19-rc5-git7/arch/i386/kernel/setup.c 2006-11-16 22:05:01.000000000 +0200
@@ -349,25 +349,42 @@ static void __init probe_roms(void)

static void __init limit_regions(unsigned long long size)

{
unsigned long long current_addr = 0;

- int i;

+ int i , j;



if (efi_enabled) {
- efi_memory_desc_t *md;

- void *p;

+ efi_memory_desc_t *md, *next_md = 0;

+ void *p, *p1;



- for (p = memmap.map, i = 0; p < memmap.map_end;

- p += memmap.desc_size, i++) {
+ for (p = memmap.map, i = 0,j = 0, p1 = memmap.map;

+ p < memmap.map_end; p += memmap.desc_size, i++) {
md = p;

- current_addr = md->phys_addr + (md->num_pages << 12);

- if (md->type == EFI_CONVENTIONAL_MEMORY) {
+ next_md = p1;

+ current_addr = md->phys_addr + PFN_PHYS(md->num_pages);

+ if (is_available_memory(md)) {
+ if (md->phys_addr >= size) continue;
+ memcpy(next_md, md, memmap.desc_size);

if (current_addr >= size) {
- md->num_pages -=

- (((current_addr-size) + PAGE_SIZE-1) >> PAGE_SHIFT);

- memmap.nr_map = i + 1;

- return;

+ next_md->num_pages -=

+ PFN_UP(current_addr-size);

}
+ p1 += memmap.desc_size;

+ next_md = p1;

+ j++;

+ }
+ else if ((md->attribute & EFI_MEMORY_RUNTIME) ==
+ EFI_MEMORY_RUNTIME) {
+ /* In order to make runtime services available
+ * we have to include runtime

+ * memory regions in memory map */

+ memcpy(next_md, md, memmap.desc_size);

+ p1 += memmap.desc_size;

+ next_md = p1;

+ j++;

}
}
+ memmap.nr_map = j;

+ memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size);

+ return;

}
for (i = 0; i < e820.nr_map; i++) {
current_addr = e820.map[i].addr + e820.map[i].size;


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-11-16 21:53    [W:0.023 / U:1.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site