[IA64] include EFI memory information in /proc/iomem
User mode kexec tools expect to find information about physical memory in /proc/iomem (as they do on x86) to validate the addresses that the new kernel will use. Signed-off-by: Khalid Aziz <khalid.aziz@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
parent
d8c97d5f3a
commit
be379124c0
|
@ -923,3 +923,90 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
|
||||||
*s = (u64)kern_memmap;
|
*s = (u64)kern_memmap;
|
||||||
*e = (u64)++k;
|
*e = (u64)++k;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
efi_initialize_iomem_resources(struct resource *code_resource,
|
||||||
|
struct resource *data_resource)
|
||||||
|
{
|
||||||
|
struct resource *res;
|
||||||
|
void *efi_map_start, *efi_map_end, *p;
|
||||||
|
efi_memory_desc_t *md;
|
||||||
|
u64 efi_desc_size;
|
||||||
|
char *name;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
|
efi_map_start = __va(ia64_boot_param->efi_memmap);
|
||||||
|
efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size;
|
||||||
|
efi_desc_size = ia64_boot_param->efi_memdesc_size;
|
||||||
|
|
||||||
|
res = NULL;
|
||||||
|
|
||||||
|
for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {
|
||||||
|
md = p;
|
||||||
|
|
||||||
|
if (md->num_pages == 0) /* should not happen */
|
||||||
|
continue;
|
||||||
|
|
||||||
|
flags = IORESOURCE_MEM;
|
||||||
|
switch (md->type) {
|
||||||
|
|
||||||
|
case EFI_MEMORY_MAPPED_IO:
|
||||||
|
case EFI_MEMORY_MAPPED_IO_PORT_SPACE:
|
||||||
|
continue;
|
||||||
|
|
||||||
|
case EFI_LOADER_CODE:
|
||||||
|
case EFI_LOADER_DATA:
|
||||||
|
case EFI_BOOT_SERVICES_DATA:
|
||||||
|
case EFI_BOOT_SERVICES_CODE:
|
||||||
|
case EFI_CONVENTIONAL_MEMORY:
|
||||||
|
if (md->attribute & EFI_MEMORY_WP) {
|
||||||
|
name = "System ROM";
|
||||||
|
flags |= IORESOURCE_READONLY;
|
||||||
|
} else {
|
||||||
|
name = "System RAM";
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EFI_ACPI_MEMORY_NVS:
|
||||||
|
name = "ACPI Non-volatile Storage";
|
||||||
|
flags |= IORESOURCE_BUSY;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EFI_UNUSABLE_MEMORY:
|
||||||
|
name = "reserved";
|
||||||
|
flags |= IORESOURCE_BUSY | IORESOURCE_DISABLED;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EFI_RESERVED_TYPE:
|
||||||
|
case EFI_RUNTIME_SERVICES_CODE:
|
||||||
|
case EFI_RUNTIME_SERVICES_DATA:
|
||||||
|
case EFI_ACPI_RECLAIM_MEMORY:
|
||||||
|
default:
|
||||||
|
name = "reserved";
|
||||||
|
flags |= IORESOURCE_BUSY;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) {
|
||||||
|
printk(KERN_ERR "failed to alocate resource for iomem\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
res->name = name;
|
||||||
|
res->start = md->phys_addr;
|
||||||
|
res->end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1;
|
||||||
|
res->flags = flags;
|
||||||
|
|
||||||
|
if (insert_resource(&iomem_resource, res) < 0)
|
||||||
|
kfree(res);
|
||||||
|
else {
|
||||||
|
/*
|
||||||
|
* We don't know which region contains
|
||||||
|
* kernel data so we try it repeatedly and
|
||||||
|
* let the resource manager test it.
|
||||||
|
*/
|
||||||
|
insert_resource(res, code_resource);
|
||||||
|
insert_resource(res, data_resource);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -78,6 +78,19 @@ struct screen_info screen_info;
|
||||||
unsigned long vga_console_iobase;
|
unsigned long vga_console_iobase;
|
||||||
unsigned long vga_console_membase;
|
unsigned long vga_console_membase;
|
||||||
|
|
||||||
|
static struct resource data_resource = {
|
||||||
|
.name = "Kernel data",
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct resource code_resource = {
|
||||||
|
.name = "Kernel code",
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||||
|
};
|
||||||
|
extern void efi_initialize_iomem_resources(struct resource *,
|
||||||
|
struct resource *);
|
||||||
|
extern char _text[], _edata[], _etext[];
|
||||||
|
|
||||||
unsigned long ia64_max_cacheline_size;
|
unsigned long ia64_max_cacheline_size;
|
||||||
unsigned long ia64_iobase; /* virtual address for I/O accesses */
|
unsigned long ia64_iobase; /* virtual address for I/O accesses */
|
||||||
EXPORT_SYMBOL(ia64_iobase);
|
EXPORT_SYMBOL(ia64_iobase);
|
||||||
|
@ -171,6 +184,22 @@ sort_regions (struct rsvd_region *rsvd_region, int max)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Request address space for all standard resources
|
||||||
|
*/
|
||||||
|
static int __init register_memory(void)
|
||||||
|
{
|
||||||
|
code_resource.start = ia64_tpa(_text);
|
||||||
|
code_resource.end = ia64_tpa(_etext) - 1;
|
||||||
|
data_resource.start = ia64_tpa(_etext);
|
||||||
|
data_resource.end = ia64_tpa(_edata) - 1;
|
||||||
|
efi_initialize_iomem_resources(&code_resource, &data_resource);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
__initcall(register_memory);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* reserve_memory - setup reserved memory areas
|
* reserve_memory - setup reserved memory areas
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue