f9ba70535d
The specifications that talk about E820 map doesn't have an upper limit on the number of e820 entries. But, today's kernel has a hard limit of 32. With increase in memory size, we are seeing the number of E820 entries reaching close to 32. Patch below bumps the number upto 128. The patch changes the location of EDDBUF in zero-page (as it comes after E820). As, EDDBUF is not used by boot loaders, this patch should not have any effect on bootloader-setup code interface. Patch covers both i386 and x86-64. Tested on: * grub booting bzImage * lilo booting bzImage with EDID info enabled * pxeboot of bzImage Side-effect: bss increases by ~ 2K and init.data increases by ~7.5K on all systems, due to increase in size of static arrays. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/*
|
|
* linux/arch/x86_64/kernel/head64.c -- prepare to run common code
|
|
*
|
|
* Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
|
|
*
|
|
* $Id: head64.c,v 1.22 2001/07/06 14:28:20 ak Exp $
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/percpu.h>
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/proto.h>
|
|
#include <asm/smp.h>
|
|
#include <asm/bootsetup.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/desc.h>
|
|
|
|
/* Don't add a printk in there. printk relies on the PDA which is not initialized
|
|
yet. */
|
|
static void __init clear_bss(void)
|
|
{
|
|
extern char __bss_start[], __bss_end[];
|
|
memset(__bss_start, 0,
|
|
(unsigned long) __bss_end - (unsigned long) __bss_start);
|
|
}
|
|
|
|
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
|
|
#define OLD_CL_MAGIC_ADDR 0x90020
|
|
#define OLD_CL_MAGIC 0xA33F
|
|
#define OLD_CL_BASE_ADDR 0x90000
|
|
#define OLD_CL_OFFSET 0x90022
|
|
|
|
extern char saved_command_line[];
|
|
|
|
static void __init copy_bootdata(char *real_mode_data)
|
|
{
|
|
int new_data;
|
|
char * command_line;
|
|
|
|
memcpy(x86_boot_params, real_mode_data, BOOT_PARAM_SIZE);
|
|
new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);
|
|
if (!new_data) {
|
|
if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) {
|
|
printk("so old bootloader that it does not support commandline?!\n");
|
|
return;
|
|
}
|
|
new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
|
|
printk("old bootloader convention, maybe loadlin?\n");
|
|
}
|
|
command_line = (char *) ((u64)(new_data));
|
|
memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
|
|
printk("Bootdata ok (command line is %s)\n", saved_command_line);
|
|
}
|
|
|
|
static void __init setup_boot_cpu_data(void)
|
|
{
|
|
unsigned int dummy, eax;
|
|
|
|
/* get vendor info */
|
|
cpuid(0, (unsigned int *)&boot_cpu_data.cpuid_level,
|
|
(unsigned int *)&boot_cpu_data.x86_vendor_id[0],
|
|
(unsigned int *)&boot_cpu_data.x86_vendor_id[8],
|
|
(unsigned int *)&boot_cpu_data.x86_vendor_id[4]);
|
|
|
|
/* get cpu type */
|
|
cpuid(1, &eax, &dummy, &dummy,
|
|
(unsigned int *) &boot_cpu_data.x86_capability);
|
|
boot_cpu_data.x86 = (eax >> 8) & 0xf;
|
|
boot_cpu_data.x86_model = (eax >> 4) & 0xf;
|
|
boot_cpu_data.x86_mask = eax & 0xf;
|
|
}
|
|
|
|
extern char _end[];
|
|
|
|
void __init x86_64_start_kernel(char * real_mode_data)
|
|
{
|
|
char *s;
|
|
int i;
|
|
|
|
for (i = 0; i < 256; i++)
|
|
set_intr_gate(i, early_idt_handler);
|
|
asm volatile("lidt %0" :: "m" (idt_descr));
|
|
clear_bss();
|
|
pda_init(0);
|
|
copy_bootdata(real_mode_data);
|
|
#ifdef CONFIG_SMP
|
|
cpu_set(0, cpu_online_map);
|
|
#endif
|
|
/* default console: */
|
|
if (!strstr(saved_command_line, "console="))
|
|
strcat(saved_command_line, " console=tty0");
|
|
s = strstr(saved_command_line, "earlyprintk=");
|
|
if (s != NULL)
|
|
setup_early_printk(s);
|
|
#ifdef CONFIG_DISCONTIGMEM
|
|
s = strstr(saved_command_line, "numa=");
|
|
if (s != NULL)
|
|
numa_setup(s+5);
|
|
#endif
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
if (strstr(saved_command_line, "disableapic"))
|
|
disable_apic = 1;
|
|
#endif
|
|
/* You need early console to see that */
|
|
if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
|
|
panic("Kernel too big for kernel mapping\n");
|
|
|
|
setup_boot_cpu_data();
|
|
start_kernel();
|
|
}
|