Commit 3b29b03a 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 changes from Ingo Molnar:
 "EFI loader robustness enhancements plus smaller fixes"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
  efi: Add a function to look up existing IO memory mappings
  efi: Defer freeing boot services memory until after ACPI init
  x86, EFI: Calculate the EFI framebuffer size instead of trusting the firmware
  efifb: Skip DMI checks if the bootloader knows what it's doing
  efi: initialize efi.runtime_version to make query_variable_info/update_capsule workable
  efi: Build EFI stub with EFI-appropriate options
  X86: Improve GOP detection in the EFI boot stub
parents 58ae9c0d 2223af38

arch/x86/boot/compressed/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ 
	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \

	$(obj)/piggy.o



$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone

$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone



ifeq ($(CONFIG_EFI_STUB), y)

	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o

endif

arch/x86/boot/compressed/eboot.c

+20 −14
Original line number Diff line number Diff line
@@ -276,8 +276,9 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, 
	nr_gops = size / sizeof(void *);

	for (i = 0; i < nr_gops; i++) {

		struct efi_graphics_output_mode_info *info;

		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;

		void *pciio;

		efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID;

		bool conout_found = false;

		void *dummy;

		void *h = gop_handle[i];



		status = efi_call_phys3(sys_table->boottime->handle_protocol,
@@ -285,19 +286,21 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, 
		if (status != EFI_SUCCESS)

			continue;



		efi_call_phys3(sys_table->boottime->handle_protocol,

			       h, &pciio_proto, &pciio);

		status = efi_call_phys3(sys_table->boottime->handle_protocol,

					h, &conout_proto, &dummy);



		if (status == EFI_SUCCESS)

			conout_found = true;



		status = efi_call_phys4(gop->query_mode, gop,

					gop->mode->mode, &size, &info);

		if (status == EFI_SUCCESS && (!first_gop || pciio)) {

		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {

			/*

			 * Apple provide GOPs that are not backed by

			 * real hardware (they're used to handle

			 * multiple displays). The workaround is to

			 * search for a GOP implementing the PCIIO

			 * protocol, and if one isn't found, to just

			 * fallback to the first GOP.

			 * Systems that use the UEFI Console Splitter may

			 * provide multiple GOP devices, not all of which are

			 * backed by real hardware. The workaround is to search

			 * for a GOP implementing the ConOut protocol, and if

			 * one isn't found, to just fall back to the first GOP.

			 */

			width = info->horizontal_resolution;

			height = info->vertical_resolution;
@@ -308,10 +311,10 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, 
			pixels_per_scan_line = info->pixels_per_scan_line;



			/*

			 * Once we've found a GOP supporting PCIIO,

			 * Once we've found a GOP supporting ConOut,

			 * don't bother looking any further.

			 */

			if (pciio)

			if (conout_found)

				break;



			first_gop = gop;
@@ -328,7 +331,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, 
	si->lfb_width = width;

	si->lfb_height = height;

	si->lfb_base = fb_base;

	si->lfb_size = fb_size;

	si->pages = 1;



	if (pixel_format == PIXEL_RGB_RESERVED_8BIT_PER_COLOR) {
@@ -376,6 +378,10 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, 
		si->rsvd_pos = 0;

	}



	si->lfb_size = si->lfb_linelength * si->lfb_height;



	si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS;



free_handle:

	efi_call_phys1(sys_table->boottime->free_pool, gop_handle);

	return status;

arch/x86/boot/compressed/eboot.h

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#define EFI_PAGE_SIZE		(1UL << EFI_PAGE_SHIFT)

#define EFI_READ_CHUNK_SIZE	(1024 * 1024)



#define EFI_CONSOLE_OUT_DEVICE_GUID    \

	EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, \

		  0x3f, 0xc1, 0x4d)



#define PIXEL_RGB_RESERVED_8BIT_PER_COLOR		0

#define PIXEL_BGR_RESERVED_8BIT_PER_COLOR		1

#define PIXEL_BIT_MASK					2

arch/x86/platform/efi/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o

obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o

arch/x86/platform/efi/efi-bgrt.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Intel Corporation

 * Author: Josh Triplett <josh@joshtriplett.org>

 *

 * Based on the bgrt driver:

 * Copyright 2012 Red Hat, Inc <mjg@redhat.com>

 * Author: Matthew Garrett

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/kernel.h>

#include <linux/acpi.h>

#include <linux/efi.h>

#include <linux/efi-bgrt.h>



struct acpi_table_bgrt *bgrt_tab;

void *bgrt_image;

size_t bgrt_image_size;



struct bmp_header {

	u16 id;

	u32 size;

} __packed;



void efi_bgrt_init(void)

{

	acpi_status status;

	void __iomem *image;

	bool ioremapped = false;

	struct bmp_header bmp_header;



	if (acpi_disabled)

		return;



	status = acpi_get_table("BGRT", 0,

	                        (struct acpi_table_header **)&bgrt_tab);

	if (ACPI_FAILURE(status))

		return;



	if (bgrt_tab->version != 1)

		return;

	if (bgrt_tab->image_type != 0 || !bgrt_tab->image_address)

		return;



	image = efi_lookup_mapped_addr(bgrt_tab->image_address);

	if (!image) {

		image = ioremap(bgrt_tab->image_address, sizeof(bmp_header));

		ioremapped = true;

		if (!image)

			return;

	}



	memcpy_fromio(&bmp_header, image, sizeof(bmp_header));

	if (ioremapped)

		iounmap(image);

	bgrt_image_size = bmp_header.size;



	bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL);

	if (!bgrt_image)

		return;



	if (ioremapped) {

		image = ioremap(bgrt_tab->image_address, bmp_header.size);

		if (!image) {

			kfree(bgrt_image);

			bgrt_image = NULL;

			return;

		}

	}



	memcpy_fromio(bgrt_image, image, bgrt_image_size);

	if (ioremapped)

		iounmap(image);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE