x86, efi: Don't use (U)EFI time services on 32 bit

UEFI time services are often broken once we're in virtual mode. We were
already refusing to use them on 64-bit systems, but it turns out that
they're also broken on some 32-bit firmware, including the Dell Venue.
Disable them for now, we can revisit once we have the 1:1 mappings code
incorporated.
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Link: http://lkml.kernel.org/r/1385754283-2464-1-git-send-email-matthew.garrett@nebula.com
Cc: <stable@vger.kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

(cherry picked from commit 04bf9ba7)
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

arch/x86/platform/efi/efi.c

@@ -699,63 +699,6 @@ void __init efi_init(void)
 	int i = 0;
 	void *tmp;
 
-#ifdef CONFIG_X86_32
-	if (boot_params.efi_info.efi_systab_hi ||
-	    boot_params.efi_info.efi_memmap_hi) {
-		pr_info("Table located above 4GB, disabling EFI.\n");
-		return;
-	}
-	efi_phys.systab = (efi_system_table_t *)boot_params.efi_info.efi_systab;
-#else
-	efi_phys.systab = (efi_system_table_t *)
-			  (boot_params.efi_info.efi_systab |
-			  ((__u64)boot_params.efi_info.efi_systab_hi<<32));
-#endif
-
-	if (efi_systab_init(efi_phys.systab))
-		return;
-
-	set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility);
-
-	/*
-	 * Show what we know for posterity
-	 */
-	c16 = tmp = early_ioremap(efi.systab->fw_vendor, 2);
-	if (c16) {
-		for (i = 0; i < sizeof(vendor) - 1 && *c16; ++i)
-			vendor[i] = *c16++;
-		vendor[i] = '\0';
-	} else
-		pr_err("Could not map the firmware vendor!\n");
-	early_iounmap(tmp, 2);
-
-	pr_info("EFI v%u.%.02u by %s\n",
-		efi.systab->hdr.revision >> 16,
-		efi.systab->hdr.revision & 0xffff, vendor);
-
-	if (efi_config_init(efi.systab->tables, efi.systab->nr_tables))
-		return;
-
-	set_bit(EFI_CONFIG_TABLES, &x86_efi_facility);
-
-	/*
-	 * Note: We currently don't support runtime services on an EFI
-	 * that doesn't match the kernel 32/64-bit mode.
-	 */
-
-	if (!efi_is_native())
-		pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
-	else {
-		if (disable_runtime || efi_runtime_init())
-			return;
-		set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
-	}
-
-	if (efi_memmap_init())
-		return;
-
-	set_bit(EFI_MEMMAP, &x86_efi_facility);
-
 #if EFI_DEBUG
 	print_efi_memmap();
 #endif