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

Commit c45a707d authored by Huang, Ying's avatar Huang, Ying Committed by Thomas Gleixner
Browse files

x86: linked list of setup_data for i386 



This patch adds linked list of struct setup_data supported for i386.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Cc: andi@firstfloor.org
Cc: mingo@redhat.com
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0c51a965

arch/x86/kernel/head.c

+18 −0
Original line number Diff line number Diff line
@@ -53,3 +53,21 @@ void __init reserve_ebda_region(void) 
	/* reserve all memory between lowmem and the 1MB mark */

	reserve_early(lowmem, 0x100000, "BIOS reserved");

}



void __init reserve_setup_data(void)

{

	struct setup_data *data;

	u64 pa_data;

	char buf[32];



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, sizeof(*data));

		sprintf(buf, "setup data %x", data->type);

		reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf);

		pa_data = data->next;

		early_iounmap(data, sizeof(*data));

	}

}

arch/x86/kernel/head64.c

+0 −18
Original line number Diff line number Diff line
@@ -51,24 +51,6 @@ static void __init copy_bootdata(char *real_mode_data) 
	}

}



static void __init reserve_setup_data(void)

{

	struct setup_data *data;

	unsigned long pa_data;

	char buf[32];



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, sizeof(*data));

		sprintf(buf, "setup data %x", data->type);

		reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf);

		pa_data = data->next;

		early_iounmap(data, sizeof(*data));

	}

}



void __init x86_64_start_kernel(char * real_mode_data)

{

	int i;

arch/x86/kernel/setup.c

+22 −0
Original line number Diff line number Diff line
@@ -137,3 +137,25 @@ void __init setup_per_cpu_areas(void) 
}



#endif



void __init parse_setup_data(void)

{

	struct setup_data *data;

	u64 pa_data;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, PAGE_SIZE);

		switch (data->type) {

		default:

			break;

		}

#ifndef CONFIG_DEBUG_BOOT_PARAMS

		free_early(pa_data, pa_data+sizeof(*data)+data->len);

#endif

		pa_data = data->next;

		early_iounmap(data, PAGE_SIZE);

	}

}

arch/x86/kernel/setup_32.c

+3 −0
Original line number Diff line number Diff line
@@ -681,6 +681,7 @@ void __init setup_arch(char **cmdline_p) 
	pre_setup_arch_hook();

	early_cpu_init();

	early_ioremap_init();

	reserve_setup_data();



#ifdef CONFIG_EFI

	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
@@ -729,6 +730,8 @@ void __init setup_arch(char **cmdline_p) 
	bss_resource.start = virt_to_phys(&__bss_start);

	bss_resource.end = virt_to_phys(&__bss_stop)-1;



	parse_setup_data();



	parse_early_param();



	finish_e820_parsing();

arch/x86/kernel/setup_64.c

+0 −22
Original line number Diff line number Diff line
@@ -272,28 +272,6 @@ void __attribute__((weak)) __init memory_setup(void) 
       machine_specific_memory_setup();

}



static void __init parse_setup_data(void)

{

	struct setup_data *data;

	unsigned long pa_data;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, PAGE_SIZE);

		switch (data->type) {

		default:

			break;

		}

#ifndef CONFIG_DEBUG_BOOT_PARAMS

		free_early(pa_data, pa_data+sizeof(*data)+data->len);

#endif

		pa_data = data->next;

		early_iounmap(data, PAGE_SIZE);

	}

}



#ifdef CONFIG_PCI_MMCONFIG

extern void __cpuinit fam10h_check_enable_mmcfg(void);

extern void __init check_enable_amd_mmconf_dmi(void);