Skip to content

Commit 90f5f71

Browse files
Simon Schustergregkh
authored andcommitted
nios2: ensure that memblock.current_limit is set when setting pfn limits
[ Upstream commit a20b83c ] On nios2, with CONFIG_FLATMEM set, the kernel relies on memblock_get_current_limit() to determine the limits of mem_map, in particular for max_low_pfn. Unfortunately, memblock.current_limit is only default initialized to MEMBLOCK_ALLOC_ANYWHERE at this point of the bootup, potentially leading to situations where max_low_pfn can erroneously exceed the value of max_pfn and, thus, the valid range of available DRAM. This can in turn cause kernel-level paging failures, e.g.: [ 76.900000] Unable to handle kernel paging request at virtual address 20303000 [ 76.900000] ea = c0080890, ra = c000462c, cause = 14 [ 76.900000] Kernel panic - not syncing: Oops [ 76.900000] ---[ end Kernel panic - not syncing: Oops ]--- This patch fixes this by pre-calculating memblock.current_limit based on the upper limits of the available memory ranges via adjust_lowmem_bounds, a simplified version of the equivalent implementation within the arm architecture. Signed-off-by: Simon Schuster <schuster.simon@siemens-energy.com> Signed-off-by: Andreas Oetken <andreas.oetken@siemens-energy.com> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 6b0a292 commit 90f5f71

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

arch/nios2/kernel/setup.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,20 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low,
142142
*max_high = PFN_DOWN(memblock_end_of_DRAM());
143143
}
144144

145+
static void __init adjust_lowmem_bounds(void)
146+
{
147+
phys_addr_t block_start, block_end;
148+
u64 i;
149+
phys_addr_t memblock_limit = 0;
150+
151+
for_each_mem_range(i, &block_start, &block_end) {
152+
if (block_end > memblock_limit)
153+
memblock_limit = block_end;
154+
}
155+
156+
memblock_set_current_limit(memblock_limit);
157+
}
158+
145159
void __init setup_arch(char **cmdline_p)
146160
{
147161
console_verbose();
@@ -155,6 +169,7 @@ void __init setup_arch(char **cmdline_p)
155169
/* Keep a copy of command line */
156170
*cmdline_p = boot_command_line;
157171

172+
adjust_lowmem_bounds();
158173
find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
159174
max_mapnr = max_low_pfn;
160175

0 commit comments

Comments
 (0)