Commit 04c2eee5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 EFI fixes from Peter Anvin:
 "This is a collection of fixes for the EFI support.  The controversial
  bit here is a set of patches which bumps the boot protocol version as
  part of fixing some serious problems with the EFI handover protocol,
  used when booting under EFI using a bootloader as opposed to directly
  from EFI.  These changes should also make it a lot saner to support
  cross-mode 32/64-bit EFI booting in the future.  Getting these changes
  into 3.8 means we avoid presenting an inconsistent ABI to bootloaders.

  Other changes are display detection and fixing efivarfs."

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: remove attribute check from setup_efi_pci
  x86, build: Dynamically find entry points in compressed startup code
  x86, efi: Fix PCI ROM handing in EFI boot stub, in 32-bit mode
  x86, efi: Fix 32-bit EFI handover protocol entry point
  x86, efi: Fix display detection in EFI boot stub
  x86, boot: Define the 2.12 bzImage boot protocol
  x86/boot: Fix minor fd leakage in tools/relocs.c
  x86, efi: Set runtime_version to the EFI spec revision
  x86, efi: fix 32-bit warnings in setup_efi_pci()
  efivarfs: Delete dentry from dcache in efivarfs_file_write()
  efivarfs: Never return ENOENT from firmware
  efi, x86: Pass a proper identity mapping in efi_call_phys_prelog
  efivarfs: Drop link count of the right inode
parents bdb0ae6a becbd660

Documentation/x86/boot.txt

+26 −1
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment 
Protocol 2.11:	(Kernel 3.6) Added a field for offset of EFI handover

		protocol entry point.



Protocol 2.12:	(Kernel 3.9) Added the xloadflags field and extension fields

	 	to struct boot_params for for loading bzImage and ramdisk

		above 4G in 64bit.



**** MEMORY LAYOUT



The traditional memory map for the kernel loader, used for Image or
@@ -182,7 +186,7 @@ Offset Proto Name Meaning 
0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/1	2.10+	min_alignment	Minimum alignment, as a power of two

0236/2	N/A	pad3		Unused

0236/2	2.12+	xloadflags	Boot protocol option flags

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

023C/4	2.07+	hardware_subarch Hardware subarchitecture

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
@@ -582,6 +586,27 @@ Protocol: 2.10+ 
  misaligned kernel.  Therefore, a loader should typically try each

  power-of-two alignment from kernel_alignment down to this alignment.



Field name:     xloadflags

Type:           read

Offset/size:    0x236/2

Protocol:       2.12+



  This field is a bitmask.



  Bit 0 (read):	XLF_KERNEL_64

	- If 1, this kernel has the legacy 64-bit entry point at 0x200.



  Bit 1 (read): XLF_CAN_BE_LOADED_ABOVE_4G

        - If 1, kernel/boot_params/cmdline/ramdisk can be above 4G.



  Bit 2 (read):	XLF_EFI_HANDOVER_32

	- If 1, the kernel supports the 32-bit EFI handoff entry point

          given at handover_offset.



  Bit 3 (read): XLF_EFI_HANDOVER_64

	- If 1, the kernel supports the 64-bit EFI handoff entry point

          given at handover_offset + 0x200.



Field name:	cmdline_size

Type:		read

Offset/size:	0x238/4

Documentation/x86/zero-page.txt

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ Offset Proto Name Meaning 
090/010	ALL	hd1_info	hd1 disk parameter, OBSOLETE!!

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

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

0C8/004	ALL	ext_cmd_line_ptr  cmd_line_ptr high 32bits

140/080	ALL	edid_info	Video mode setup (struct edid_info)

1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB
@@ -27,6 +30,7 @@ Offset Proto Name Meaning 
1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer

				(below)

1EF/001	ALL	sentinel	Used to detect broken bootloaders

290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures

2D0/A00	ALL	e820_map	E820 memory map table

				(array of struct e820entry)

arch/x86/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ GCOV_PROFILE := n 
$(obj)/bzImage: asflags-y  := $(SVGA_MODE)



quiet_cmd_image = BUILD   $@

cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin > $@

cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/zoffset.h > $@



$(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE

	$(call if_changed,image)
@@ -92,7 +92,7 @@ targets += voffset.h 
$(obj)/voffset.h: vmlinux FORCE

	$(call if_changed,voffset)



sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'

sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|startup_64\|efi_pe_entry\|efi_stub_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'



quiet_cmd_zoffset = ZOFFSET $@

      cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@

arch/x86/boot/compressed/eboot.c

+11 −10
Original line number Diff line number Diff line
@@ -256,10 +256,10 @@ static efi_status_t setup_efi_pci(struct boot_params *params) 
	int i;

	struct setup_data *data;



	data = (struct setup_data *)params->hdr.setup_data;

	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;



	while (data && data->next)

		data = (struct setup_data *)data->next;

		data = (struct setup_data *)(unsigned long)data->next;



	status = efi_call_phys5(sys_table->boottime->locate_handle,

				EFI_LOCATE_BY_PROTOCOL, &pci_proto,
@@ -295,16 +295,18 @@ static efi_status_t setup_efi_pci(struct boot_params *params) 
		if (!pci)

			continue;



#ifdef CONFIG_X86_64

		status = efi_call_phys4(pci->attributes, pci,

					EfiPciIoAttributeOperationGet, 0,

					&attributes);



#else

		status = efi_call_phys5(pci->attributes, pci,

					EfiPciIoAttributeOperationGet, 0, 0,

					&attributes);

#endif

		if (status != EFI_SUCCESS)

			continue;



		if (!(attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM))

			continue;



		if (!pci->romimage || !pci->romsize)

			continue;
@@ -345,9 +347,9 @@ static efi_status_t setup_efi_pci(struct boot_params *params) 
		memcpy(rom->romdata, pci->romimage, pci->romsize);



		if (data)

			data->next = (uint64_t)rom;

			data->next = (unsigned long)rom;

		else

			params->hdr.setup_data = (uint64_t)rom;

			params->hdr.setup_data = (unsigned long)rom;



		data = (struct setup_data *)rom;
@@ -432,10 +434,9 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, 
			 * Once we've found a GOP supporting ConOut,

			 * don't bother looking any further.

			 */

			first_gop = gop;

			if (conout_found)

				break;



			first_gop = gop;

		}

	}

arch/x86/boot/compressed/head_32.S

+5 −3
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ ENTRY(startup_32) 
#ifdef CONFIG_EFI_STUB

	jmp	preferred_addr



	.balign	0x10

	/*

	 * We don't need the return address, so set up the stack so

	 * efi_main() can find its arugments.

	 * efi_main() can find its arguments.

	 */

ENTRY(efi_pe_entry)

	add	$0x4, %esp



	call	make_boot_params
@@ -50,8 +50,10 @@ ENTRY(startup_32) 
	pushl	%eax

	pushl	%esi

	pushl	%ecx

	sub	$0x4, %esp



	.org 0x30,0x90

ENTRY(efi_stub_entry)

	add	$0x4, %esp

	call	efi_main

	cmpl	$0, %eax

	movl	%eax, %esi

CRA Git | Maintained and supported by SUSTech CRA and CCSE