diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2017-04-06 09:58:29 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2017-04-06 10:00:44 -0700 |
| commit | 5f794a70b7e385a40397ff43d05a42eeca5bcc4b (patch) | |
| tree | 8141ca9d04daad5caa88c409bfbd529a6c313ffa | |
| parent | 96b951dd144a041ec6e9ae8fa176eab7dedb3368 (diff) | |
| download | kernel-5f794a70b7e385a40397ff43d05a42eeca5bcc4b.tar.gz kernel-5f794a70b7e385a40397ff43d05a42eeca5bcc4b.tar.xz kernel-5f794a70b7e385a40397ff43d05a42eeca5bcc4b.zip | |
Fix for powerpc booting with large initrd (rhbz 1435154)
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | powerpc-prom-Increase-RMA-size-to-512MB.patch | 52 |
2 files changed, 58 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 72b5f62ef..79a7651c0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -602,6 +602,9 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch +#rhbz 1435154 +Patch666: powerpc-prom-Increase-RMA-size-to-512MB.patch + # END OF PATCH DEFINITIONS %endif @@ -2166,6 +2169,9 @@ fi # # %changelog +* Thu Apr 06 2017 Laura Abbott <labbott@fedoraproject.org> +- Fix for powerpc booting with large initrd (rhbz 1435154) + * Thu Apr 6 2017 Peter Robinson <pbrobinson@fedoraproject.org> - Rebase to new HummingBoard 2 DT patch - Minor ARM cleanups diff --git a/powerpc-prom-Increase-RMA-size-to-512MB.patch b/powerpc-prom-Increase-RMA-size-to-512MB.patch new file mode 100644 index 000000000..422f0a9ec --- /dev/null +++ b/powerpc-prom-Increase-RMA-size-to-512MB.patch @@ -0,0 +1,52 @@ +From patchwork Thu Mar 30 04:03:49 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: powerpc/prom: Increase RMA size to 512MB +From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> +X-Patchwork-Id: 745044 +Message-Id: <20170330040349.GA31756@us.ibm.com> +To: Michael Ellerman <mpe@ellerman.id.au> +Cc: praveen.pandey@in.ibm.com, linuxppc-dev@lists.ozlabs.org, + linux-kernel@vger.kernel.org +Date: Wed, 29 Mar 2017 21:03:49 -0700 + +>From 3ae8d1ed31b01b92b172fe20e4560cfbfab135ec Mon Sep 17 00:00:00 2001 +From: root <root@furatripa-lp2.aus.stglabs.ibm.com> +Date: Mon, 27 Mar 2017 19:43:14 -0400 +Subject: [PATCH] powerpc/prom: Increase RMA size to 512MB + +When booting very large systems with a large initrd, we run out of +space for either the RTAS or the flattened device tree (FDT). Boot +fails with messages like: + + Could not allocate memory for RTAS +or + No memory for flatten_device_tree (no room) + +Increasing the minimum RMA size to 512MB fixes the problem. This +should not have an impact on smaller LPARs (with 256MB memory), +as the firmware will cap the RMA to the memory assigned to the LPAR. + +Fix is based on input/discussions with Michael Ellerman. Thanks to +Praveen K. Pandey for testing on a large system. + +Reported-by: Praveen K. Pandey <preveen.pandey@in.ibm.com> +Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> +--- + arch/powerpc/kernel/prom_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c +index 1c1b44e..dd8a04f 100644 +--- a/arch/powerpc/kernel/prom_init.c ++++ b/arch/powerpc/kernel/prom_init.c +@@ -815,7 +815,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = { + .virt_base = cpu_to_be32(0xffffffff), + .virt_size = cpu_to_be32(0xffffffff), + .load_base = cpu_to_be32(0xffffffff), +- .min_rma = cpu_to_be32(256), /* 256MB min RMA */ ++ .min_rma = cpu_to_be32(512), /* 512MB min RMA */ + .min_load = cpu_to_be32(0xffffffff), /* full client load */ + .min_rma_percent = 0, /* min RMA percentage of total RAM */ + .max_pft_size = 48, /* max log_2(hash table size) */ |