From patchwork Wed Oct 7 03:48:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 527110 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 79B53140D72 for ; Wed, 7 Oct 2015 15:04:16 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 5D8F91A2BF1 for ; Wed, 7 Oct 2015 15:04:16 +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 C972F1A0171 for ; Wed, 7 Oct 2015 14:48:54 +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:49 +0000 From: Scott Wood To: Subject: [PATCH v2 12/18] powerpc/book3e/kdump: Enable crash_kexec_wait_realmode Date: Tue, 6 Oct 2015 22:48:16 -0500 Message-ID: <1444189702-17241-13-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:39r4lCKIueXJB+VHLYvmuDQMxHV20DhB6lei4B+PcudjRh8XpuUvkKTrGRQd5q3YofpmmBG1isCItA7sLyEmJAT/5k+bFz+45B+vtHE/ale9VhGkERD4NFzT+Lqkv6Tynl0SVlAm3yn48Xq4WXVNlAjA0e6XNY9k00wt9a/mRik=; 3:2vqS56brTk8TmzYSAUDg0IsXIk92PdiLKH6GpNd+w3Su8+SUYQqzuvDbo11rvfn3OFrKwYY0fo4KQdycVTObiysXSkjhZigxnYvoGTnjgg8kdMkQxbVo6iwAN6n/xNnt65mLit0W4OWyNXx/9pBPxw==; 25:dwIQGvIh4ItqZvFUaq+ECQGvcTYDAGO0bfuwthZl+3cpk5N4PqZcySYrSon4/oJHwuasDJxNTSCVDVXgGc0FpR6paJQ7xdtA1iRDABGm+QS2GstWUR3hHzx+NR0Thf8i03JA95+c9WkCGlG3ANdsCZDNP9qL/93QFyTq5ZK8O2JRfpPnQqxiv3lS5kIeKZXeGOUJmHh7zcIcatNYJ2oaa2sI434bHZObQd5KSk+Z36xzJz/4pf/j9wbbGIRtNMmeCdOOokyG5p1PN7iU+tYqdg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 20:keM1OLgLTIVzFxjACKLLbjdmxznYEjXtPDNmuFluV5RG5YladdBoA5UsHXhMvdpdDkdnir7WZ5gJlIcKyDClTCYc2BoCMHRY1nZcsqxbAHgB95TaSgyyM7z85LX4usJ1mgHD807ymn8SPnhaCGaJ/kRScjzJsfp7D4YVGO9xUJYVLTy78eVzW9YFxkNt1aAp6/pHiQJU6EMhaG3k/INARNAm9m6IDPFgBnuRFrI83aEAY3k9sF3LpWxIJr4cVaQXzs7pJRV8/HUhzM+cfClBxoRiIiPca8GbO+KhxzG0zEDEGQQdBzfuIqWX3CxPsoWF3Y2xtnXuHXcWM3Vj9a7LAtnSF9VU2YbdsB97iFJie+i5svwF7WU2XcTnZcfY/miaVsIuOj5toBb9t6pRzuyZuFFd9BbF4UV66ecRhp/SDQc0PB4WQo6amIwFMoR9iigW/HmsD1Zewz9KjKFRXDAwGypWwz0WrNxo3YqA9dHLpTmdBbVntMhyFsx8GeYHQsTW; 4:y8D+Oyd2hD98SJcecnsvS4gk6lWTxJ11WQit1hQBHPVXAhq+qIg3ZV+blMeN2CNK6BlJbqd2DAQAMZ9agxokTvaoF2JVByvkiTlDlQxQ0IMGuRUaVQrBV3eNmEu/BD9lkda+ImNb5uKx0X8MQWK7QwQtQ+BJH/9n0Co+sknA6d5CkmDwrCAJuiaGp3c30MXZlM0wCg8Eii7kxY08Lf5aw21+QkMbmZ+4RGIUDV8Iqh3i3QnPOmTmyIKU+kFTIpEfsJ57wZbv4F1S8bsuOXZ3JzBI+pIj4M7ctjTE1Poyal9ruC9ZCLDlSRX6NHeRNc+nPrQc61xH/Ce8UZPpVl8YbdNVaVIzXODFVooRKFeDv/M= 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:NpP64kEZB7NKdPlJUN++D1fu90+EZtBuZPbAf+7B2?= =?us-ascii?Q?z+xAlFGiZ3bTsNplj2ENkLOb/V5+EI5FoqgYLJAr9O9KE33ZzxPERvzUqwrN?= =?us-ascii?Q?vsOrpDpMVsX6ZyJQX/wVKrUjzUuPS/tXusDMv+4AhfsQAvqpDKWDxa+9PmIq?= =?us-ascii?Q?PA3dtIZy9rx3QHbX+u4FXXqYxlJ5u18WpONdTF5eUzZCiMGE71XmufBOp7Ue?= =?us-ascii?Q?p4qDRMlbZeD2vmT+sOSPs5tKYO15LaYdn7dVmsg/1lk6cHvMqbwEkJZxrOzX?= =?us-ascii?Q?LquruvL17Hey4D0ugprwkRoNzqLp9okaEHJIjc+1BBDX/K7yPq+bIv3o7sNK?= =?us-ascii?Q?JpO6XRSBaXwqr6lZVbn51u0K+6gz3kiOsrT+3KJaA0Q+lJboW7+8ap62//Q+?= =?us-ascii?Q?0NTy0qPZZX6qIr/nKi3ypLT9CYn1of9fZQdL31bP3cyBspUvv9ytL9Jkvgb+?= =?us-ascii?Q?eZ76fFBlw+oYKC523Z9qq64If3uoPPD/AofgIdm4GKrc8FTCt3sX2QfqwRjo?= =?us-ascii?Q?ueyE+eWmtpZdLexLiokRjmcagSa3ClOeQ2CTc2X39QwquX6oURuzdY0WtLOq?= =?us-ascii?Q?7HNGLfnOoeaNI9zhhXjoYSvWqJuazKwxYhQ6sOJ9f0rLm4f0xYK65TVpHqA+?= =?us-ascii?Q?trs9OtDNZvPx6W/s//IXA8DlEiCHRjnhZUPSIAl7KpGnl8UnFRoiK3IJQdQ5?= =?us-ascii?Q?584bKn9mAYZuchjebbPhsJ5OHcqfNK4ugHFiQZrkTdH/EocTcFiKuOd5wa/P?= =?us-ascii?Q?63CynpJtt5GVusZ+L3Na7PZoR1Ue+yZsfD76RLCZ24zfqFosvrgsFeGZzJdL?= =?us-ascii?Q?jnkA8sLfRQaOUuQA7oyC648rc2XQO8er2d2Zunn/oSpua7nCGD3C90o1uwwp?= =?us-ascii?Q?iwHpVSTxmGGaRwD3z+wBsZyHQUVJYtwj8/T/6BaENQYnyVBdWEauaIBRKiPV?= =?us-ascii?Q?Mp64MnY1nHfsJZQXeNKY/syklL31MXfkFO+Y3PBv7Ie1XSglQkLi63AitjL6?= =?us-ascii?Q?3zQKlTeF42nE4ZOVpQYEwn30F516R12rpY7BBjiVwJwForpk3qxPqhi/iB3y?= =?us-ascii?Q?2KP6V5aKtT3qKj8lG7dQzMmMUS+BsuObC6MkYd+5mxtWJXQ0Ld65E9CuJlj5?= =?us-ascii?Q?BQx7wkt/LY=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 5:nAd+GPusll/E5PNWtOyn6SJfNUvPr3QDU0Dx9hfhDOImrYpxKuIjOgFX9B1WD5FNTttxb2LvJNLERNQfItSEjrKTVqEKod2/iOvgyG5eukqQic9kLvM28p9jK6ZhB4j3VgOZlxY0KihTgmo5vLfZsg==; 24:5OiKaCeSjx9snq+y4Hb2j/GX3zpSJJrDLKlD2kzHHnp/A2R9ZaGlpxZRa00LfnKTByiMNqyXV6Or1Ix1C7Ou+jw4zz+RUjaKDyV81JH0+hA=; 20:el0Chf3yq1zXimQdWP6m/Ejtg7NiDogPuhvkDRmL5wYiU0wbIlNErk0I56xuWTu6yWxijkw8XDe5BzN3V058kA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2015 03:48:49.7012 (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" 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