Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c094fd authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: move e820_resource_resources to e820.c 



and make 32-bit resource registration more like 64 bit.

also move probe_roms back to setup_32.c

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8c5beb50

arch/x86/kernel/e820.c

+32 −0
Original line number Diff line number Diff line
@@ -998,3 +998,35 @@ void __init finish_e820_parsing(void) 
		e820_print_map("user");

	}

}



/*

 * Mark e820 reserved areas as busy for the resource manager.

 */

void __init e820_reserve_resources(void)

{

	int i;

	struct resource *res;



	res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);

	for (i = 0; i < e820.nr_map; i++) {

		switch (e820.map[i].type) {

		case E820_RAM:	res->name = "System RAM"; break;

		case E820_ACPI:	res->name = "ACPI Tables"; break;

		case E820_NVS:	res->name = "ACPI Non-volatile Storage"; break;

		default:	res->name = "reserved";

		}

		res->start = e820.map[i].addr;

		res->end = res->start + e820.map[i].size - 1;

#ifndef CONFIG_RESOURCES_64BIT

		if (res->end > 0x100000000ULL) {

			res++;

			continue;

		}

#endif

		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		insert_resource(&iomem_resource, res);

		res++;

	}

}

arch/x86/kernel/e820_32.c

+0 −192
Original line number Diff line number Diff line
@@ -15,198 +15,6 @@ 
#include <asm/e820.h>

#include <asm/setup.h>



static struct resource system_rom_resource = {

	.name	= "System ROM",

	.start	= 0xf0000,

	.end	= 0xfffff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

};



static struct resource extension_rom_resource = {

	.name	= "Extension ROM",

	.start	= 0xe0000,

	.end	= 0xeffff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

};



static struct resource adapter_rom_resources[] = { {

	.name 	= "Adapter ROM",

	.start	= 0xc8000,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

} };



static struct resource video_rom_resource = {

	.name 	= "Video ROM",

	.start	= 0xc0000,

	.end	= 0xc7fff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

};



#define ROMSIGNATURE 0xaa55



static int __init romsignature(const unsigned char *rom)

{

	const unsigned short * const ptr = (const unsigned short *)rom;

	unsigned short sig;



	return probe_kernel_address(ptr, sig) == 0 && sig == ROMSIGNATURE;

}



static int __init romchecksum(const unsigned char *rom, unsigned long length)

{

	unsigned char sum, c;



	for (sum = 0; length && probe_kernel_address(rom++, c) == 0; length--)

		sum += c;

	return !length && !sum;

}



static void __init probe_roms(void)

{

	const unsigned char *rom;

	unsigned long start, length, upper;

	unsigned char c;

	int i;



	/* video rom */

	upper = adapter_rom_resources[0].start;

	for (start = video_rom_resource.start; start < upper; start += 2048) {

		rom = isa_bus_to_virt(start);

		if (!romsignature(rom))

			continue;



		video_rom_resource.start = start;



		if (probe_kernel_address(rom + 2, c) != 0)

			continue;



		/* 0 < length <= 0x7f * 512, historically */

		length = c * 512;



		/* if checksum okay, trust length byte */

		if (length && romchecksum(rom, length))

			video_rom_resource.end = start + length - 1;



		request_resource(&iomem_resource, &video_rom_resource);

		break;

	}



	start = (video_rom_resource.end + 1 + 2047) & ~2047UL;

	if (start < upper)

		start = upper;



	/* system rom */

	request_resource(&iomem_resource, &system_rom_resource);

	upper = system_rom_resource.start;



	/* check for extension rom (ignore length byte!) */

	rom = isa_bus_to_virt(extension_rom_resource.start);

	if (romsignature(rom)) {

		length = extension_rom_resource.end - extension_rom_resource.start + 1;

		if (romchecksum(rom, length)) {

			request_resource(&iomem_resource, &extension_rom_resource);

			upper = extension_rom_resource.start;

		}

	}



	/* check for adapter roms on 2k boundaries */

	for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {

		rom = isa_bus_to_virt(start);

		if (!romsignature(rom))

			continue;



		if (probe_kernel_address(rom + 2, c) != 0)

			continue;



		/* 0 < length <= 0x7f * 512, historically */

		length = c * 512;



		/* but accept any length that fits if checksum okay */

		if (!length || start + length > upper || !romchecksum(rom, length))

			continue;



		adapter_rom_resources[i].start = start;

		adapter_rom_resources[i].end = start + length - 1;

		request_resource(&iomem_resource, &adapter_rom_resources[i]);



		start = adapter_rom_resources[i++].end & ~2047UL;

	}

}



