[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging-4.14] xen/arm: bootfdt: Ignore empty memory bank
commit 7d2b21fd36c2a47799eed71c67bae7faa1ec4272 Author: Julien Grall <jgrall@xxxxxxxxxx> AuthorDate: Fri Sep 18 18:11:16 2020 +0100 Commit: Stefano Stabellini <sstabellini@xxxxxxxxxx> CommitDate: Thu Nov 5 17:49:04 2020 -0800 xen/arm: bootfdt: Ignore empty memory bank At the moment, Xen will stop processing the Device Tree if a memory bank is empty (size == 0). Unfortunately, some of the Device Tree (such as on Colibri imx8qxp) may contain such a bank. This means Xen will not be able to boot properly. Relax the check to just ignore the banks. FWIW this also seems to be the behavior adopted by Linux. Reported-by: Daniel Wagner <Daniel.Wagner2@xxxxxxxxxxxxxxxxxx> Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx> Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx> Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> (cherry picked from commit 5a37207df52066efefe419c677b089a654d37afc) --- xen/arch/arm/bootfdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 08fb59f4e7..dcff512648 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -163,8 +163,9 @@ static int __init process_memory_node(const void *fdt, int node, for ( i = 0; i < banks && mem->nr_banks < NR_MEM_BANKS; i++ ) { device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + /* Some DT may describe empty bank, ignore them */ if ( !size ) - return -EINVAL; + continue; mem->bank[mem->nr_banks].start = start; mem->bank[mem->nr_banks].size = size; mem->nr_banks++; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |