From patchwork Sat Jul 18 20:08:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497411 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 9CB0614077A for ; Sun, 19 Jul 2015 06:23:14 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 808C41A319F for ; Sun, 19 Jul 2015 06:23:14 +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 A367C1A18F0 for ; Sun, 19 Jul 2015 06:09:34 +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:27 +0000 From: Scott Wood To: Subject: [RFC PATCH 11/17] powerpc/book3e/kdump: Enable crash_kexec_wait_realmode Date: Sat, 18 Jul 2015 15:08:48 -0500 Message-ID: <1437250134-307-12-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:uJ2e+WSVuyV0YHVus3aEPvzzVJDwjTeCIMVJ1oRgzna1SyDWDMNargTlfjS60cjg; 3:9wDqgSdO+GER4RL88GhSeGkNGvu94awbVgC5JuYqlypvFQEG5z0uJ8ToYKvJAsZW655tPDYubY8J0F7AxyZdOfzS3mMz6NNrcmVoOgIX8HKxGA1z+htW19Ab7OtsroAlgivWgYnZ7r8aDXrZ5gGa1w==; 25:Bzt4mX6m4jkDhqQL8rb4F083NiEZZt5OeZVReZUdVnRWiLTG3g4coAsB+UtIOuiBCpZyeD9Dx20bOqJsczAveRr2QVW3/FiGVhcJqredxyXsDeits74StA6IEYEeRLBGMRzYbwscv7CmHUb7xCif3Qvx6WxjWvr9L4Eev6ZD2nGwVN6SSEaNvngZ8OJ+NA/6/UkY2xNRoCNAK+Y5KnlfcMz8YNSh2r07U/8PP/dv88uvQVovIeRJ40USK1bxvHFuOqQHpn89SY1IGarVim2qCg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:2akYoVuWcBRCFT3SJralBdvPgsNoJvy9c+s/pA3JOF43XbNJsHo+edJ1+iH5PnhM9kCK+WNRfF0yJ2BDwPexUqkY6JBa2mO00WHphn5l+53BWBiUtL5qZiDxK9LZZGeY1b69DdA1453FcsLj4MHpKmmaP8LhDvm/Anbjp2lse9akh6en98nhKb5wC6V5Xy/lFnGSG7H0QTLJZa7IwWuVC4uRcJscz/cmGTYqzXrX38PWiY1raajGM7NrohjsMHSAASVMtijUVociwGiPJ3ABGXWqb6eub9KPVwBho/fSzDR2sUzifxJ/AGioIRgEEzMCBba7EEUDnpSmO3V+UZsop5e1CPkSQ71TCUfRo4qEpKtvcLQtP0pcQNxNj/rVrJTmezTxS8+Lax4fKFniyjEnOuTLDQDD207YvNevwTrEhjgV8iZ9GXfEVALSg/ZuW8jXBjpuiHC2K2bKWezmHoIq+EO36KKMwutUetc9LNE1a/1VdRoLGZWUaeYnqzI3fxy8; 4:WQyFznValqpnJjNkI/vPb0AQTYwYoC378glzDDjS9IbDm3I7OApcaU9VPZaAYvljqDWx09Z0YjhBYWTvC+wuHJoLoeut5plwBtUMictoWsSGSYZ27N/UfDr2V9FXFV2e9/cuXySIP6HsD+B+IEcHh/+w/npT05wW6kJ8J0H/g7Q7d6/FCAvJGpHt39uOkwUrwrlp/mcdLvKg3CBLMQCcYtQ6/n67eXo0mHBXs+Tedddg2RJiuwlI3+IJNXLyFYEMm+k7ff0Z+S4vtsvRoQ3WCdG39ZHNboFbnh22nQ25TVc= 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:D5BkZ+agibmGUkvddjEimFmjQ8KMeETOiTUNPIRwyGC0JFzuDK5jNkvMHamOH+LRbyyv6T8wxTAIX921lgYrIfNOyzMhHhsnd917oY8FjEmLjjJR/8MhZ0OJRrfAVxt5VrfWOC2AxjN4Diqy8eCXABqbHeBrX+CS/llNqlpTayOf2u57o/BzqUt6am/rxPzAPVb4om8GtWobI9frXrkSpxcuKxL4ZRUF9wUlGPQRQHuzl7pacrvMQuxRzadNYxVMuNsFaOyuy/QHD2oV0yCtAZU3M4EuOCvJmGuL/zzlQSoj9wQr0lMnBAqftbs3huaoTyAonA3sDtCmT03KSpgk0fJsxDUdKdQ0fO0oXzpDJ4tMH00viHaWe9rWEfXj3RViSGzV9NpeoWpO3+dPCUOfiQFLRrfGSpdEiBabX0CFy1uDohvhc+riHBeti4cJPyK/fWz4mgRfMFMLqt2nlLNcfKiOFpF51a0eI4jwfz2GW2OTECwlKurgArUDPB3cL3lJ9uZs+tH4M5vNWWZJItNO43ER2hAAF5ELpUV7cZa8wtRRaeY6h1j4OCnE/76PpJm5X4AmOMtUnKi+/E4A0Xj7OFQhtk1qUOkrHMcCQP4sxP41MCfpTtamb270fXCoMFZRO1QldO8ifENhQ1CBMkWlBiHkcdpHAtUd0YYRMrR7sfXZ1IWb7KN168pcUM5ClzF21o8uj93173e5CwTypCRRmVe7iwMxFkakXrV390ZJGDAwsweA10sWHJ7NuEdEfeuoIlsn+nlVzGxf/cdjStgYfmiu8WajtdQA8BSLTHIg2NiDF0ADfgz15d/6gBnM4Wcpeo4MBN7Ztl6cOKYfpqwaQ6ggpGS6qbPg6CpwMmeSYHW7doO01StODOkX2edyfkqI4dWmJxqhZUIjYRyhEhuhq/tn8y3yGGogURlzqcqz+J8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:YI6WkaGECLRZvi1qQI2tJMQHvtJH/E3VkziDtQMmuwlfQn6dI/eaq/cJKPNSjIgDy5e1tFzN1iylY+oOwsmN0bWfCTvkS31QkAPL3BayjSpFKnHd2+joRkZH9cK1ehFaP/sPF2ucTgnYOvzmFAbHlQ==; 24:5692TXjuM8Pz3S1+m6zGtoyeV8QS9l3yOHac+E6OcCD7OglG0YbY/KM+uDSJ1EnCHlOOko3ZVLUHZe//DIABPRVY5namXYYsKYmReoBv22E=; 20:XyG4DmPK5byVH32/Li5LtcEzftQKs2LJ9M6LjVGnziQCEeKGmRslODQvrCnoaVlswo7KYjmLRClM7d/VzoILUA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:27.4099 (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" While book3e doesn't have "real mode", we still want to wait for all the non-crash cpus to complete their shutdown. Signed-off-by: Scott Wood --- arch/powerpc/kernel/crash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 51dbace..2bb252c 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -221,8 +221,8 @@ void crash_kexec_secondary(struct pt_regs *regs) #endif /* CONFIG_SMP */ /* wait for all the CPUs to hit real mode but timeout if they don't come in */ -#if defined(CONFIG_SMP) && defined(CONFIG_PPC_STD_MMU_64) -static void crash_kexec_wait_realmode(int cpu) +#if defined(CONFIG_SMP) && defined(CONFIG_PPC64) +static void __maybe_unused crash_kexec_wait_realmode(int cpu) { unsigned int msecs; int i; @@ -244,7 +244,7 @@ static void crash_kexec_wait_realmode(int cpu) } #else static inline void crash_kexec_wait_realmode(int cpu) {} -#endif /* CONFIG_SMP && CONFIG_PPC_STD_MMU_64 */ +#endif /* CONFIG_SMP && CONFIG_PPC64 */ /* * Register a function to be called on shutdown. Only use this if you