From patchwork Sat Jul 18 20:08:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497414 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 C6DC414077A for ; Sun, 19 Jul 2015 06:24:34 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id A598C1A1E41 for ; Sun, 19 Jul 2015 06:24:34 +1000 (AEST) 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-bn1on0130.outbound.protection.outlook.com [157.56.110.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 0B7E51A0F08 for ; Sun, 19 Jul 2015 06:09:35 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.49) by CY1PR03MB1486.namprd03.prod.outlook.com (10.163.17.16) with Microsoft SMTP Server (TLS) id 15.1.213.14; Sat, 18 Jul 2015 20:09:28 +0000 From: Scott Wood To: Subject: [RFC PATCH 12/17] powerpc/book3e-64: Don't limit paca to 256 MiB Date: Sat, 18 Jul 2015 15:08:49 -0500 Message-ID: <1437250134-307-13-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437250134-307-1-git-send-email-scottwood@freescale.com> References: <1437250134-307-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY2PR21CA0002.namprd21.prod.outlook.com (25.162.74.140) To CY1PR03MB1486.namprd03.prod.outlook.com (25.163.17.16) X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 2:uDgP8UyHcn/br2RamA6UlOOI7BPInfQeburktr4oxKOJoTVC9An0yJJVivKv4Vr0; 3:zvOBToc7xgqb7FjCJMydNZQdb0kzaEB6pBkNFT0Tjvy/9hlrvpTWNvDo0VkT94+88lFG912FDQbXB2gjW5bkwiBuiR+ZL6Y+htSWnDJzYel1fiDs/xysucDT7KphIFd9ANs641c/Z4DFV40PBWycJA==; 25:a/N9uF10W4muqsF9wXfyvsImz5/NLMdyQAOUuK+GRsj4innhtFQPiRjF4M/xPJf9uo9Djn2C+FX01906aNAPOQCLsHLQc2cOAPLrlZXR89QGpaZpg3V/+ucwvuRmF4RCcGY2foo/8ARrBnuiuP+aLZZCvVWKcNAYMcbdM0SiDi67DIuKalocX+V6PbPsqHN2LzkYEWDiJO8qLvbY4yiFa+TpyAPOs+ZVeSa3ec36g+ssOohVbxeETBtnkO2OArpxznKkJUJLc1jH3191A8YjTA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:elLLAnr9VxhAwo4bb2y4WGZP8rPiRixtTbwvJKWWzaaJoDObY5u+kTXDslQfVBm7cfkmLSCrvOXdPcpSe9lOM8Ezm26fpocqD2mTHQNpyAnwLcZvpSUlYkqbeBMH49gz/4RWI7M1V/c0t2ZEZmDzUzQgflHQMZj6frxoUeH+11xdDAYXx8I6xUWMnGLvPZy/Ujl6e6HDGHmVYO6Yl/QkK2PQ8uFzqH+gKHz4sIi7q6KzxKX0kb8DuxwzmtsvFH3HSKyZCdO0rz2I7zSbrszoLaqgSugWfWtfspSjBlsODdNGmgjq+kDzbGvL8ul2jfvcCAapiY1ghiNXTKW0HkqJ3SeHUJZ+X+WpqO4Bxxb3o3rrKI0mGKsoiWveS3JWPE89rXHdl5GLmyog9Hy8QOKckLOm5X++gJcUb6EOwp1vgRa8cq/Y5iCqG+eMhgvf131M4cUJOyY98E9AsLGTUG37RxjyFVG5EJn3CcTmgUVY1BUh0n+d07td/JpdT7K4Knkz; 4:fv1QUK0dLt0vjOO7SCgiCwpR2picRZ1VPh1Z/pSMRDccvYJtVdEHEHlhBRsiBQ2IoVnwxEa/aoM7pPzTILitenT0V4KQB95Y8m2weuhdKPjIilylBn0SW/pAL8GWLOorewbITpPNbW8W141dn5oiyZo08R7vt4La4HdJPV1SLR3ETlZZ/usFsHTjW4Xk2NJ6HVx+bcJ+nlcUdF1KZoTDsrqL9StNs9Uyqe1hxGacZ1cYmWbwQpGQyC3CKab+y4OHdt8OSXxU7hpDNZ84jhArY7VqYZ5Btq4N2lQU/CEopV4= CY1PR03MB1486: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR03MB1486; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1486; X-Forefront-PRVS: 0641678E68 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(19580395003)(50466002)(19580405001)(229853001)(36756003)(46102003)(2351001)(42186005)(40100003)(87976001)(122386002)(33646002)(86362001)(62966003)(5001960100002)(5001920100001)(92566002)(2950100001)(110136002)(77096005)(107886002)(48376002)(77156002)(50986999)(76176999)(66066001)(47776003)(50226001)(5003940100001)(189998001)(217873001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1486; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 23:AKfzH/xYSKTEg5/gbBnyP6iLGCSgoJR0ok8n/h/8mvfgmsqJaU3tAQM32Xslh1AMFVUY0jdq09SIUxbPPoDbOAsmXKFKq6NzTPJrtTgrnS7SgWG6zy0oVUq+I8p5tKdJqGqVatLHLIMPZLAdRN5I27+Qb7d6NO1Qm/V2PDo8iz1H2Nyw5FCuASFfuc8MkrQOjm2KRFb4zSSWPPH0UXJO+EzGxZlGtYjvSf1649DdVdxDZmkjiK558mycwiReDwV9fbJGjLgLFGmobJwLNbJl0yDR6U5nWfjR6AJEGFmBK5oIR24IwWvvBeHVN1Xv4ujJd5V58HFcDG7nd/EVE4z5hblTnl2R4ayoTIGs/AQb52NMLzVTsnnYvmaX2O0swcat36tNlSXg8RagMmj9DO+kYxmhkQO8tj/xNdPoqtM9p7Tg7lqkGYKwQnvKJ8JmKvBzRX3MDAy5b7hma2IQul0Xgt6mAL/7NUM4t2yrgq9Gwnr0N0aaBNDKMkycOdByRtX0hXu26HigDwc2aAkACmUi1cFXsSEAkG5FBKJsdKKx+rPSFHJ7n62wZYlG6kCfIOc0z3WnmpwEA2bG65NKqncoVi5chvT8PTXvZnXMnOCzl7dTfBsnum54U3lLgnRQljHvWGJXUsUHAvwUadNvAx/PNyFCi3MZx0RrVHBjeXvOoTOYmxTW6RbRVuvrvaP+3o1FUKVUIponGiNfO+xQTCemK7C/uloN4bD26YqLSo8w/oNo1W6oIF9DS3Qc2UKudATyYIUvMJS8DMTLWyzmU9h4NNIkVrUAz23si1qz1NrqZuGQZ0dqqnm57gO/8568A5xVFkWnsUEYkTlD6JY2qNKwVibsyb/4AMTMKBiuE+TqwinEJdw5qyoONb0gSy5M99whEq7xpRtxYgoBybnszwFWU0qIdMN6KtKiy3Cf6SBav94= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:eqilUnYHtCoYFBddRugswRV6qJQeNH+oIMZZDf8BvR4P1whPFBh1AzPHGrj7GiDbj1l+peZ97L2o9+il30P6ReWlYG5QoWtuu1PMCDVotgrxEE/cZH8P0h3OqE0eZfTzb44qirOyftc763kCtkZc9g==; 24:ya6mb0qff0ekpXrC32UvRC7Ur3oPp1fZPMmvyuoqAO0cpnydfHw9629/GsnYgYU2BApWh/l0KPYrWWInnuJ9oXBvvXY60tIHgCpR/3AmAdk=; 20:JDez7PDBoJn7SQT3QCEaRY2SUIV/znvSxgLrFngxz5YrkRa66w5ruJzD/p45CqHQoEGiwAy3WuIyHKjs1bwXjg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:28.7622 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1486 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 , Tiejun Chen , 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 --- arch/powerpc/kernel/paca.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 5a23b69..7fdff63 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -206,12 +206,16 @@ void __init allocate_pacas(void) { int cpu, limit; + 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);