Commit 11e612dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot updates from Ingo Molnar:
 "The main x86 bootup related changes in this cycle were:

   - more boot time optimizations.  (Len Brown)

   - implement hex output to allow the debugging of early bootup
     parameters.  (Kees Cook)

   - remove obsolete MCA leftovers.  (Paolo Pisati)"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/smpboot: Remove APIC.wait_for_init_deassert and atomic init_deasserted
  x86/smpboot: Remove SIPI delays from cpu_up()
  x86/smpboot: Remove udelay(100) when polling cpu_callin_map
  x86/smpboot: Remove udelay(100) when polling cpu_initialized_map
  x86/boot: Obsolete the MCA sys_desc_table
  x86/boot: Add hex output for debugging
parents 5778077d 656bba30

Documentation/x86/zero-page.txt

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Offset Proto Name Meaning 
				(struct ist_info)

080/010	ALL	hd0_info	hd0 disk parameter, OBSOLETE!!

090/010	ALL	hd1_info	hd1 disk parameter, OBSOLETE!!

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table)

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table),

				OBSOLETE!!

0B0/010	ALL	olpc_ofw_header	OLPC's OpenFirmware CIF and friends

0C0/004	ALL	ext_ramdisk_image ramdisk_image high 32bits

0C4/004	ALL	ext_ramdisk_size  ramdisk_size high 32bits

arch/x86/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ targets += fdimage fdimage144 fdimage288 image.iso mtools.conf 
subdir-		:= compressed



setup-y		+= a20.o bioscall.o cmdline.o copy.o cpu.o cpuflags.o cpucheck.o

setup-y		+= early_serial_console.o edd.o header.o main.o mca.o memory.o

setup-y		+= early_serial_console.o edd.o header.o main.o memory.o

setup-y		+= pm.o pmjump.o printf.o regs.o string.o tty.o video.o

setup-y		+= video-mode.o version.o

setup-$(CONFIG_X86_APM_BOOT) += apm.o

arch/x86/boot/boot.h

+0 −3
Original line number Diff line number Diff line
@@ -307,9 +307,6 @@ void query_edd(void); 
/* header.S */

void __attribute__((noreturn)) die(void);



/* mca.c */

int query_mca(void);



/* memory.c */

int detect_memory(void);

arch/x86/boot/compressed/eboot.c

+0 −4
Original line number Diff line number Diff line
@@ -1041,7 +1041,6 @@ void setup_graphics(struct boot_params *boot_params) 
struct boot_params *make_boot_params(struct efi_config *c)

{

	struct boot_params *boot_params;

	struct sys_desc_table *sdt;

	struct apm_bios_info *bi;

	struct setup_header *hdr;

	struct efi_info *efi;
@@ -1089,7 +1088,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	hdr = &boot_params->hdr;

	efi = &boot_params->efi_info;

	bi = &boot_params->apm_bios_info;

	sdt = &boot_params->sys_desc_table;



	/* Copy the second sector to boot_params */

	memcpy(&hdr->jump, image->image_base + 512, 512);
@@ -1118,8 +1116,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	/* Clear APM BIOS info */

	memset(bi, 0, sizeof(*bi));



	memset(sdt, 0, sizeof(*sdt));



	status = efi_parse_options(cmdline_ptr);

	if (status != EFI_SUCCESS)

		goto fail2;

arch/x86/boot/compressed/misc.c

+24 −0
Original line number Diff line number Diff line
@@ -220,6 +220,23 @@ void __putstr(const char *s) 
	outb(0xff & (pos >> 1), vidport+1);

}



void __puthex(unsigned long value)

{

	char alpha[2] = "0";

	int bits;



	for (bits = sizeof(value) * 8 - 4; bits >= 0; bits -= 4) {

		unsigned long digit = (value >> bits) & 0xf;



		if (digit < 0xA)

			alpha[0] = '0' + digit;

		else

			alpha[0] = 'a' + (digit - 0xA);



		__putstr(alpha);

	}

}



static void error(char *x)

{

	error_putstr("\n\n");
@@ -399,6 +416,13 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, 
	free_mem_ptr     = heap;	/* Heap */

	free_mem_end_ptr = heap + BOOT_HEAP_SIZE;



	/* Report initial kernel position details. */

	debug_putaddr(input_data);

	debug_putaddr(input_len);

	debug_putaddr(output);

	debug_putaddr(output_len);

	debug_putaddr(run_size);



	/*

	 * The memory hole needed for the kernel is the larger of either

	 * the entire decompressed kernel plus relocation table, or the

CRA Git | Maintained and supported by SUSTech CRA and CCSE