From patchwork Wed Oct 7 03:48:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 527111 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 [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6D00B140D95 for ; Wed, 7 Oct 2015 15:05:22 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3D7F31A1790 for ; Wed, 7 Oct 2015 15:05:22 +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-bn1on0137.outbound.protection.outlook.com [157.56.110.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id D17BC1A0109 for ; Wed, 7 Oct 2015 14:48:55 +1100 (AEDT) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.am.freescale.net (192.88.168.49) by BY1PR03MB1483.namprd03.prod.outlook.com (10.162.210.141) with Microsoft SMTP Server (TLS) id 15.1.286.20; Wed, 7 Oct 2015 03:48:51 +0000 From: Scott Wood To: Subject: [PATCH v2 13/18] powerpc/book3e-64: Don't limit paca to 256 MiB Date: Tue, 6 Oct 2015 22:48:17 -0500 Message-ID: <1444189702-17241-14-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444189702-17241-1-git-send-email-scottwood@freescale.com> References: <1444189702-17241-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BLUPR08CA0034.namprd08.prod.outlook.com (10.141.200.14) To BY1PR03MB1483.namprd03.prod.outlook.com (25.162.210.141) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 2:bAkgbxFOOxMYrGPUdZgZ4HvOSfKCU538AQlvNQ7DAl24lRjemdMo2UygiUTfNfBaRJcriDQjY2SpZwm3si9aAUUN/vdpdZba9jnaIMzPOzXLEpyzFyL5DLZt+pZsTyURZxGPYmOoX3f7K+YPlKR4foV+TUyKwlLahx9QbB+XWjs=; 3:LBhjhtlMiqtGEOyJcU1RrcYufeCZwfC8DbvH8eRQQq8hcPV4DWNa2nBk5YJs3AeBHLZd5iISM78zZ/0ivcQlDCI3M/Y//JKrLvkLTad6o85jKAxrkPOnCpnFMjR84cSgniS+NgJb5pNI3cc4WIjt0Q==; 25:0fW0ebKKGv1/Wk9w4ULcii6izx7Asce13T5QTKhbfawvPBLNBALNgNSN5qLsLO2gdwfVi/vA2xAOisHCb4tHLdPxz8LzbbPz7GsfA55cWV55bKc1nwPl4IdxCl7eDMUTMHMT9E4LqAcZF3UqIPN2KfZrW/QXAphz6WWOhxGGglCNKohUvzEkKs2AEqykhzK/dnGXa/7NH9IC1rc4BGciBKruDFEiIRxKMUVfL619sZwO/BOpsgpPsl91qE8xSH39sHtHM94nSwL3sgMawYLQQw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 20:L5S6vwz12Ycw7kWQm6+4BwSi3Qs6lJgmpI17rt8EvWUM3E3wGx5J2UMFmVz4SImjrN3r3mFNjumZX4hvEiUk2vAu3c7bdQ4wXjgXH6uxuY54W81Wiv1XqgPOgVbVEKuahySmUXi2MbzUyTJ8uf7+5eKxD3Zg76j4NQVObvv2qSHCWTOL4lvSigZhI8gYYfXw6rLbMEUZXJ9lO907JdDzZrbGkpDh79g5DvODCMaoD4HyXFDSkoSfSkGT2Kb/7BXyzY3WJ11TjNPvbc61PPFuaKd8dX3dqKPSAaaBjB5txFnYS2HsLYzeznh4zz5HRp0WbjrMYwJQH5dbPheUPXDyaM8kknhJ3EZ4i0GCtgfWL5FduMZaBztVTfXKRuGp6xibXFMEsbBYqoI6P7fUl228uYbRmj/4QbGeve1dKo6NSu9x73fgf3XkcOEidAErtFf30Y82+cak6OECCYNzpnz2A15q9Uj53xpI3DqUYILP821N5XjtxysdX5cEoODqzFo1; 4:I+BdKyZZsv/5QuZsWdgXUlZPmuOZ12XM/+VXJxljHyDaA2cifC6Pbp9J/mKOX4Pe2UW0FTncqH+FodDmls+OMnYkN1WrtfPk6khkaDYUa9+JENzKVt9WH6OSHOZoifLAsp3ElA1sRgZx6JMGy5qwCVjfh9d0OCiGbOLtpXfJ8IRAhcbMQVmahHe0Z47ZKDuE5FFvnddx6qJCSR9ot0tLK+5jmi57e9vmF9vOFYF3ib/Qgj/lCAJiCAze4vbNlzyhwUFIqte/0QVUDPvCHJ9It5Qi5jZ+JeDnrqLZYPfV7QxDElTNHakv/8Y4dU3glnNMDtKShzOrgiA/ttqM0OLM8eJcixf7jq+pWRh9sWQXwVU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:BY1PR03MB1483; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1483; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(122386002)(19580395003)(5007970100001)(5003940100001)(189998001)(19580405001)(107886002)(105586002)(46102003)(106356001)(50466002)(77096005)(40100003)(2351001)(110136002)(50986999)(64706001)(42186005)(87976001)(86362001)(5004730100002)(47776003)(5001960100002)(76176999)(229853001)(101416001)(50226001)(92566002)(5008740100001)(2950100001)(66066001)(33646002)(36756003)(81156007)(5001920100001)(97736004)(48376002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1483; H:snotra.am.freescale.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; BY1PR03MB1483; 23:Gmsz4B3/iZAI/3IUxRLzVZb+G2CZpJ4chHqcrartV?= =?us-ascii?Q?2PuCiPZdI3QktA4z4BrPgQi1lUa9PM1EBb8m/QpV7iogrQBPuHUyOSekGj0D?= =?us-ascii?Q?u1t5RuMCMCSWbEFehZCK5Wde79RbOMSdodppP6zYn7G5sCkfGbj/rr/i/sv0?= =?us-ascii?Q?QDc3dO25Z/5fHGYCvYIxaT4AVq8Wd5Ys0HFw6Pvwnz/eq8zmqbFwASOjeoRg?= =?us-ascii?Q?nyn+lNz3obDZKAo73iX3aRfNsFfczSn4k4A79E8RW4qAWDvmLUfl0U4ual4a?= =?us-ascii?Q?BWbJBfE15WlusQLsx12SExNCBNY6G35V3LmROIq4QCsNJVfe+Brl5qsIOYVj?= =?us-ascii?Q?Fl5sBW4r1AlIpi3OFMa9QI2Sh26+jMvVoCsd2Nn10Hu8B5KJTvIOowW3zz58?= =?us-ascii?Q?EnF/Q8IADpxDZ5ROTq/Ymd3ey/A0W6uf6e27pqbdgT7yn4ltkuszNUUHSQCG?= =?us-ascii?Q?2TmPger2uqy2AiSXs09L/Ud4Mgl7hZSNPcB/rD6L+S/B6PrlhdbwmVKwcZ+/?= =?us-ascii?Q?OaEf9KKkIqi6LrS3Rp6j1LS7C50+rFuT4UApDk5W0DoBiuMx1rucEmBrtyBx?= =?us-ascii?Q?13WUEK7CWH2tp3vu+hLo3bGvQU5VmgklAfG4TwEjTVriPmBiWvKpJUA1FLK+?= =?us-ascii?Q?kfXPqIQlyL5goo4p/cN7hDN4FqgefqKtUfZ3u/aGDSK9cz7D+4p0cYx0lEUC?= =?us-ascii?Q?6e1ydrAVco+IZwpT5MEkP8X93qQY6kXx6bUzIh3EPyxfQF+aNJcDvWh7WnLn?= =?us-ascii?Q?hyXQZC6nUI+hVzNp0xevp97TshiRQplNN60muflZ0ykyqk5ViBSVhBORix9/?= =?us-ascii?Q?uyP3ALy3/07kQbfLxSq22W3WKz9N9cuxJMGiFgjMjt46A0T7kaxYEdmdiA2G?= =?us-ascii?Q?STi3C00OU/qHk6vMgJgUFiCGthcQqn3pVu0rJknAIC+TrxgtdR8t9Je8RFP0?= =?us-ascii?Q?SZVkbDRvQirSTb0evi46yMf7Mofr9S/j13CSuNwt35TiJCQQA2yHJ7EFfArB?= =?us-ascii?Q?sXik3WiaXwemieKjEucTKEnefL/lNtruBv/voqRb2n9jTS+N5uniNmSiWwGs?= =?us-ascii?Q?7o9ZQt/h2pwPOo3q8A//IBlUg8G+qZIGFJAiTWtJ+L0/W5loAYCZ4L+zLUoJ?= =?us-ascii?Q?PZaIoXTpO4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 5:RMsErkMCGmI/BQsd2Yo0iF00CbGlmLwxHlSBxSJ/iyeYC0rKf1zWtQN+dUJVFcjWuv2pKTOE05sF7FxdvRB2KHiqXgoqkpJVgsP6phxRPwIyCH4iWvBaiFpGEWh9QX2gcE8AJNK2DK27Lhp+usgh1w==; 24:EV4eLUZjUlDAQ6DvAUl1ngsR04cY62djdKTsK1bqU7Z3GGJZco3E45+QWcvXbwpHwn7c+j4kOJqU61I0hCROIaVKvmhofk48WhTfYOJTa8U=; 20:5vtiJRryhfBEWA7UHG90v7QFgUmTpuqR5CaQXAaBjtvTctjjXsaldt0HWA3yriM+VCaMfog8DUfc85zERHFr1A== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2015 03:48:51.4513 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1483 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);