openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pseries: Fix 64 bit logical memory block panic 

Booting with a 4GB LMB size causes us to panic:

  qemu-system-ppc64: OS terminated: OS panic:
      Memory block size not suitable: 0x0

Fix pseries_memory_block_size() to handle 64 bit LMBs.

Cc: stable@vger.kernel.org
Signed-off-by: Anton Blanchard <anton@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200715000820.1255764-1-anton@ozlabs.org
This commit is contained in:
Anton Blanchard 2020-07-15 10:08:20 +10:00 committed by Michael Ellerman
parent 29d9407e10
commit 89c140bbae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/pseries/hotplug-memory.c
View File

@ -25,7 +25,7 @@
unsigned long pseries_memory_block_size(void) unsigned long pseries_memory_block_size(void)
{ {
struct device_node *np; struct device_node *np;
unsigned int memblock_size = MIN_MEMORY_BLOCK_SIZE; u64 memblock_size = MIN_MEMORY_BLOCK_SIZE;
struct resource r; struct resource r;
np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");