From patchwork Sat Jul 18 20:08:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497404 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 5A7C0140B0E for ; Sun, 19 Jul 2015 06:17:27 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 410B51A2CC0 for ; Sun, 19 Jul 2015 06:17:27 +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 A5FB31A1917 for ; Sun, 19 Jul 2015 06:09:28 +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:19 +0000 From: Scott Wood To: Subject: [RFC PATCH 06/17] powerpc/85xx: Implement 64-bit kexec support Date: Sat, 18 Jul 2015 15:08:43 -0500 Message-ID: <1437250134-307-7-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:bj6lg+EJ/HS1jrsGXfQsfQY4C9Uj/5MaZEZEBWm/odKq9EqwOngadT02Ly/Aici3; 3:vwUH+Qdb11zHGqsuGcSq6B9Om45n+b7Ig9L2s+qz+GEpaAXTWBL2IapQsVeT20E3n+8LVNtfxnVCpWgi2LQebLXnh0Y1iSi7ArXfTqzZMOLdbHxlh7/1AKgeeVFqHhMfq+6Ba5m/NFs2K34Y8qgPpg==; 25:/9+41ZhMu0yyrcfWyK9GG5zlCP6fSzprZ+LbgUlLrMzWzr7OmDwmkGYxNzQp6Bmpjo+a9qiEUklcBLrH3t4QMDSUieiotulY6vPuRULs9YFMMidRULbGjEUrwUAx17XNRtaese4C0iiLZwKdgt2AA/f5Br9zwJvDT6UNfDY2m3F3l0bYXN6wTwFsw2T6m8AsAIuwJ1AZ09l+KzGcAvLJh9ozkdYiBekrS5PbKJXn9A/e/a7IvpIvVyxEWnJwvQorU+5kY9zW21dC5fzmMxXOnw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:jBlYuB6FUxvZwjNfuP7ThHuTipcnemUHIUQ1KubcSXmUDXcD/FYSVViuV+g5sgWLzQ3Akz7izJYD2ENo3W0GCOdB+4KS5h2TwAuLbh3IPuqW8i4a0IoDZPuLyE0JJ3cpmMbHt/IHHQLm+a1HY87FbPF9xkNkiBeDoIbS9gmSh2hAexMXiTeuCdAeCsu/HID5PIv94rA3RbXNI8+VqUt1PFshtaTjXaS7YpG+nvs9U4WLo+rIfvDx7UZ36V+gkrhra//PqdbEB+LwTMRm3dEzRgFhcadg2Fx7G3dqFMaZ6hE41BI+jEPig7A9obrUiz3CtbZuzNpnO6NbzkZC+9ZM+vfa5UhkPZ1PnOCyrS4mJbRoeUMvwbsaEp29cmMjhkDZvEjEcP06EKcVUidAR8zRhjPlDOgPSvH3tr9YGP52oIyRR+lluTnhCIKwROBqW19MaQeWhaqG6vX7WZtmeTdqrbMZD1IxQyTM52Vf49FUwZQYdjhasjC6dbRDdZEyqnf7; 4:JpH9wjzVUXFNt2+RtpEeX4ThkOZS5cd82tLTgu0F3oKQOQDvvnR5LmJOqiiP9ZYaZXEe5B7kia5N6uk7Ie+UMTJbkFP+f+T5DNfEX3pHqunexXD93LDi6tpdNd6po3M1Mo9vWhl3vQnN59p39Be1v6GckbgG1F+zDvmFvzVuQR7oYuPh/9AjxPiAgMlnWGW1m0TTDS3a91KRaEuwh+G8SDo84UwkZZdIGTJlmTDh8f2E8lZ/GG9qh2SNFvzxQOD804KozPSJpprp6fxdIljduEfTAFfzXlmgSqc2Fi6F1+s= 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:Pc0vElIVSvVMa1dUvx1n6G7lo17sInFtvqrZgDRzC6Q4llPXfdK7qwZGlV+5CBiGtt0vaoBCKvkoG+BS/681UQ9Csw6/OJnfPifeTItqdD6TCH2/KgOQ0jjhHfzFW3S4YyB1pteC+cuhV7T1O+mOno3pcg7A4qVNRueFaIwD+r7bM6aQlwRIXpXvFOFH9HnJ7UKWA+e/MYweWx8hqdfgIYnHj4y5Rp7W1lAcQ+Fnt3JfR7tjCtiLYHOVRii9eF19SFH3HK/nAWIuf/72LfpKJNw5qcYQTi3RDGZ3uJ0ZqD9u+ecBw2hph3l1i1VNSSShRdIQ0B/yq4567NOX4V5Vd5WKbrs+DYjtHSjyWuguTm2ubmZpAHmbE5gRWaE2cquwM8ekRdmf70qecDGnligDbU1RpfsuFmNJk+tqxklG0P9R/l5RxUM86GMUYfr12kBRpB+DrQRnVSQw8/Rn4lCgCywUSRf9FfzQlfHliIY/oBE3p0EFQ0oQHn1WEVnsHahH5pPgXXWQ9v6v/rzDpHIAcCXhn5qsEXvxuOJjXZUHGJqU/VAmwBhkLy6UBOxmqY5MpKE1YuGtIfnE9ANKG16kQBGliTQYEC2Li7/ieXNR3qtdi9LX007B7IV4l+68eNoDIS77Qh/1tG9K6EZqWFdCWlyzFaTx33RIKd8k44/37326tx51vud4kq6+WFk8AF5woBQ6XBVZPc48t7/iZjvdndlKXzOuSDkMWWFOAvRa1W/MifQobtPSwg4TUKUZQHZSBb7x0g962MnL9dO1VNRZ8penxPQUiQzXze+Tn7XBZ8g/4/ds1n3fQnlBSeLyFgrev+Mdk3ToYFbvT5/OkFUrNNkBoDq3ya1geeXiGUEinZDK25tgDEdN1+JvvZgRTsxJmAxVzGcAxWlCFOoTq4pWpHtcGARuFpcCQvAmnGea3sc= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:rdqWNmKw4oTDywzI3bNd3fLyfnQOEu2kBQKSwmVsiB7Fp1UZhhYlb2skI4XIIpPEK0N1LSFgrHxYQFWTFO82wjEha+MtpJ/+WV4/I2ZHCMhzbaOyyVkvHMGjUyCeV8wV1YKwTVNUL2v8pVRwo8iLcQ==; 24:O/tEnUusImjoI1NTHGuBPh0eNOy3zOzICGdBfM6tlPfcEEDQJ51d/fVmSVJpVDabJmzuhyn+cDJoku6iYYKfmhrXGqwDzAOIv8m6l89G3gs=; 20:9CyVgzb7qLliDXpmmSahYzW/TOgpqYvURs6Rbz1/DMLX2c7u08u9asm0qGPgvbewOLG01V1BltAVO1II66QxCw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:19.9762 (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, Tiejun Chen Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Tiejun Chen Unlike 32-bit 85xx kexec, we don't do a core reset. Signed-off-by: Tiejun Chen [scottwood: edit changelog, and cleanup] Signed-off-by: Scott Wood --- arch/powerpc/platforms/85xx/smp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index a0763be..2e46684 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -351,6 +351,7 @@ struct smp_ops_t smp_85xx_ops = { }; #ifdef CONFIG_KEXEC +#ifdef CONFIG_PPC32 atomic_t kexec_down_cpus = ATOMIC_INIT(0); void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary) @@ -370,9 +371,18 @@ static void mpc85xx_smp_kexec_down(void *arg) if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down(0,1); } +#else +void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary) +{ + local_irq_disable(); + hard_irq_disable(); + mpic_teardown_this_cpu(secondary); +} +#endif static void mpc85xx_smp_machine_kexec(struct kimage *image) { +#ifdef CONFIG_PPC32 int timeout = INT_MAX; int i, num_cpus = num_present_cpus(); @@ -393,6 +403,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image) if ( i == smp_processor_id() ) continue; mpic_reset_core(i); } +#endif default_machine_kexec(image); }