system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-16 08:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
This reverts commit a28e3f4b90.

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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon 2014-07-31 14:00:03 +01:00
parent e4aa297a49
commit 9415667584
3 changed files with 0 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm64/Kconfig
View file

@ -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
help
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.
endmenu
menu "Userspace binary formats"

41
arch/arm64/include/asm/dmi.h
View file

@ -1,41 +0,0 @@
/*
* arch/arm64/include/asm/dmi.h
*
* Copyright (C) 2013 Linaro Limited.
* Written by: Yi Li (yi.li@linaro.org)
*
* 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)
#endif

2
arch/arm64/kernel/setup.c
View file

@ -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);
dmi_scan_machine();
return 0;
}
arch_initcall_sync(arm64_device_init);