Commit 94156675 authored by Will Deacon's avatar Will Deacon
Browse files

Revert "arm64: dmi: Add SMBIOS/DMI support"

This reverts commit a28e3f4b


Ard and Yi Li report that this patch is broken by design, so revert it
and let them sort it out for 3.18 instead.
Reported-by: default avatarArd Biesheuvel <>
Signed-off-by: default avatarWill Deacon <>
parent e4aa297a
......@@ -360,17 +360,6 @@ config EFI
allow the kernel to be booted as an EFI application. This
is only useful on systems that have UEFI firmware.
config DMI
bool "Enable support for SMBIOS (DMI) tables"
depends on EFI
default y
This enables SMBIOS/DMI feature for systems.
This option is only useful on systems that have UEFI firmware.
However, even with this option, the resultant kernel should
continue to boot on existing non-UEFI platforms.
menu "Userspace binary formats"
* arch/arm64/include/asm/dmi.h
* Copyright (C) 2013 Linaro Limited.
* Written by: Yi Li (
* based on arch/ia64/include/asm/dmi.h
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
#ifndef __ASM_DMI_H
#define __ASM_DMI_H
#include <linux/slab.h>
#include <linux/efi.h>
static inline void __iomem *dmi_remap(u64 phys, u64 size)
void __iomem *p = efi_lookup_mapped_addr(phys);
* If the mapping spans multiple pages, do a minimal check to ensure
* that the mapping returned by efi_lookup_mapped_addr() covers the
* whole requested range (but ignore potential holes)
if ((phys & ~PAGE_MASK) + size > PAGE_SIZE
&& (p + size - 1) != efi_lookup_mapped_addr(phys + size - 1))
return NULL;
return p;
/* Reuse existing UEFI mappings for DMI */
#define dmi_alloc(l) kzalloc(l, GFP_KERNEL)
#define dmi_early_remap(x, l) dmi_remap(x, l)
#define dmi_early_unmap(x, l)
#define dmi_unmap(x)
......@@ -43,7 +43,6 @@
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
#include <linux/efi.h>
#include <linux/dmi.h>
#include <asm/fixmap.h>
#include <asm/cpu.h>
......@@ -414,7 +413,6 @@ void __init setup_arch(char **cmdline_p)
static int __init arm64_device_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment