| From 94c10f7eabca1f595ff3ee038b411498f5733359 Mon Sep 17 00:00:00 2001 |
| From: Anton Blanchard <anton@ozlabs.org> |
| Date: Wed, 15 Jul 2020 10:08:20 +1000 |
| Subject: [PATCH] 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: 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 |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c |
| index 65aaa971dc99..c5de633e8436 100644 |
| --- a/arch/powerpc/platforms/pseries/hotplug-memory.c |
| +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c |
| @@ -27,7 +27,7 @@ static bool rtas_hp_event; |
| 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"); |
| -- |
| 2.27.0 |
| |
