mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-18 18:23:53 +08:00
97f2645f35
The use of config_enabled() against config options is ambiguous. In practical terms, config_enabled() is equivalent to IS_BUILTIN(), but the author might have used it for the meaning of IS_ENABLED(). Using IS_ENABLED(), IS_BUILTIN(), IS_MODULE() etc. makes the intention clearer. This commit replaces config_enabled() with IS_ENABLED() where possible. This commit is only touching bool config options. I noticed two cases where config_enabled() is used against a tristate option: - config_enabled(CONFIG_HWMON) [ drivers/net/wireless/ath/ath10k/thermal.c ] - config_enabled(CONFIG_BACKLIGHT_CLASS_DEVICE) [ drivers/gpu/drm/gma500/opregion.c ] I did not touch them because they should be converted to IS_BUILTIN() in order to keep the logic, but I was not sure it was the authors' intention. Link: http://lkml.kernel.org/r/1465215656-20569-1-git-send-email-yamada.masahiro@socionext.com Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Kees Cook <keescook@chromium.org> Cc: Stas Sergeev <stsp@list.ru> Cc: Matt Redfearn <matt.redfearn@imgtec.com> Cc: Joshua Kinard <kumba@gentoo.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Borislav Petkov <bp@suse.de> Cc: Markos Chandras <markos.chandras@imgtec.com> Cc: "Dmitry V. Levin" <ldv@altlinux.org> Cc: yu-cheng yu <yu-cheng.yu@intel.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: Brian Gerst <brgerst@gmail.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Will Drewry <wad@chromium.org> Cc: Nikolay Martynov <mar.kolya@gmail.com> Cc: Huacai Chen <chenhc@lemote.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> Cc: Rafal Milecki <zajec5@gmail.com> Cc: James Cowgill <James.Cowgill@imgtec.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Alex Smith <alex.smith@imgtec.com> Cc: Adam Buchbinder <adam.buchbinder@gmail.com> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: Mikko Rapeli <mikko.rapeli@iki.fi> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com> Cc: "Luis R. Rodriguez" <mcgrof@do-not-panic.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Ingo Molnar <mingo@redhat.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Roland McGrath <roland@hack.frob.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Kalle Valo <kvalo@qca.qualcomm.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Tony Wu <tung7970@gmail.com> Cc: Huaitong Han <huaitong.han@intel.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Juergen Gross <jgross@suse.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Andrea Gelmini <andrea.gelmini@gelma.net> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Rabin Vincent <rabin@rab.in> Cc: "Maciej W. Rozycki" <macro@imgtec.com> Cc: David Daney <david.daney@cavium.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
163 lines
4.3 KiB
C
163 lines
4.3 KiB
C
/*
|
|
* Copyright (C) 2015 Imagination Technologies
|
|
* Author: Paul Burton <paul.burton@imgtec.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/bug.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/libfdt.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/sizes.h>
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/fw/fw.h>
|
|
#include <asm/page.h>
|
|
|
|
static unsigned char fdt_buf[16 << 10] __initdata;
|
|
|
|
/* determined physical memory size, not overridden by command line args */
|
|
extern unsigned long physical_memsize;
|
|
|
|
#define MAX_MEM_ARRAY_ENTRIES 1
|
|
|
|
static unsigned __init gen_fdt_mem_array(__be32 *mem_array, unsigned long size)
|
|
{
|
|
unsigned long size_preio;
|
|
unsigned entries;
|
|
|
|
entries = 1;
|
|
mem_array[0] = cpu_to_be32(PHYS_OFFSET);
|
|
if (IS_ENABLED(CONFIG_EVA)) {
|
|
/*
|
|
* The current Malta EVA configuration is "special" in that it
|
|
* always makes use of addresses in the upper half of the 32 bit
|
|
* physical address map, which gives it a contiguous region of
|
|
* DDR but limits it to 2GB.
|
|
*/
|
|
mem_array[1] = cpu_to_be32(size);
|
|
} else {
|
|
size_preio = min_t(unsigned long, size, SZ_256M);
|
|
mem_array[1] = cpu_to_be32(size_preio);
|
|
}
|
|
|
|
BUG_ON(entries > MAX_MEM_ARRAY_ENTRIES);
|
|
return entries;
|
|
}
|
|
|
|
static void __init append_memory(void *fdt, int root_off)
|
|
{
|
|
__be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES];
|
|
unsigned long memsize;
|
|
unsigned mem_entries;
|
|
int i, err, mem_off;
|
|
char *var, param_name[10], *var_names[] = {
|
|
"ememsize", "memsize",
|
|
};
|
|
|
|
/* if a memory node already exists, leave it alone */
|
|
mem_off = fdt_path_offset(fdt, "/memory");
|
|
if (mem_off >= 0)
|
|
return;
|
|
|
|
/* find memory size from the bootloader environment */
|
|
for (i = 0; i < ARRAY_SIZE(var_names); i++) {
|
|
var = fw_getenv(var_names[i]);
|
|
if (!var)
|
|
continue;
|
|
|
|
err = kstrtoul(var, 0, &physical_memsize);
|
|
if (!err)
|
|
break;
|
|
|
|
pr_warn("Failed to read the '%s' env variable '%s'\n",
|
|
var_names[i], var);
|
|
}
|
|
|
|
if (!physical_memsize) {
|
|
pr_warn("The bootloader didn't provide memsize: defaulting to 32MB\n");
|
|
physical_memsize = 32 << 20;
|
|
}
|
|
|
|
if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) {
|
|
/*
|
|
* SOC-it swaps, or perhaps doesn't swap, when DMA'ing
|
|
* the last word of physical memory.
|
|
*/
|
|
physical_memsize -= PAGE_SIZE;
|
|
}
|
|
|
|
/* default to using all available RAM */
|
|
memsize = physical_memsize;
|
|
|
|
/* allow the user to override the usable memory */
|
|
for (i = 0; i < ARRAY_SIZE(var_names); i++) {
|
|
snprintf(param_name, sizeof(param_name), "%s=", var_names[i]);
|
|
var = strstr(arcs_cmdline, param_name);
|
|
if (!var)
|
|
continue;
|
|
|
|
memsize = memparse(var + strlen(param_name), NULL);
|
|
}
|
|
|
|
/* if the user says there's more RAM than we thought, believe them */
|
|
physical_memsize = max_t(unsigned long, physical_memsize, memsize);
|
|
|
|
/* append memory to the DT */
|
|
mem_off = fdt_add_subnode(fdt, root_off, "memory");
|
|
if (mem_off < 0)
|
|
panic("Unable to add memory node to DT: %d", mem_off);
|
|
|
|
err = fdt_setprop_string(fdt, mem_off, "device_type", "memory");
|
|
if (err)
|
|
panic("Unable to set memory node device_type: %d", err);
|
|
|
|
mem_entries = gen_fdt_mem_array(mem_array, physical_memsize);
|
|
err = fdt_setprop(fdt, mem_off, "reg", mem_array,
|
|
mem_entries * 2 * sizeof(mem_array[0]));
|
|
if (err)
|
|
panic("Unable to set memory regs property: %d", err);
|
|
|
|
mem_entries = gen_fdt_mem_array(mem_array, memsize);
|
|
err = fdt_setprop(fdt, mem_off, "linux,usable-memory", mem_array,
|
|
mem_entries * 2 * sizeof(mem_array[0]));
|
|
if (err)
|
|
panic("Unable to set linux,usable-memory property: %d", err);
|
|
}
|
|
|
|
void __init *malta_dt_shim(void *fdt)
|
|
{
|
|
int root_off, len, err;
|
|
const char *compat;
|
|
|
|
if (fdt_check_header(fdt))
|
|
panic("Corrupt DT");
|
|
|
|
err = fdt_open_into(fdt, fdt_buf, sizeof(fdt_buf));
|
|
if (err)
|
|
panic("Unable to open FDT: %d", err);
|
|
|
|
root_off = fdt_path_offset(fdt_buf, "/");
|
|
if (root_off < 0)
|
|
panic("No / node in DT");
|
|
|
|
compat = fdt_getprop(fdt_buf, root_off, "compatible", &len);
|
|
if (!compat)
|
|
panic("No root compatible property in DT: %d", len);
|
|
|
|
/* if this isn't Malta, leave the DT alone */
|
|
if (strncmp(compat, "mti,malta", len))
|
|
return fdt;
|
|
|
|
append_memory(fdt_buf, root_off);
|
|
|
|
err = fdt_pack(fdt_buf);
|
|
if (err)
|
|
panic("Unable to pack FDT: %d\n", err);
|
|
|
|
return fdt_buf;
|
|
}
|