/*

 * Request address space for all standard RAM and ROM resources

 * and also for regions reported as reserved by the e820.

 */

void __init init_iomem_resources(struct resource *code_resource,

		struct resource *data_resource,

		struct resource *bss_resource)

{

	int i;



	probe_roms();

	for (i = 0; i < e820.nr_map; i++) {

		struct resource *res;

#ifndef CONFIG_RESOURCES_64BIT

		if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)

			continue;

#endif

		res = kzalloc(sizeof(struct resource), GFP_ATOMIC);

		switch (e820.map[i].type) {

		case E820_RAM:	res->name = "System RAM"; break;

		case E820_ACPI:	res->name = "ACPI Tables"; break;

		case E820_NVS:	res->name = "ACPI Non-volatile Storage"; break;

		default:	res->name = "reserved";

		}

		res->start = e820.map[i].addr;

		res->end = res->start + e820.map[i].size - 1;

		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		if (request_resource(&iomem_resource, res)) {

			kfree(res);

			continue;

		}

		if (e820.map[i].type == E820_RAM) {

			/*

			 *  We don't know which RAM region contains kernel data,

			 *  so we try it repeatedly and let the resource manager

			 *  test it.

			 */

			request_resource(res, code_resource);

			request_resource(res, data_resource);

			request_resource(res, bss_resource);

#ifdef CONFIG_KEXEC

			if (crashk_res.start != crashk_res.end)

				request_resource(res, &crashk_res);

#endif

		}

	}

}



/* Overridden in paravirt.c if CONFIG_PARAVIRT */

char * __init __attribute__((weak)) memory_setup(void)

{

arch/x86/kernel/e820_64.c

+0 −24
Original line number Diff line number Diff line
@@ -41,30 +41,6 @@ unsigned long end_pfn; 
 */

unsigned long max_pfn_mapped;



/*

 * Mark e820 reserved areas as busy for the resource manager.

 */

void __init e820_reserve_resources(void)

{

	int i;

	struct resource *res;



	res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);

	for (i = 0; i < e820.nr_map; i++) {

		switch (e820.map[i].type) {

		case E820_RAM:	res->name = "System RAM"; break;

		case E820_ACPI:	res->name = "ACPI Tables"; break;

		case E820_NVS:	res->name = "ACPI Non-volatile Storage"; break;

		default:	res->name = "reserved";

		}

		res->start = e820.map[i].addr;

		res->end = res->start + e820.map[i].size - 1;

		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		insert_resource(&iomem_resource, res);

		res++;

	}

}



static void early_panic(char *msg)

{

	early_printk(msg);

arch/x86/kernel/setup_32.c

+175 −33
Original line number Diff line number Diff line
@@ -445,25 +445,28 @@ static void __init reserve_crashkernel(void) 
	ret = parse_crashkernel(boot_command_line, total_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size > 0) {

		if (crash_base > 0) {

		if (crash_base <= 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");

			return;

		}



		if (reserve_bootmem_generic(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"memory is in use\n");

			return;

		}



		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

				"for crashkernel (System RAM: %ldMB)\n",

				(unsigned long)(crash_size >> 20),

				(unsigned long)(crash_base >> 20),

				(unsigned long)(total_mem >> 20));



			if (reserve_bootmem(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

				printk(KERN_INFO "crashkernel reservation "

					"failed - memory is in use\n");

				return;

			}



		crashk_res.start = crash_base;

		crashk_res.end   = crash_base + crash_size - 1;

		} else

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");

		insert_resource(&iomem_resource, &crashk_res);

	}

}

#else
@@ -675,6 +678,8 @@ int x86_cpu_to_node_map_init[NR_CPUS] = { 
DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE;

#endif



static void probe_roms(void);



/*

 * Determine if we were loaded by an EFI loader.  If so, then we have also been

 * passed the efi memmap, systab, etc., so we should use these data structures
@@ -684,6 +689,7 @@ DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE; 
 */

void __init setup_arch(char **cmdline_p)

{

	int i;

	unsigned long max_low_pfn;



	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
@@ -745,6 +751,13 @@ void __init setup_arch(char **cmdline_p) 


	finish_e820_parsing();



	probe_roms();



	/* after parse_early_param, so could debug it */

	insert_resource(&iomem_resource, &code_resource);

	insert_resource(&iomem_resource, &data_resource);

	insert_resource(&iomem_resource, &bss_resource);



	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);

	*cmdline_p = command_line;
@@ -861,9 +874,16 @@ void __init setup_arch(char **cmdline_p) 
			"CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");

