Commit 8fee697d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Add request_standard_resources to x86_init 



The 32bit and the 64bit code are slighty different in the reservation
of standard resources. Also the upcoming Moorestown support needs its
own version of that.

Add it to x86_init_ops and initialize it with the 64bit default. 32bit
overrides it in early boot. Now moorestown can add it's own override
w/o sprinkling the code with more #ifdefs

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f7cf5a5b

arch/x86/include/asm/setup.h

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ extern unsigned long saved_video_mode; 
#define paravirt_post_allocator_init()	do {} while (0)

#endif



extern void reserve_standard_io_resources(void);

extern void i386_reserve_resources(void);



#ifndef _SETUP



/*

arch/x86/include/asm/x86_init.h

+3 −0
Original line number Diff line number Diff line
@@ -4,10 +4,13 @@ 
/**

 * struct x86_init_resources - platform specific resource related ops

 * @probe_roms:			probe BIOS roms

 * @reserve_resources:		reserve the standard resources for the

 *				platform

 *

 */

struct x86_init_resources {

	void (*probe_roms)(void);

	void (*reserve_resources)(void);

};



/**

arch/x86/kernel/head32.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ void __init i386_start_kernel(void) 
#endif

	/* Initilize 32bit specific setup functions */

	x86_init.resources.probe_roms = probe_roms;

	x86_init.resources.reserve_resources = i386_reserve_resources;



	reserve_ebda_region();

arch/x86/kernel/setup.c

+16 −12
Original line number Diff line number Diff line
@@ -171,13 +171,6 @@ static struct resource bss_resource = { 




#ifdef CONFIG_X86_32

static struct resource video_ram_resource = {

	.name	= "Video RAM area",

	.start	= 0xa0000,

	.end	= 0xbffff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

};



/* cpu data as detected by the assembly code in head.S */

struct cpuinfo_x86 new_cpu_data __cpuinitdata = {0, 0, 0, 0, -1, 1, 0, 0, -1};

/* common cpu data for all cpus */
@@ -605,7 +598,7 @@ static struct resource standard_io_resources[] = { 
		.flags = IORESOURCE_BUSY | IORESOURCE_IO }

};



static void __init reserve_standard_io_resources(void)

void __init reserve_standard_io_resources(void)

{

	int i;
@@ -1013,10 +1006,7 @@ void __init setup_arch(char **cmdline_p) 
	e820_reserve_resources();

	e820_mark_nosave_regions(max_low_pfn);



#ifdef CONFIG_X86_32

	request_resource(&iomem_resource, &video_ram_resource);

#endif

	reserve_standard_io_resources();

	x86_init.resources.reserve_resources();



	e820_setup_gap();
@@ -1102,4 +1092,18 @@ void __init x86_quirk_time_init(void) 
	irq0.mask = cpumask_of_cpu(0);

	setup_irq(0, &irq0);

}



static struct resource video_ram_resource = {

	.name	= "Video RAM area",

	.start	= 0xa0000,

	.end	= 0xbffff,

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

};



void __init i386_reserve_resources(void)

{

	request_resource(&iomem_resource, &video_ram_resource);

	reserve_standard_io_resources();

}



#endif /* CONFIG_X86_32 */

arch/x86/kernel/x86_init.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 */

#include <linux/init.h>



#include <asm/x86_init.h>

#include <asm/setup.h>



void __cpuinit x86_init_noop(void) { }
@@ -17,5 +17,6 @@ struct __initdata x86_init_ops x86_init = { 


	.resources = {

		.probe_roms		= x86_init_noop,

		.reserve_resources	= reserve_standard_io_resources,

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE