From patchwork Sat Jul 18 20:08:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497400 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 5F6FE140B0E for ; Sun, 19 Jul 2015 06:12:48 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45E181A1DDD for ; Sun, 19 Jul 2015 06:12:48 +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 1A9631A0CEC for ; Sun, 19 Jul 2015 06:09:23 +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:14 +0000 From: Scott Wood To: Subject: [RFC PATCH 02/17] powerpc/85xx: Don't use generic timebase sync on 64-bit Date: Sat, 18 Jul 2015 15:08:39 -0500 Message-ID: <1437250134-307-3-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:iqDqnS1zHvJRPIjbhsWgnfcSSfAduxowVU6eItaS4jxxzY7O1Jhitc8o5slT0HvM; 3:huXcd2yqpQFD4vcocSHBfM7ttCuqCWdKGr+UVVNZqpK488Yd1hIxW2puhnVs/WTc7DzLkHR0YCIOJG14Z37HsTeB6GsUZIfU4HX9Mh41UfNtpYwTFnwCVJgJOqsc7ei3JVqjXoGNkYdnpDN6MpUkEQ==; 25:lJF9+endVDBjd6KKFzpJWKifv8uQ3quSNVNoH53g//8CBwtiu9OJnMq03SpCN8001psFVJGUdYkIjz2CDhLTPPEVPLArz8xRP2vi1CynqVM+09Xkf1ehnoZxCib0fgCp6MZve/PY3nnFBc1nk82WOoyWo8javQbuwewNFUsZZC8rGfrefmFf/NImMujDxsy5VJC1WYlz7dBrRyVmUi9FbI6s8ts80xdHcep/Rjrawz0Wnfv+dBv/1GQu/deIlfKi8I9u8u50uLX8hJuiUosHpA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:GbJSfSqU52XsFTJggmXPjUVXDOePzPQOwByblJ1jbeE44FnGH8uI3/1nDRe0MwWpynM7cpuoZl86ZOWLSNlxfcZu8F8ZoYtkuFIFrVjmK5gYYVmTUtXvDmGQKFwU+Wfky3k0RdiqN/qEzibn0nDxyc+nzfoBrqFGwOFJVx0deGtcvVkO910a38DITdU4JDf1DItkyUlx2jHAFXkXXtKpLzhEP7h+0z2PRCFhLWIl8RSho8JSoZ4KaMU2AYhQO5Wn4p1v87TR161QsVY/i1eCTW1HJ+Q7a2/d7gXO87BjSsVSeTf9eHdk5qJvgj2Gek/M//5wG7A51ZjST4FohoWZ6GSXB33b+GnOPJRgcpakuQZkk6qRw7tRZVh9gUg1RV0IFOWSaI2yfHh3pUOlqXL4ISTBPo7tZqzEcK80NgMIsoM/ps+ofbyb+uw8oT9kCXO4ynzvYkUNhwDXdK7PtmPiyr9YC7oyYgUpvKXEXXkVg5oC2v0FxOTaDxOsf8EqmqWn; 4:3plfrdihJYouu2UHHs7v2ncYl0Q4tTGqaTBMppkVrbWiNz0QElLURtDmjhtQkVbw0zTR6pFoQfc2kQ9JK5cvHgckpOF27Pngrrh4EskpH8TcUA2npmgsKeUXsh2VS5aEhMBQg4J94j3ZAOHfPoJQtW6tsxBpJthxSNxXTPuIGQ0KQGigCkUtIfpcVVW2xT9wLgKyzKAPTfe8FNoVWC+8EQFT45Uy/0Gi9I3Au+Rld6E2vwnjAkqimBgU+3xp3dlHQqdIM2AFBZNrGybgwzLxpwBKZmgSQFRUw3HN0jVsvzo= 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:Yvs+jsESH6yGfFzq+5o6wAtCDU6sYZ3lOnP2Fa3LKH/T0tB4+TKSe1yErC0MsmTtsg8RMTKV04XGlKAlRFwMVp4xXrHkSraXKgiTR+A4KTpZNfLsdLXVz4yVjz+AdLor4Cej7KKDxAGJybvG2+kFXunbDmCAxHOofRt/mH8U7PNrn+TcckcJfTg/EZx1An888XR0D7iv95STIVG2YfTTrb01V53cPohPZAV6p1yI60zOsGL73ZqxPwFMio4MUbzARfebOsMMMhGr5T8pb45wHkNJeAVmmHQvcs3WR7utRuN26qQ8UyPBQ8OQBnZLkWrrmc1btTq07xC0BvMFntTb9buIj/369uxeGXttB1YT3rQPHWgNAXOtbJlJgHmeYSvlKQ3R/oyBQNbnL7Amhk78uWN6Ini/mYNKfuJhEbTte4dQ6KPSd5TwreGkZCiOyXkmy7mO3WYSJlpujCjATwKpvS3esDDi+Tm7+AjETwVbzkP7u7wQw0hmL2+fStFNamhaE7LRLUXxstb7KiPmua3gFhww/StXYHSACiBv86d7B1hj9MNty/qe1V5MebRaZCOVjpm9I/lixQ3JeSpPfYTANw+ITkkbBdGCjBlyoyKE2N/Ll3+BU1oM9f/Qyrwj9gfIwMt+5tZuoos2Y+aU3Ful6On3YSbMLPVgkSQg/6YinkV2k+zW+dWZtXrkre02DJd8WDt3U+PxvjedDRWW4/HIpVJRlUq4R2TpgChCKqHhoCdkUuAOHjoLKqioYveKi5aV452hYlxFGyzsdJIFJUwgcDd9wxaUNx13XVnA3cw/qoRJyNsquOZQxN+spcDVVJrn0odk5t87P4JrQ0QN+W0omcr5xuh5A1acTR9UbTjcqcDABCSfDBotVT5ChZbv/8LM8vmkxs4+5cEgzcAu7S2Agd06GFUmIBW86B/IA1TW0S8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:PMaW1K/VEndSVpanqNIx6RDEDF7xtQVLH3/avzz0lq4WivnUtDSJFWLp3lfqG8pu+dB9tCjLCnHTh8cXWNlMvYchpjfGfRD6S/rVQN5VFOr5h0xvcG39GOQL3rwLDGEYjUMS2fLS5eNCvNHX8wiysw==; 24:35Glf6H/G3Ohfsdi1sc58e+ufhBGJfPlm2HfM+zVkdcvaAphWuRS4VX7L+RZmmTdfE2cRqX7oRFP46Y+RDw+Qv+CO29zvZr4jfGxHtuDO+k=; 20:qLJLYgs566hPnTjC1GiuqfDw9YnouBxkejCIFFGV0O76oU+YDjPBYNKqR+aSm0aDw5RG5bZUzZ8yH8q4eIW/0g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:14.2400 (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" 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