#endif



	e820_setup_gap();

	e820_reserve_resources();

	e820_mark_nosave_regions(max_low_pfn);



	request_resource(&iomem_resource, &video_ram_resource);

	/* request I/O space for devices used on all i[345]86 PCs */

	for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)

		request_resource(&ioport_resource, &standard_io_resources[i]);



	e820_setup_gap();



#ifdef CONFIG_VT

#if defined(CONFIG_VGA_CONSOLE)

	if (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))
@@ -874,25 +894,147 @@ void __init setup_arch(char **cmdline_p) 
#endif

}



/*

 * Request address space for all standard resources

 *

 * This is called just before pcibios_init(), which is also a

 * subsys_initcall, but is linked in later (in arch/i386/pci/common.c).

 */

static int __init request_standard_resources(void)

static struct resource system_rom_resource = {

	.name	= "System ROM",

	.start	= 0xf0000,

	.end	= 0xfffff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

};



static struct resource extension_rom_resource = {

	.name	= "Extension ROM",

	.start	= 0xe0000,

	.end	= 0xeffff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

};



static struct resource adapter_rom_resources[] = { {

	.name 	= "Adapter ROM",

	.start	= 0xc8000,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

}, {

	.name 	= "Adapter ROM",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

} };



static struct resource video_rom_resource = {

	.name 	= "Video ROM",

	.start	= 0xc0000,

	.end	= 0xc7fff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

};



#define ROMSIGNATURE 0xaa55



static int __init romsignature(const unsigned char *rom)

{

	const unsigned short * const ptr = (const unsigned short *)rom;

	unsigned short sig;



	return probe_kernel_address(ptr, sig) == 0 && sig == ROMSIGNATURE;

}



static int __init romchecksum(const unsigned char *rom, unsigned long length)

{

	unsigned char sum, c;



	for (sum = 0; length && probe_kernel_address(rom++, c) == 0; length--)

		sum += c;

	return !length && !sum;

}



static void __init probe_roms(void)

{

	const unsigned char *rom;

	unsigned long start, length, upper;

	unsigned char c;

	int i;



	printk(KERN_INFO "Setting up standard PCI resources\n");

	init_iomem_resources(&code_resource, &data_resource, &bss_resource);

	/* video rom */

	upper = adapter_rom_resources[0].start;

	for (start = video_rom_resource.start; start < upper; start += 2048) {

		rom = isa_bus_to_virt(start);

		if (!romsignature(rom))

			continue;



	request_resource(&iomem_resource, &video_ram_resource);

		video_rom_resource.start = start;



	/* request I/O space for devices used on all i[345]86 PCs */

	for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)

		request_resource(&ioport_resource, &standard_io_resources[i]);

	return 0;

		if (probe_kernel_address(rom + 2, c) != 0)

			continue;



		/* 0 < length <= 0x7f * 512, historically */

		length = c * 512;



		/* if checksum okay, trust length byte */

		if (length && romchecksum(rom, length))

			video_rom_resource.end = start + length - 1;



		request_resource(&iomem_resource, &video_rom_resource);

		break;

	}



	start = (video_rom_resource.end + 1 + 2047) & ~2047UL;

	if (start < upper)

		start = upper;



	/* system rom */

	request_resource(&iomem_resource, &system_rom_resource);

	upper = system_rom_resource.start;



	/* check for extension rom (ignore length byte!) */

	rom = isa_bus_to_virt(extension_rom_resource.start);

	if (romsignature(rom)) {

		length = extension_rom_resource.end - extension_rom_resource.start + 1;

		if (romchecksum(rom, length)) {

			request_resource(&iomem_resource, &extension_rom_resource);

			upper = extension_rom_resource.start;

		}

	}



	/* check for adapter roms on 2k boundaries */

	for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {

		rom = isa_bus_to_virt(start);

		if (!romsignature(rom))

			continue;



		if (probe_kernel_address(rom + 2, c) != 0)

			continue;



		/* 0 < length <= 0x7f * 512, historically */

		length = c * 512;



		/* but accept any length that fits if checksum okay */

		if (!length || start + length > upper || !romchecksum(rom, length))

			continue;



		adapter_rom_resources[i].start = start;

		adapter_rom_resources[i].end = start + length - 1;

		request_resource(&iomem_resource, &adapter_rom_resources[i]);



		start = adapter_rom_resources[i++].end & ~2047UL;

	}

}

subsys_initcall(request_standard_resources);

include/asm-x86/e820.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ extern void e820_register_active_regions(int nid, unsigned long start_pfn, 
					 unsigned long end_pfn);

extern u64 e820_hole_size(u64 start, u64 end);

extern void finish_e820_parsing(void);

extern void e820_reserve_resources(void);



#endif /* __ASSEMBLY__ */