Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f74fc3 authored by Anton Blanchard's avatar Anton Blanchard Committed by Greg Kroah-Hartman
Browse files

pseries: Fix 64 bit logical memory block panic 



commit 89c140bbaeee7a55ed0360a88f294ead2b95201b upstream.

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: default avatarAnton Blanchard <anton@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200715000820.1255764-1-anton@ozlabs.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1462b5e

arch/powerpc/platforms/pseries/hotplug-memory.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ static bool rtas_hp_event; 
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");