From patchwork Wed Oct 7 03:48:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 527091 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 67319140D88 for ; Wed, 7 Oct 2015 14:53:19 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 499E11A046D for ; Wed, 7 Oct 2015 14:53:19 +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-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 3EC721A0008 for ; Wed, 7 Oct 2015 14:48:38 +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:32 +0000 From: Scott Wood To: Subject: [PATCH v2 03/18] powerpc/85xx: Don't use generic timebase sync on 64-bit Date: Tue, 6 Oct 2015 22:48:07 -0500 Message-ID: <1444189702-17241-4-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:SWRHL2ecBnUWRW+wNSeeAKEDQLIOuTUp0LwbqVaULREmagtc1w/Im+eGJeZgzpqFKvFtlK0sNGeNM0ChF6kTc1muO/US2gERULlrCa4+07Ub+WbzckqKEsJArSdRRA5ukws18venwclx+YjdHnbU2fgtM0rG5IRLE5qpk/XYp8Y=; 3:I4XZuWc/K1zPJJesxUMfqKjvPlCcOUDNr5SsJLTMDzihSQsFl20Aq/lb8M1hIiU/McV+/5tNG9O+jB+TBJU0JFs0ajEL4iFubMDRpM57Ebf/92q7lm/rZQlFi8qLvSZghZbmIYyHGbEq1YuOEyg6YA==; 25:otwHYpFKyz0BsUE1mhMSjvJ2Y7FTh4sbZda6dg0ICMpPfB3rR0UT4rFkKH9pQdht+aO96TT3J8IKB5iWFqFKcl9BYNAeSG6KbE2bNfCH6W1ymwFvR0rBQ2/oP4Wkood9mW5iYTmHL3hZOmgnF3tn2v2HLiIBoabJQb7qrS2Wb2W4HqG15EKhzMlFnNDI6DYApYbcilpBmWyn4NfbpvLqZKnJ1QdozF6fZv4QgUZJ2Zyq9N6rJdIo/hW/aEOmQhDoClq+Tjr27tkqJ8geSiuD6Q== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 20:om5w0cANUuSAyxrL2xP9HFR8e0CPCnkLIcZKM5ixDXY6sWPRvYnFvGuEPK5cFicdkfJn1PJmVVDwh8KbMEKMcPGtG8nTSUS84jmOKXqKtJIww0JF8bHHr5Gf9VG4Oc6lQGPUBJpOvUt8Hd+rkXeu8yuNaniQkfrtQi/5kc9nI1nbomIoHJfbGgyvPWfFYInqhuaLYg3axDjUybnecsC4ndjFKYcHKIMz1UJD59fi/cKT3YlT5EQzNau0yyGQJbmv3xjAWSUD02Ma6CPr5tGOQhZryaSd2Uxzx6y23M0UYcMEI39qE8yqeixp4RiW1XipfHkokmE2o80QMnxXR7CkPr98sHGR/9Bcdkye0SjE4pakxbsxiD5UagZtcdNvMCn8q8B4PDLd9a96v8vWxWDvEL7nHKjJybSY8SQk0QhO4lC4PZEmUX105kzz6nhbr3mAHkLtEPcP+foqKKIOnXboVoRxi/L8W5RNvKMaGME5KDMJEIP+AwxlrtE/VRkPFzBw; 4:tmqxg3TWTJFVz+q1kxkf/FG+c4/jU4/qNOKKRWmNDtirk4EENlUfAmAcRViBP1Ik28h+qBIFdErQDbpkdyndZ92Mq9FKdNMg1yN88I+cH5kEAf14XBqQhQWn5qu2u7kE/fnk8YoEDq9P2kbLA1oRxzObR2FmY/bc0w0ZOHVtjRD2YXGY/tZGm28SFlMy2Y68oACT+pKSU/3s6WlJhYI62b0ehZaur6Pxgtn/3r9kTAZvp3tszkdcBFN23MquweUMRVaBKHxyS/VmxHKDyDEOLFpCR6xydPpf/OHxgvxtpeyuSRxC6T39JxtIYnTx5FvBdghyOhr7UxmK1fUESprs0YD/88pGKMmGLC6HHqJjEUM= 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)(41533002)(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:+vVatD8+O3fEQPSWmDrdSbvumiNTtd7HOBJ7jlYaI?= =?us-ascii?Q?oLS25PTMc8VYDX2BbeQm2tlSWhUTLd17DFJaVAfCOWh5qoGxqL6qUb6wXShS?= =?us-ascii?Q?ZZDklBoJLTe48hV6Idotx1aiRBuHhO1NBmzANClIwfvcfrGpFIeG3k2EXVf9?= =?us-ascii?Q?JAaNb2VcFbW6fK+PjEX3KooexbS/McVbeCORAB3qwNXAJBzwHbU0o02XGiMK?= =?us-ascii?Q?9Clh9uMqq3QwGm2OOfzjgSKvaM/iSB7GjzMn/8eFDAg1/e9MTtU0p9OAAFB3?= =?us-ascii?Q?4g7wyZ+z41QCtEZ1G2Cnq8b9ZlVXh+uAe5rtwZ3IRCWjql4EQLim+LtSqU+q?= =?us-ascii?Q?LPCdZHONTZmJaIsjOzRnfJiFJAHpnGic03Qo7hBmGWxgO/tg0xxQHP+rChUq?= =?us-ascii?Q?p8dekdDR/M06nixY8YjD1rj238477HYiRM21BcWhbJ//pHTguSpTkQ34XG7C?= =?us-ascii?Q?MAa/g3MaxEzTNWObIUTMYspFm2TpFvwRd6gLqqJfs649GfXY3QaE7/TPRIjA?= =?us-ascii?Q?dsnKVLODP1sEEA/u5UUsWPcWT2X2xXPMouXHgUUdgcVWBjUO+CryiiB7C8ZR?= =?us-ascii?Q?fk/NucKPLoDiEiiPJ6P4jMSmUJ8kYRGWFzcAcfbOZlcqWEAi9XwwwZ9KVqUX?= =?us-ascii?Q?wzhXO+aNl0v+YwYO22pmkUsnAxwZj6Mh0HVXPd3O8fkPS5uEXElo9teiswYy?= =?us-ascii?Q?p0B8PIJAyArmHiGZlFSxiU8ZEPpFs210eoTpjtZ311G9PUyt8ePVqAn9Pz3l?= =?us-ascii?Q?s0Qf2xXHbmi1spM8cShcnhGSnc34yxn8yuheM+vYbCcrc+Zzu9izTF2jUKm9?= =?us-ascii?Q?Jy1nraMfOoxf41kHTyOtdZiSPoFo9JzSCG15K4+tWIc7hlRRAMhV2Ykz4Oc5?= =?us-ascii?Q?QoaHHRAkPT3MUVL9LQli7ROOiICHhyb9VFv7sdyA8gNklXI9ZugLf4n9TC3L?= =?us-ascii?Q?WwMIZBU1ol8pekNe3SO4Y0OJ1/wmWj75ITDuaNgiX8jhR0YJTw6JqMnI9/x4?= =?us-ascii?Q?K2QbuzqIqwWkXomrT/ZThQawOHvwXPhp3QAt6g8DvE+UIM5IpvhO12eeJ8gn?= =?us-ascii?Q?8n3paLh3VNSM5Bpc0sd/m2aO23qX+GhgN037VaoKnNSPaY/Xoe3MCKYatM23?= =?us-ascii?Q?9H2jI40SH+ypXrZzIwO9kVwyppl28Kv?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 5:jgp9CyN9wnq3TFk6iFiayjuv4mhtk0UXBXkjjTEx2w2QpqP3BbCS0o28G+M9qkmAKmWPxNaZ7mlg+Ew4718ZoUC0m6l5HYyyO1WiiZiXqVAMj66HqZkKUAHLtwpmNZEtgi8ibHYoILN1kz7MG+w2Ag==; 24:nbqds6X7UXu10V7AJiZNNYDRjBUsoMsAbILoONVPcY59nD0IkLLBkDyqhtt/VjKMIv6a/k3LwYYVl00OzUq/zFr8H2BpKe9EU3G+wh67d7A=; 20:XfSDkZnCb3PmyUd+WhfrhqChwmJ1492OR18EqaHTrtJfBSaPOMigXyCrM1oD5vgUR4MRy/LJUnhm+SVjrsCIrg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2015 03:48:32.5600 (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" 85xx currently uses the generic timebase sync mechanism when CONFIG_KEXEC is enabled, because 32-bit 85xx kexec support does a hard reset of each core. 64-bit 85xx kexec does not do this, so we neither need nor want this (nor is the generic timebase sync code built on ppc64). FWIW, I don't like the fact that the hard reset is done on 32-bit kexec, and I especially don't like the timebase sync being triggered only on the presence of CONFIG_KEXEC rather than actually booting in that environment, but that's beyond the scope of this patch... Signed-off-by: Scott Wood --- arch/powerpc/platforms/85xx/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index c2ded03..a0763be 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -344,7 +344,7 @@ struct smp_ops_t smp_85xx_ops = { .cpu_disable = generic_cpu_disable, .cpu_die = generic_cpu_die, #endif -#ifdef CONFIG_KEXEC +#if defined(CONFIG_KEXEC) && !defined(CONFIG_PPC64) .give_timebase = smp_generic_give_timebase, .take_timebase = smp_generic_take_timebase, #endif