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

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

x86: seperate probe_roms into another file 



it is only needed for 32bit

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

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o 
obj-y			+= traps_$(BITS).o irq_$(BITS).o

obj-y			+= time_$(BITS).o ioport.o ldt.o

obj-y			+= setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o

obj-$(CONFIG_X86_32)	+= probe_roms_32.o

obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o

obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o

obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o setup64.o

arch/x86/kernel/probe_roms_32.c

0 → 100644
+166 −0
Original line number Diff line number Diff line 
#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/uaccess.h>

#include <linux/mmzone.h>

#include <linux/ioport.h>

#include <linux/seq_file.h>

#include <linux/console.h>

#include <linux/init.h>

#include <linux/edd.h>

#include <linux/dmi.h>

#include <linux/pfn.h>

#include <linux/pci.h>

#include <asm/pci-direct.h>





#include <asm/e820.h>

#include <asm/mmzone.h>

#include <asm/setup.h>

#include <asm/sections.h>

#include <asm/io.h>

#include <setup_arch.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;

}



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;

	}

}

arch/x86/kernel/setup_32.c

+0 −146
Original line number Diff line number Diff line
@@ -606,8 +606,6 @@ static void set_mca_bus(int x) 
static void set_mca_bus(int x) { }

#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
@@ -843,147 +841,3 @@ void __init setup_arch(char **cmdline_p) 
#endif

}

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;

	}

}

include/asm-x86/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ extern struct boot_params boot_params; 
#ifdef __i386__



void __init i386_start_kernel(void);

extern void probe_roms(void);



extern unsigned long init_pg_tables_start;

extern unsigned long init_pg_tables_end;