diff options
| author | Anton Blanchard <anton@ozlabs.org> | 2020-07-15 10:08:20 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-16 13:12:45 +1000 |
| commit | 89c140bbaeee7a55ed0360a88f294ead2b95201b (patch) | |
| tree | 1f201f5a9da8a01f2e1d2715c5dfb0d0f9117d04 /arch/powerpc/platforms/pseries/hotplug-memory.c | |
| parent | 29d9407e1037868b59d12948d42ad3ef58fc3a5a (diff) | |
| download | linux-stable-89c140bbaeee7a55ed0360a88f294ead2b95201b.tar.gz linux-stable-89c140bbaeee7a55ed0360a88f294ead2b95201b.tar.bz2 linux-stable-89c140bbaeee7a55ed0360a88f294ead2b95201b.zip | |
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
Diffstat (limited to 'arch/powerpc/platforms/pseries/hotplug-memory.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 73a5dcd977e1..5d545b78111f 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -25,7 +25,7 @@ unsigned long pseries_memory_block_size(void) { struct device_node *np; - unsigned int memblock_size = MIN_MEMORY_BLOCK_SIZE; + u64 memblock_size = MIN_MEMORY_BLOCK_SIZE; struct resource r; np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); |