From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1036226AbdDUH6J (ORCPT ); Fri, 21 Apr 2017 03:58:09 -0400 Received: from mail-cys01nam02on0058.outbound.protection.outlook.com ([104.47.37.58]:55742 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1036129AbdDUH5r (ORCPT ); Fri, 21 Apr 2017 03:57:47 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; From: To: CC: , Meng Yi Subject: [PATCH 5/5] Fix errata A-007728 for flextimer Date: Fri, 21 Apr 2017 15:42:47 +0800 Message-ID: <1492760567-27894-5-git-send-email-ying.zhang22455@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1492760567-27894-1-git-send-email-ying.zhang22455@nxp.com> References: <1492760567-27894-1-git-send-email-ying.zhang22455@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131372350654345818;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(39860400002)(39380400002)(39400400002)(39850400002)(39410400002)(39840400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(104016004)(81166006)(8676002)(2950100002)(189998001)(5660300001)(8936002)(105606002)(575784001)(50466002)(6916009)(106466001)(50226002)(8656002)(86152003)(76176999)(2351001)(54906002)(4326008)(50986999)(48376002)(85426001)(33646002)(86362001)(2876002)(47776003)(36756003)(305945005)(2906002)(5003940100001)(356003)(38730400002)(110136004)(77096006)(53936002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB0601;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;A:1;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC007;1:lGk8CTSktqJ2ygVD1TsViKZfdV/S1BTeDbWpylUS33wy1gVrhxP+RogoYVSdlxj7VPLuyysR3gU9mFrPOs6P6CpvK13RyG5Vr2x2b8/oLipPXlLc+iOisEnl+cnw9jT6x8swgRsznGBJ1PDZxIOfDR+w2HNWWrC7CRCL4zd+JI3tL1D4oiBtheMdbHWnGfOF69BXp0XhL7mxTJctBw3tIpRo8j93+UOa7RVi2b4sI1uf7SF5fpAktkUP+93mviaaUndlepvEO/xuZaI5VXi4rcPJ7qbGMVML3DEB1aY/BI5UehOlhdrvWjUAQTOv4KgJtEWO0VrepBU9FAP/YLKLBn1owcoubSwLA1ikCyuKFKg9poi8W9zdWSUrEKBkyk2yyIPu29LlQ45Q1lp8F6+Rhm8kn8Lk+sQlYXproBe1/mld5MY8AYcijsH4W0HlnReC5FEAfdPAs+9B3IObBjah5uK90VB4napr0qo+prV0svnvOfV4XlPE0yyJUwRH5hN3ybGHaMpjKfE4ut6rvzZOAuezEg0uqMylnU0OT2ccs8QNzi/a3KI9ujueix0FDmo0BAUgksc47VpG3iv5bX3hnUN9InphyddPDPgXvmcygzyTkeserzQkBkXIFZWBFs54zOv59LE7dZktoNutU7zLg93ak9113bHNgpyFuYa2XPfOgXS/8DMXlxqOBiETjJ5VssLVz/2zOgBbk3cylPWlvMlUIIBy8wYo4loNyDWekjo= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 0f584098-7fcc-4848-725a-08d4888c1886 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:CY1PR0301MB0601; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;3:oKcw3hx7ol/PvOMcNXJJVyC7/GnUzvkXEifz+vLeexM22kcPZt26j5uia+lYMkDMIXc4nxkEoVOxFYJL+DOmzBVD7Ej5yO7l600bvIzGygOKwy4M1Pehfz4dDS4qtuPXygGuHU8G60WwS3SFp8ZNm2qbvY5ILNCN6eBPqCRjulqqq0UtcbAQxpEmwEIN7NNFGCsx84WgFCT+52xseiSWHYyoiwRrnVnGsKTTzuZXG1yRVftw9hm9RzKcPduw15qtwYpxzbwebnpLhHZW7iyp0QCV+ZbvN5E5UQQE7MygBWqgs2+fe19vi+ylf5jMVTaQY/r12EMXSG9BC9h06CEVE1vZE7U3+5oSa4NcIHTC5/qPbNjpzxLbSCfrGSqH3oqWUr2MXgtK8sR1Na2qz87Jsvu2oA9mJljclm241b7KH262EvJ8dTeKKG8YaIgb6WUU;25:lYHkNv0IYJEmgxMCJVMgF7TmT04alukW//7x6eoSjpc1KfCptAdJx31mwyPV/r6JmjXVCEQAYpn0vUaFcHE50gh5dX9wQkIuVopOlgMhVSyQZWjstfBq3rWiOfUwxNPGfFpaZbsdLNokRPJk47UU/YOEAteY56qwNZ7mJKCRWTrHtr8JYZYXVZ9oH30s6pp9D1CQxGQ12RYJzc+yoNlAwpHQq5oxSGxcYXIbl+a70bNQ4jbCgEusswJApgLOQrjU6b3ItnI4l4SVGymExZAfgnkPZdzoqF334TLQk8PiLLSO43/cAahRcrO9J5sAp2Dz6cRKulDN7HT4iTM8QXUVi1BgfpN5yZ3z3bI6OHiLCWlbi+ppDcF6yqXn0j9ePLx1MiVkmslZeuz9Op8PsaQiDNE9RtUAA8x/A/xd/kYOO+BJMOpWqnRefFYRt9ozbZ8Xs9Dn9e63mghMkiRkZkX7bw== X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;31:d1oxMIoVheKlePvfKTZPaL8A59NfKY32uaMMkDgYspiQlZusS1dAudG53Ioukt9JP7aI9LFJN/gCc+ukU0KlFHVxBMcjqm1lilapeK0IxxUCePnd48NllZqTYxEa5nFFDzbCFnraU6/xLCljcZNh0nQhOpD42SK82e2/4lvAP9NjdPgRVqajiiz+hNAY1bIB40rxyqQ5TM/FIXxCOUNusQlzog0YIHVQN7tQn95hFfGuqfrEIin8j03hhvG6J9vQL0+Yw762PuYnQ9PqZo1YNKgHrtxGMXbMlCBHaCwkFNw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095135)(601004)(2401047)(13017025)(13018025)(13024025)(13023025)(13015025)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(20161123565025)(20161123563025)(20161123561025);SRVR:CY1PR0301MB0601;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB0601; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;4:zw494KPZg5MIvv65MiiJBP9JuTsxCKJ4MPwXhzZYbWf+EocZGJW02lMEnq/o9AtUeuRsqtWK6OYNLlYDqs0M+l2eRuDXVjGWNsl4KqeqU0QpzczocO3DXJ4VcTDhCh1h/8fQjhRc8d2IimmlRmGO9rz5quz+Xh9Ys8aO/ZPTnoCM8t6GPuzKjVUKEVHN575pLFCVb8Q2eMQr0U6Q/4mNCPOFex6hvJkzOuyi4DUckualK9KnqOlLb2i61cxRq0Z0Rn2rEJQrXhaZlmkjGUzt43eI34nP0KRGjAzWdqdqsYmwgIxk2CZRfbhVTkjVENFW/+jhwVf46P5ov/w+S3gJXfcDRNlYgNug/R5vNMQD4B1obpfCL5BQU/9dCKrbe36OZS6B8OYQWhiZVDqsYstSSb0uKlz+UP7MV+Lw5ngeAhoPZH+VNEvcTAMFriE2mDVlciL+0CwuyZuCCm5+31vyPw74YM/3onDJh49oFOEbNxbCQ8d23oizghw/1+DEVvbinYcnTzU/M0bmQWGD1KoJyCT/+nz74ouxELmGXNFsrI/M+wKcSUgxWnPNaliIrgf9htEfpI2PdMTzQQq0Mde+HyBzjHysjx1ocbG9zVegd6N1l5TzEeHgeQnbNRydK8yeFE7DmcndZCM0EQsU6arYKzrjfqlEnA4gKzcwXWo5E43/XnYaH3iza3gFytnl1xrWhEruHUu9fqjJ9cTEG2mjGbKbgDhX2FuNbfaUtosUy2xK4ifOvjpjdhXcSiE4fwC+IfDLT1GZc2zNBd1CbuZhhHa2RIZNzapWm6JN5GA26wOZJY7dhxCBUlMQDBg8mvUdWLFg7N1Bw/uLmlWpYgUyqLtq/QGiA4Q/EzN0AI4R/UuxVF2gJ6XDihdhwDu9AMyhOMMBUOHON4kNQiWPu7gyAQ== X-Forefront-PRVS: 02843AA9E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB0601;23:IJ3hiByvL4KpDibRKq3Og2PDgEuygjV6pLL6dcc?= =?us-ascii?Q?Dhlj8Q82f9BRp1WzUQ092A2KSn3o7gcig2ID87OEbpE8CPh65HfpHmpb4DPa?= =?us-ascii?Q?oGmEPqmj/F+2deAecI6v06oU80tr3jzsUMayQCdxhCHOfSAb2vZfJJZsTsXD?= =?us-ascii?Q?/oIukxU4a/D+2dgGrin8pRvGFstfl0S2HSVGVhBT4S2aDqfeWqaXuIop0wol?= =?us-ascii?Q?pp9DCHgU5hW8SyenDXMI0u3O+F5/V5TVuBp9Uo7vyIPDsUifsxNs8eJka7zh?= =?us-ascii?Q?KgOz5ne/YRrX3DcITtupceIkrLCI+pIS8vNNZ/9svaVxd0Mm4D5/FzWa1jZ4?= =?us-ascii?Q?MRoM44AUQbDRmyfIcjzHa5IH2eU+yY46W/4Nn49Sv/Hoy8pPUW6tCKW7jiYJ?= =?us-ascii?Q?HQNhApVDtU+5KysGxk74qe+Wk3G+h2TPwJ/zj5GiXJXO1DqPhcUKPN2B0Rdp?= =?us-ascii?Q?UeETFFDtkpdaTu5wsXcymnfRjsyN80uPUpjBpDore/5yOv7bG7ivOp52dqZu?= =?us-ascii?Q?eWw9682wZhv+2SPumr8+42xOGM4uZuZC/vmO9T9cZfgJvbiCa1hjxvTaOPbO?= =?us-ascii?Q?Id+SnQJddBSxlxok+4/2Ca8PFD4kKoxZ/skW1slwmXwiyoLAdKxuiikF8OGc?= =?us-ascii?Q?8v1AA6Kr2NC9trOuYovtS1y406GeKNqna9p4QfY0q+V4L/iScIigDQxE7o+Z?= =?us-ascii?Q?pvF1dKbyEeFZZu+Fspr4xCsKufFzb5sjix7KGazdI46yT+0CrVJCtUwpdjIe?= =?us-ascii?Q?cMkz56FmNy82gOsbguM9nmBk/WBDC1bnZpPdHJFatuMhTH7GaWguC52qnxsa?= =?us-ascii?Q?kpcIIoqlU21bRlCqXofU2oqo1ZTCkWaU8hUSt1F29Wd/TlmwVBl4n5lkapH+?= =?us-ascii?Q?3qka2jAb3EwMaGza5zX9QtQbFX9aFXTrfK0c2Oq/Jk7dRTwawxEp3PJZ6Sm6?= =?us-ascii?Q?r4sOkIw9c3SoQVVCsH+/7j1uRP2PO/yjvP2uEkgYVwNSihHe6x/2C1EntkVo?= =?us-ascii?Q?DJlyab/cWl1w24nugdoshna5tnZ2w3GwEttD3QCHz4f53vSgEFWsO1kcQDJX?= =?us-ascii?Q?jg8xTSlbIc4WF5m2bfjIJa85r+ksshm+275KMfGEANOfhv9z4r1Rgenq/aMH?= =?us-ascii?Q?uV8WkJpFTKZx2/XGoK5liRL/rEygUeFKOSylvhrgspo37xne9UXsSEi/8PIj?= =?us-ascii?Q?B+lAWuT3Cn62BV10TePNlbpD3+WGVxzohQJFfy2fUu+vNwTyLaB/S7B0fEJr?= =?us-ascii?Q?G+IaiSZoN/pFdhY/CkjjDMpnhyxHJiszfvq32izcX?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;6:1lVmShm9CFLSW85KUWVgjb9cA0Zxo2aW7fc0TrjXLip/MCzpjr2OqBgf8/3JgSoLff0OehbPCIw4xklWSTRkdKoY9bHKR36TrpQwZJcUg5IslCooRQ3L/QVj7F9Zrt2y1jg1bfdyXxeLNtYH8yoYU6Q6sZ1i+jnJJG40aBcrrtf0yvHLQVwVMJ3XJGd5DqfZhkKLKx9tAT9eiyOCxXMOA+Xvjg6v84zy0F9KtEMaNKHN1jsTWBjEMv9CLVOjMYvdkyMF2JkSTiGul11Q4usJvLwnFQIFrD75jTOxlPpLDIz/PZ7OysnNjgpntwSrdFnRW1UFXamV1WWk6FTD442xprZCMZlpm2IMxbhuwp46i9i59wNkePbISnQo8p7XI4qNQLYhpLYrAvxsm3cz104dn0ojKJj5gN/Fx6gyotXLQZJ+ufbWb+XU3TZWbDY6z65A7CVX15mdTWJKQ9XmE5jBgMH9DsFE5BpXxYzj9ZNYoxjq9IVZuOLz+gFmjZ0yX0Fc;5:i8IonlsSIqCSp5UhKaL6CIkKMP4RkezGkyfPtQaJehCQg/Iwt0OIINWgZV1lfbVwImpPmW2J9uTQdXCSWuUhUGsKAIPxqnFXg+pdPalWnOpaFesvJC85DTm7FljN5dSLHTsFrhXMLPQG2IbsrkUWQaV/PF8L2elqjhvxHV20pbDDiwsndwdEJPtA4sRAznit;24:LgS4OmzXBsiKmNJKSm9J4aVo0xrXO+Mpca0Xl+zQx6v6hkbtH6G8AcMXdUEhX7tTNLMu9laTJNTU6dAL3Q3xUB/sLZ3dif9CCATom7+7/zo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;7:mK0TR0nd8ioEjX0bb2f6XKwVn/gS1E/1ZDrdoe28s5655JAoUVHdxt7DX7J4hfd94Wx+yns6ZwVsLY65Uw+bBg48PRlcuNvgK26u3zZr/ti30wDO/RIBEsL1B9hFHC2HtmHKWzlEgzDw293zVFvRjo86+B5l5xRAFAPR+oJWBCCbdFKWHifun5Yixfbz+ZccMB5Nv2zz/YaVDaLgjru66OIetZqWbtWBexMaScxSRfX+eK+M+gNW3jrbQ6X7OJPjE980YZosfs2Q8hfG5C6urtyrqQsgw9kQ08QXOT/m1mnE1xEMBhwcHTQXsmVed64Ve3EwW2StqMLWOMdFFjrLFA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2017 07:57:45.2161 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0601 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Meng Yi If the FTM counter reaches the FTM_MOD value between the reading of the TOF bit and the writing of 0 to the TOF bit, the process of clearing the TOF bit does not work as expected when FTMx_CONF[NUMTOF] != 0 and the current TOF count is less than FTMx_CONF[NUMTOF]. If the above condition is met, the TOF bit remains set. If the TOF interrupt is enabled (FTMx_SC[TOIE] = 1), the TOF interrupt also remains asserted. Above is the errata discription In one word: software clearing TOF bit not works when FTMx_CONF[NUMTOF] was seted as nonzero and FTM counter reaches the FTM_MOD value. The workaround is clearing TOF bit until it works(FTM counter doesn't always reache the FTM_MOD anyway),which may cost some cycles. Signed-off-by: Meng Yi --- drivers/clocksource/fsl_ftm_timer.c | 8 ++++---- drivers/soc/fsl/layerscape/ftm_alarm.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 738515b..770bbbc 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -83,11 +83,11 @@ static inline void ftm_counter_disable(void __iomem *base) static inline void ftm_irq_acknowledge(void __iomem *base) { - u32 val; + unsigned int timeout = 100; - val = ftm_readl(base + FTM_SC); - val &= ~FTM_SC_TOF; - ftm_writel(val, base + FTM_SC); + while ((FTM_SC_TOF & ftm_readl(base + FTM_SC)) && timeout--) + ftm_writel(ftm_readl(base + FTM_SC) & (~FTM_SC_TOF), + base + FTM_SC); } static inline void ftm_irq_enable(void __iomem *base) diff --git a/drivers/soc/fsl/layerscape/ftm_alarm.c b/drivers/soc/fsl/layerscape/ftm_alarm.c index c42b26b..c0b8ae1 100644 --- a/drivers/soc/fsl/layerscape/ftm_alarm.c +++ b/drivers/soc/fsl/layerscape/ftm_alarm.c @@ -78,11 +78,11 @@ static inline void ftm_counter_disable(void __iomem *base) static inline void ftm_irq_acknowledge(void __iomem *base) { - u32 val; + unsigned int timeout = 100; - val = ftm_readl(base + FTM_SC); - val &= ~FTM_SC_TOF; - ftm_writel(val, base + FTM_SC); + while ((FTM_SC_TOF & ftm_readl(base + FTM_SC)) && timeout--) + ftm_writel(ftm_readl(base + FTM_SC) & (~FTM_SC_TOF), + base + FTM_SC); } static inline void ftm_irq_enable(void __iomem *base) -- 2.1.0.27.g96db324