From patchwork Mon Oct 19 22:10:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 532559 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B45701401F0 for ; Tue, 20 Oct 2015 09:11:32 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 950E91A0B3E for ; Tue, 20 Oct 2015 09:11:32 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bn0105.outbound.protection.outlook.com [157.56.110.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id B95D71A047B for ; Tue, 20 Oct 2015 09:10:34 +1100 (AEDT) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.buserror.net (50.157.106.250) by BN3PR03MB1480.namprd03.prod.outlook.com (10.163.35.143) with Microsoft SMTP Server (TLS) id 15.1.300.14; Mon, 19 Oct 2015 22:10:26 +0000 From: Scott Wood To: Subject: [PATCH v3 13/17] powerpc/book3e-64: Don't limit paca to 256 MiB Date: Mon, 19 Oct 2015 17:10:18 -0500 Message-ID: <1445292618-20418-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444189702-17241-14-git-send-email-scottwood@freescale.com> References: <1444189702-17241-14-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [50.157.106.250] X-ClientProxiedBy: BLUPR19CA0038.namprd19.prod.outlook.com (25.162.230.176) To BN3PR03MB1480.namprd03.prod.outlook.com (25.163.35.143) X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1480; 2:ue5YFP2gF+6vvnOZP+EnnHYT6jqBgFMKgu94M4Xv2PRmiZGrKDMYv3UwZihRXbg1xCAY3AFwU9XIORLQnW4qw8JsnAApXzKxmn9e0N/bKOUcwmC+xv7fFGPaquIG9DvBw8oO6EvPLpeMWeEWFeRRAiWslElAClcAECHzGmVlPa8=; 3:/EO+JfVrUv4XYK9/nMfWSVzfDPnK0ui38MPUXkeCgPolh+bqj3koncrXpdt0VFZoTal8icGZhSpSH53IKWXmGbV5i6P4PblcwYWNb03M4DnyOWCwHLBeRLdxCkqlz8ygEkLbELDWsoBS6b4Z2QODVA==; 25:S2JFoavaTUoBnA2/qgQMvPpcvC3Z6vzL2IY3M6Iqln8atjqoj5JdfICdIlEKuMdsBjSFSKBWD/hdo693eDMuz4INg0mXrPUHHzXjBY8kbUEEaSWxB9PV2ti/HkdIT+5eaI6GmNv/BVrumVjYqLahaJzksycKQaQaGxQnK7jL7jjiGxdwCiuyLLnc+QVZvZXq5VwiW2aCsTUkOWe1/wxdMpfyGffDd1NQ6KUb6eulb+ou9DRtGQtPf8XSMhx9RQc3IOro8G599HYBiffi9ryZZA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1480; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1480; 20:fg17A/a4g1Q2JFY9YaLK8hT1EgOPpnJoRvEA8ZZFxZDXG4nMQz0tpP6JvH5XuBhvQFmBWgns2HkPGrxlAXxmreOmf8D7hbLxJSw5a3D13dCKwr+WI+MBVTBPo/leTZ0WTr9p4bbO9uv8E25li6KPr87TFY/jH5GXBy5JTktTpVxm0X/BlNN544t74ERsaHoHfWw2jmNHK+emQcm0GugXJWzIHnFhCWllHR1y1xiNDS7boBSaMzlTWPrNhafx0NnygIUnp6ddTG1xgZgve7Gvp8L9HA5f2rhfphWlQPgDrqBImAexzN1GoqUbP7hbtbcjpglW6sCH2aZTHYvzOQIIidvyfb2XxebUzLT45lMEkztTbC1KTK1u4GOeHvZhAtCLB8/iN++DYGG8/2OKyE5LwTdxaMjpqlqYw+HTY2uf8iXOp0mAIb+UZoKkNzjhCg9f0yPVAcwEoUTt7zlgQoh9x5JGf0SJx5KBr//K9/oNw+EUB3lFkXl5Ww8G+LtN+6aV; 4:a3iBFobVX1zGyGqMJ2H4REWmDBIv7VsvmbZd6ujBMYLf9dcJdXfjq5WwD7C+QoWy21J5kqM8vXyUo5nO8leCHVhbaAANLg022EXYM7VqLsQa6fX1mWq1ZO3vo77pzTz8O90Jb7JdPzLJp7cW0cbmciddZejRz66GQedqQl9rcG3oJJk3rpw3tW+sP2rsmu0Ty0hpR4ihf9st9mEPKXCZG34CxsWEZtQzBObYMvJI4BcnddYQRQH3Vz3fei/pGGxWCkJaOmFdTqonGFxLTTUNywZHEofmKeEV6Oswh/om2U4erOOGS50HKN5B/7NO9tcev9Z7ymmqN72zBEg71bBDT2gezQtLg1wrGlw1F6rgI7s= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(3002001); SRVR:BN3PR03MB1480; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1480; X-Forefront-PRVS: 07349BFAD2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(76176999)(81156007)(122386002)(5004730100002)(5007970100001)(5001920100001)(40100003)(575784001)(86362001)(97736004)(50986999)(36756003)(189998001)(105586002)(101416001)(33646002)(106356001)(5003940100001)(64706001)(107886002)(110136002)(53416004)(5001960100002)(47776003)(42186005)(19580405001)(50466002)(69596002)(19580395003)(50226001)(66066001)(87976001)(229853001)(92566002)(2351001)(2950100001)(48376002)(46102003)(77096005)(5008740100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB1480; H:snotra.buserror.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1480; 23:17reYp9fjazgUhH3IcXV5v+r2OhzuINufdTPyV3e0?= =?us-ascii?Q?VeKwtw7PzbSwEmDOwJYelIz/oWctZHkHe+adLdh1tkO/5tK11Ri4RK8S+fMW?= =?us-ascii?Q?lX/ar56BYXB6EX+9M4rDhsGh4YWm4pMAGi7NzrcS0GC+POYt48+5oilJUPtZ?= =?us-ascii?Q?M/Fqh/hzUkojxgeVliiuiyYobsk69uiG5RcStpahq+4bV5rzE3jrAMs8BPKf?= =?us-ascii?Q?XUEqR1URB8XVdked7iM30o3nwmPTaqDjQ2KRqiDhKdrLUj0kf06esRt8GMA2?= =?us-ascii?Q?KOOArEkWsfDsVuJiP8TmmE5neMXILMYdlNYD+HPRxp9/elIr2LIM05Q88qGi?= =?us-ascii?Q?s0iuBb+Cl4/jfWsh7HgKDkQWkTPvujLqnJid7gjzZbUqlSdQV1MEcBHNzk7N?= =?us-ascii?Q?XKmqY4/sPtj4MhpGILctMHwI2lVmt92eLa/077IIUp1u/ee/Un6AefkiQGF9?= =?us-ascii?Q?6J2LRqkNCNokfcV1r1ZsoDER/iQxfRzPDBGxqEIvsnXFCYabLi2ID2GHEh8M?= =?us-ascii?Q?yep0/WLi9S5CPGytiZj6mFaVPEaruyqoCG+usVaImTgFy8msM1sy8/bvDM6L?= =?us-ascii?Q?/4DhB8d/MmB3Yuh2vlgsYr/SLq2Z9bN48MzJSKJXOvZgPF8yANpVzp6RjEOt?= =?us-ascii?Q?kK+w+nixbCdyhWxIwjS4wUC7YFLGp9HTFDbyJMofZ5bNPG4S1ExjR2qur6hf?= =?us-ascii?Q?GdxVcd+zgweObLZQm9bnS0yizsCCqn00uTcj4YIst0usgVQixWKJ1SaPlvvk?= =?us-ascii?Q?ecsBDdytwx5qm7n+5TmgN2t5bzbx63sfICbok2uOwndhR2vGmBbEeKVB85T9?= =?us-ascii?Q?92G+WKdkrhDCYp0FIwqInjTEpbdMeVWSnLH//+nAIG/KqNr4vt11zX3nXv91?= =?us-ascii?Q?JsevuaW8eJ7xOjIeopp91VeMChPT1Pkcx0zQw41d6I26xR1+3axandsvNeUK?= =?us-ascii?Q?hWhzdZacskEbI8Ld8dYWsY3JmoSsaofd+xL0P9C9Ql6Zqy1NRN7e+VUNfIPV?= =?us-ascii?Q?cnCpmkEILb601xsgkN0//BLjCwGK8tYgmxGEzmW47jreNbPMubfc/MMqi2CW?= =?us-ascii?Q?Uvp5tXf7RTmJ7Gqy8E1OgCaSGIzQOQqWGUna0FIe2wgL14kXIpC8MTG/Kzge?= =?us-ascii?Q?rlxPKnSy8cKusF0aiLyGI4H4JHzin7FygByazpzWeua9cqjhkfGPF4OaGwj/?= =?us-ascii?Q?Ib6q/l1yjQ/HbgnGz6UznNYRcuS7hwCSv7E?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1480; 5:hUuLrQrFIS4sGsX2B3AQwxMrCP2LmPlZDwD+PXCa5kG1Y357ZCwyzepw+cZ0lhv1vwrbGjEmcQ1aeUlE2jiVz3vx5tmd1fCaDKn+QFzcybq9Ei2R8P322rmEtHtlnb+OXf6zQdZL3KI14G0uoXn/rQ==; 24:SN98oacW6nfahZJGpOo5Df4UT8kaEE2dxioH6H9FOQcZ4MbjcM4/UHKb4fJ5p6tfNOY4UnRAw/bu8UJV84162cVZ1uMREB5poRVPfrJRPo8=; 20:CTTFlpDeC4B1c2zlXGKOjHuD7m3KYw8xJzIB+BnIlqWlrXCEtnFKA2gmINuIupzVCfa3ZHxwIXid7IcyjoheMg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2015 22:10:26.6942 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1480 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , kexec@lists.infradead.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This limit only makes sense on book3s, and on book3e it can cause problems with kdump if we don't have any memory under 256 MiB. Signed-off-by: Scott Wood --- v3: Fix book3s build error arch/powerpc/kernel/paca.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 5a23b69..01ea0ed 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -204,14 +204,19 @@ static int __initdata paca_size; void __init allocate_pacas(void) { - int cpu, limit; + u64 limit; + int cpu; + limit = ppc64_rma_size; + +#ifdef CONFIG_PPC_BOOK3S_64 /* * We can't take SLB misses on the paca, and we want to access them * in real mode, so allocate them within the RMA and also within * the first segment. */ - limit = min(0x10000000ULL, ppc64_rma_size); + limit = min(0x10000000ULL, limit); +#endif paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids);