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

Commit 69019d77 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:
 "Main changes:

   - Add support for earlyprintk=efi which uses the EFI framebuffer.
     Very useful for debugging boot problems.

   - EFI stub support for large memory maps (more than 128 entries)

   - EFI ARM support - this was mostly done by generalizing x86 <-> ARM
     platform differences, such as by moving x86 EFI code into
     drivers/firmware/efi/ and sharing it with ARM.

   - Documentation updates

   - misc fixes"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
  x86/efi: Add EFI framebuffer earlyprintk support
  boot, efi: Remove redundant memset()
  x86/efi: Fix config_table_type array termination
  x86 efi: bugfix interrupt disabling sequence
  x86: EFI stub support for large memory maps
  efi: resolve warnings found on ARM compile
  efi: Fix types in EFI calls to match EFI function definitions.
  efi: Renames in handle_cmdline_files() to complete generalization.
  efi: Generalize handle_ramdisks() and rename to handle_cmdline_files().
  efi: Allow efi_free() to be called with size of 0
  efi: use efi_get_memory_map() to get final map for x86
  efi: generalize efi_get_memory_map()
  efi: Rename __get_map() to efi_get_memory_map()
  efi: Move unicode to ASCII conversion to shared function.
  efi: Generalize relocate_kernel() for use by other architectures.
  efi: Move relocate_kernel() to shared file.
  efi: Enforce minimum alignment of 1 page on allocations.
  efi: Rename memory allocation/free functions
  efi: Add system table pointer argument to shared functions.
  efi: Move common EFI stub code from x86 arch code to common location
  ...
parents 6df1e7f2 88392e9d

Documentation/kernel-parameters.txt

+5 −3
Original line number Diff line number Diff line
@@ -847,6 +847,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	earlyprintk=	[X86,SH,BLACKFIN,ARM]

			earlyprintk=vga

			earlyprintk=efi

			earlyprintk=xen

			earlyprintk=serial[,ttySn[,baudrate]]

			earlyprintk=serial[,0x...[,baudrate]]
@@ -860,7 +861,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Append ",keep" to not disable it when the real console

			takes over.



			Only vga or serial or usb debug port at a time.

			Only one of vga, efi, serial, or usb debug port can

			be used at a time.



			Currently only ttyS0 and ttyS1 may be specified by

			name.  Other I/O ports may be explicitly specified
@@ -874,8 +876,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Interaction with the standard serial driver is not

			very good.



			The VGA output is eventually overwritten by the real

			console.

			The VGA and EFI output is eventually overwritten by

			the real console.



			The xen output can only be used by Xen PV guests.

arch/ia64/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ extern void __iomem * ioremap(unsigned long offset, unsigned long size); 
extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);

extern void iounmap (volatile void __iomem *addr);

extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);

#define early_memremap(phys_addr, size)        early_ioremap(phys_addr, size)

extern void early_iounmap (volatile void __iomem *addr, unsigned long size);

static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)

{

arch/ia64/kernel/efi.c

+11 −43
Original line number Diff line number Diff line
@@ -44,10 +44,15 @@ 


#define EFI_DEBUG	0



static __initdata unsigned long palo_phys;



static __initdata efi_config_table_type_t arch_tables[] = {

	{PROCESSOR_ABSTRACTION_LAYER_OVERWRITE_GUID, "PALO", &palo_phys},

	{NULL_GUID, NULL, 0},

};



extern efi_status_t efi_call_phys (void *, ...);



struct efi efi;

EXPORT_SYMBOL(efi);

static efi_runtime_services_t *runtime;

static u64 mem_limit = ~0UL, max_addr = ~0UL, min_addr = 0UL;
@@ -423,9 +428,9 @@ static u8 __init palo_checksum(u8 *buffer, u32 length) 
 * Parse and handle PALO table which is published at:

 * http://www.dig64.org/home/DIG64_PALO_R1_0.pdf

 */

static void __init handle_palo(unsigned long palo_phys)

static void __init handle_palo(unsigned long phys_addr)

{

	struct palo_table *palo = __va(palo_phys);

	struct palo_table *palo = __va(phys_addr);

	u8  checksum;



	if (strncmp(palo->signature, PALO_SIG, sizeof(PALO_SIG) - 1)) {
@@ -467,12 +472,10 @@ void __init 
efi_init (void)

{

	void *efi_map_start, *efi_map_end;

	efi_config_table_t *config_tables;

	efi_char16_t *c16;

	u64 efi_desc_size;

	char *cp, vendor[100] = "unknown";

	int i;

	unsigned long palo_phys;



	/*

	 * It's too early to be able to use the standard kernel command line
@@ -514,8 +517,6 @@ efi_init (void) 
		       efi.systab->hdr.revision >> 16,

		       efi.systab->hdr.revision & 0xffff);



	config_tables = __va(efi.systab->tables);



	/* Show what we know for posterity */

	c16 = __va(efi.systab->fw_vendor);

	if (c16) {
@@ -528,43 +529,10 @@ efi_init (void) 
	       efi.systab->hdr.revision >> 16,

	       efi.systab->hdr.revision & 0xffff, vendor);



	efi.mps        = EFI_INVALID_TABLE_ADDR;

	efi.acpi       = EFI_INVALID_TABLE_ADDR;

	efi.acpi20     = EFI_INVALID_TABLE_ADDR;

	efi.smbios     = EFI_INVALID_TABLE_ADDR;

	efi.sal_systab = EFI_INVALID_TABLE_ADDR;

	efi.boot_info  = EFI_INVALID_TABLE_ADDR;

	efi.hcdp       = EFI_INVALID_TABLE_ADDR;

	efi.uga        = EFI_INVALID_TABLE_ADDR;



	palo_phys      = EFI_INVALID_TABLE_ADDR;



	for (i = 0; i < (int) efi.systab->nr_tables; i++) {

		if (efi_guidcmp(config_tables[i].guid, MPS_TABLE_GUID) == 0) {

			efi.mps = config_tables[i].table;

			printk(" MPS=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, ACPI_20_TABLE_GUID) == 0) {

			efi.acpi20 = config_tables[i].table;

			printk(" ACPI 2.0=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, ACPI_TABLE_GUID) == 0) {

			efi.acpi = config_tables[i].table;

			printk(" ACPI=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, SMBIOS_TABLE_GUID) == 0) {

			efi.smbios = config_tables[i].table;

			printk(" SMBIOS=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, SAL_SYSTEM_TABLE_GUID) == 0) {

			efi.sal_systab = config_tables[i].table;

			printk(" SALsystab=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {

			efi.hcdp = config_tables[i].table;

			printk(" HCDP=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid,

			 PROCESSOR_ABSTRACTION_LAYER_OVERWRITE_GUID) == 0) {

			palo_phys = config_tables[i].table;

			printk(" PALO=0x%lx", config_tables[i].table);

		}

	}

	printk("\n");

	if (efi_config_init(arch_tables) != 0)

		return;



	if (palo_phys != EFI_INVALID_TABLE_ADDR)

		handle_palo(palo_phys);

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1597,7 +1597,7 @@ config EFI_STUB 
          This kernel feature allows a bzImage to be loaded directly

	  by EFI firmware without the use of a bootloader.



	  See Documentation/x86/efi-stub.txt for more information.

	  See Documentation/efi-stub.txt for more information.



config SECCOMP

	def_bool y