mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 11:06:40 +07:00
11199692d8
Change signature of free_reserved_area() according to Russell King's suggestion to fix following build warnings: arch/arm/mm/init.c: In function 'mem_init': arch/arm/mm/init.c:603:2: warning: passing argument 1 of 'free_reserved_area' makes integer from pointer without a cast [enabled by default] free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL); ^ In file included from include/linux/mman.h:4:0, from arch/arm/mm/init.c:15: include/linux/mm.h:1301:22: note: expected 'long unsigned int' but argument is of type 'void *' extern unsigned long free_reserved_area(unsigned long start, unsigned long end, mm/page_alloc.c: In function 'free_reserved_area': >> mm/page_alloc.c:5134:3: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast [enabled by default] In file included from arch/mips/include/asm/page.h:49:0, from include/linux/mmzone.h:20, from include/linux/gfp.h:4, from include/linux/mm.h:8, from mm/page_alloc.c:18: arch/mips/include/asm/io.h:119:29: note: expected 'const volatile void *' but argument is of type 'long unsigned int' mm/page_alloc.c: In function 'free_area_init_nodes': mm/page_alloc.c:5030:34: warning: array subscript is below array bounds [-Warray-bounds] Also address some minor code review comments. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Reported-by: Arnd Bergmann <arnd@arndb.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: <sworddragon2@aol.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: David Howells <dhowells@redhat.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Jianguo Wu <wujianguo@huawei.com> Cc: Joonsoo Kim <js1304@gmail.com> Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Michel Lespinasse <walken@google.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Rik van Riel <riel@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Tang Chen <tangchen@cn.fujitsu.com> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wen Congyang <wency@cn.fujitsu.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
166 lines
4.7 KiB
C
166 lines
4.7 KiB
C
/*
|
|
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/module.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/sections.h>
|
|
#include <asm/arcregs.h>
|
|
|
|
pgd_t swapper_pg_dir[PTRS_PER_PGD] __aligned(PAGE_SIZE);
|
|
char empty_zero_page[PAGE_SIZE] __aligned(PAGE_SIZE);
|
|
EXPORT_SYMBOL(empty_zero_page);
|
|
|
|
/* Default tot mem from .config */
|
|
static unsigned long arc_mem_sz = 0x20000000; /* some default */
|
|
|
|
/* User can over-ride above with "mem=nnn[KkMm]" in cmdline */
|
|
static int __init setup_mem_sz(char *str)
|
|
{
|
|
arc_mem_sz = memparse(str, NULL) & PAGE_MASK;
|
|
|
|
/* early console might not be setup yet - it will show up later */
|
|
pr_info("\"mem=%s\": mem sz set to %ldM\n", str, TO_MB(arc_mem_sz));
|
|
|
|
return 0;
|
|
}
|
|
early_param("mem", setup_mem_sz);
|
|
|
|
void __init early_init_dt_add_memory_arch(u64 base, u64 size)
|
|
{
|
|
arc_mem_sz = size & PAGE_MASK;
|
|
pr_info("Memory size set via devicetree %ldM\n", TO_MB(arc_mem_sz));
|
|
}
|
|
|
|
/*
|
|
* First memory setup routine called from setup_arch()
|
|
* 1. setup swapper's mm @init_mm
|
|
* 2. Count the pages we have and setup bootmem allocator
|
|
* 3. zone setup
|
|
*/
|
|
void __init setup_arch_memory(void)
|
|
{
|
|
unsigned long zones_size[MAX_NR_ZONES] = { 0, 0 };
|
|
unsigned long end_mem = CONFIG_LINUX_LINK_BASE + arc_mem_sz;
|
|
|
|
init_mm.start_code = (unsigned long)_text;
|
|
init_mm.end_code = (unsigned long)_etext;
|
|
init_mm.end_data = (unsigned long)_edata;
|
|
init_mm.brk = (unsigned long)_end;
|
|
|
|
/*
|
|
* We do it here, so that memory is correctly instantiated
|
|
* even if "mem=xxx" cmline over-ride is given and/or
|
|
* DT has memory node. Each causes an update to @arc_mem_sz
|
|
* and we finally add memory one here
|
|
*/
|
|
memblock_add(CONFIG_LINUX_LINK_BASE, arc_mem_sz);
|
|
|
|
/*------------- externs in mm need setting up ---------------*/
|
|
|
|
/* first page of system - kernel .vector starts here */
|
|
min_low_pfn = PFN_DOWN(CONFIG_LINUX_LINK_BASE);
|
|
|
|
/* Last usable page of low mem (no HIGHMEM yet for ARC port) */
|
|
max_low_pfn = max_pfn = PFN_DOWN(end_mem);
|
|
|
|
max_mapnr = num_physpages = max_low_pfn - min_low_pfn;
|
|
|
|
/*------------- reserve kernel image -----------------------*/
|
|
memblock_reserve(CONFIG_LINUX_LINK_BASE,
|
|
__pa(_end) - CONFIG_LINUX_LINK_BASE);
|
|
|
|
memblock_dump_all();
|
|
|
|
/*-------------- node setup --------------------------------*/
|
|
memset(zones_size, 0, sizeof(zones_size));
|
|
zones_size[ZONE_NORMAL] = num_physpages;
|
|
|
|
/*
|
|
* We can't use the helper free_area_init(zones[]) because it uses
|
|
* PAGE_OFFSET to compute the @min_low_pfn which would be wrong
|
|
* when our kernel doesn't start at PAGE_OFFSET, i.e.
|
|
* PAGE_OFFSET != CONFIG_LINUX_LINK_BASE
|
|
*/
|
|
free_area_init_node(0, /* node-id */
|
|
zones_size, /* num pages per zone */
|
|
min_low_pfn, /* first pfn of node */
|
|
NULL); /* NO holes */
|
|
}
|
|
|
|
/*
|
|
* mem_init - initializes memory
|
|
*
|
|
* Frees up bootmem
|
|
* Calculates and displays memory available/used
|
|
*/
|
|
void __init mem_init(void)
|
|
{
|
|
int codesize, datasize, initsize, reserved_pages, free_pages;
|
|
int tmp;
|
|
|
|
high_memory = (void *)(CONFIG_LINUX_LINK_BASE + arc_mem_sz);
|
|
|
|
totalram_pages = free_all_bootmem();
|
|
|
|
/* count all reserved pages [kernel code/data/mem_map..] */
|
|
reserved_pages = 0;
|
|
for (tmp = 0; tmp < max_mapnr; tmp++)
|
|
if (PageReserved(mem_map + tmp))
|
|
reserved_pages++;
|
|
|
|
/* XXX: nr_free_pages() is equivalent */
|
|
free_pages = max_mapnr - reserved_pages;
|
|
|
|
/*
|
|
* For the purpose of display below, split the "reserve mem"
|
|
* kernel code/data is already shown explicitly,
|
|
* Show any other reservations (mem_map[ ] et al)
|
|
*/
|
|
reserved_pages -= (((unsigned int)_end - CONFIG_LINUX_LINK_BASE) >>
|
|
PAGE_SHIFT);
|
|
|
|
codesize = _etext - _text;
|
|
datasize = _end - _etext;
|
|
initsize = __init_end - __init_begin;
|
|
|
|
pr_info("Memory Available: %dM / %ldM (%dK code, %dK data, %dK init, %dK reserv)\n",
|
|
PAGES_TO_MB(free_pages),
|
|
TO_MB(arc_mem_sz),
|
|
TO_KB(codesize), TO_KB(datasize), TO_KB(initsize),
|
|
PAGES_TO_KB(reserved_pages));
|
|
}
|
|
|
|
/*
|
|
* free_initmem: Free all the __init memory.
|
|
*/
|
|
void __init_refok free_initmem(void)
|
|
{
|
|
free_initmem_default(0);
|
|
}
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
void __init free_initrd_mem(unsigned long start, unsigned long end)
|
|
{
|
|
free_reserved_area((void *)start, (void *)end, 0, "initrd");
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_OF_FLATTREE
|
|
void __init early_init_dt_setup_initrd_arch(unsigned long start,
|
|
unsigned long end)
|
|
{
|
|
pr_err("%s(%lx, %lx)\n", __func__, start, end);
|
|
}
|
|
#endif /* CONFIG_OF_FLATTREE */
|