A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "arm64: Honor limits set by boot parameter"

Browse source
This commit is contained in:
qctecmdr 2020-03-02 04:36:30 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9ee272676c
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
arch/arm64/mm/init.c
View file

@ -275,7 +275,16 @@ static void __init update_memory_limit(void)
phys_addr_t min_ddr_sz = 0, offline_sz = 0;
int t_len = (2 * dt_root_size_cells) * sizeof(__be32);
ram_sz = memblock_phys_mem_size();
if (memory_limit == PHYS_ADDR_MAX)
ram_sz = memblock_phys_mem_size();
else if (IS_ALIGNED(memory_limit, MIN_MEMORY_BLOCK_SIZE))
ram_sz = memory_limit;
else {
WARN(1, "mem-offline is not supported for DDR size %lld\n",
memory_limit);
return;
}
node = of_get_flat_dt_subnode_by_name(dt_root, "mem-offline");
if (node == -FDT_ERR_NOTFOUND) {
pr_err("mem-offine node not found in FDT\n");
@ -441,12 +450,16 @@ void __init arm64_memblock_init(void)
memblock_remove(0, memstart_addr);
}
update_memory_limit();
/*
* Save bootloader imposed memory limit before we overwirte
* memblock.
*/
bootloader_memory_limit = memblock_end_of_DRAM();
if (memory_limit == PHYS_ADDR_MAX)
bootloader_memory_limit = memblock_end_of_DRAM();
else
bootloader_memory_limit = memblock_max_addr(memory_limit);
update_memory_limit();
/*
* Apply the memory limit if it was set. Since the kernel may be loaded