From patchwork Wed Jul 15 22:49:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Alonso X-Patchwork-Id: 496025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 74EBA14029D for ; Thu, 16 Jul 2015 10:34:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 461AD4B7D6; Thu, 16 Jul 2015 02:34:10 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ic1wLwspmb9E; Thu, 16 Jul 2015 02:34:10 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2427E4B721; Thu, 16 Jul 2015 02:33:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C07004B616 for ; Thu, 16 Jul 2015 01:14:25 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id baJzxZRXhcxC for ; Thu, 16 Jul 2015 01:14:25 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0102.outbound.protection.outlook.com [65.55.169.102]) by theia.denx.de (Postfix) with ESMTPS id 213E64B615 for ; Thu, 16 Jul 2015 01:14:21 +0200 (CEST) Received: from DM2PR0301MB1232.namprd03.prod.outlook.com (10.160.219.21) by DM2PR0301MB0863.namprd03.prod.outlook.com (10.160.215.149) with Microsoft SMTP Server (TLS) id 15.1.207.19; Wed, 15 Jul 2015 23:14:19 +0000 Received: from DM2PR03CA0007.namprd03.prod.outlook.com (10.141.96.17) by DM2PR0301MB1232.namprd03.prod.outlook.com (10.160.219.21) with Microsoft SMTP Server (TLS) id 15.1.207.19; Wed, 15 Jul 2015 23:11:51 +0000 Received: from BL2FFO11FD035.protection.gbl (207.46.163.205) by DM2PR03CA0007.outlook.office365.com (10.141.96.17) with Microsoft SMTP Server (TLS) id 15.1.219.17 via Frontend Transport; Wed, 15 Jul 2015 23:11:50 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Wed, 15 Jul 2015 22:50:28 +0000 Received: from bluefly.am.freescale.net (bluefly.am.freescale.net [10.81.17.130]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t6FMoOQf030445; Wed, 15 Jul 2015 15:50:27 -0700 From: Adrian Alonso To: , Date: Wed, 15 Jul 2015 17:49:17 -0500 Message-ID: <1437000559-3208-9-git-send-email-aalonso@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437000559-3208-1-git-send-email-aalonso@freescale.com> References: <1437000559-3208-1-git-send-email-aalonso@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD035; 1:fek96JBWntL8DPhKQlEDzWCvrvkhYM5PKzrqU3P/cqtl+LCHNSRDzopwkmgox2blRvtvQ1b7TwiLDTWIKoZ/ppqGprVD1+HiqYEU39RuRNav3uHeT1ihVE+yt2dynETJhK1q2C13ks7m/f4Rz067BJGusXuuwUwzmZF7gwqrisRqH/MzMkGtPEWCaRfMfoxogn8IW48YTIrr99YVdfKPKtLM9lBNUr51pEibGpW7shoS9uS8l0VLRX/0wghPNb0cbCyEF/ynwfIzBjRzabb5rphwd7y938uBrPltiGK3SLVXdt/EY43/7v2RJGr3fRVuzJMHsrj+Qkn68NCOc0ALzoEc8WCzb9jgM7GJeGOzTEWzB2Gyzpc0CAB5ZoDPcZ6kzVYhTpWdNJQWnf3gOBbR4DIA8uMoDkhCwYTjTmOoh3LD1bIXs/CYDFduJQJQWCSw X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(85426001)(77156002)(50226001)(76176999)(46102003)(62966003)(48376002)(50466002)(36756003)(105606002)(6806004)(92566002)(50986999)(87936001)(86362001)(19580405001)(106466001)(19580395003)(47776003)(5001960100002)(5001770100001)(229853001)(5001920100001)(5003940100001)(77096005)(2950100001)(104016003)(33646002)(189998001)(107886002)(32563001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1232; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1232; 2:UlEi9VFCvNlYWtxazHFgL5+nsNYSQ4Yby+cpZmIk6j6TI8qO3zsP8L+RIQ8V058x; 3:UdV+o9wJ6j1jOFgoMFZFgq9wuHVU6Tfd6e7UfOyFxe6UfnZz/LzL5Ziayv/ZTbd6EqPX4k8IAbcDT23wwyZA1oXpYV0qRv9T65TOWJulmM7cdDmeWOJqRDA6L6bViL9buhouGoK+iYCZTITSYw0YPtfzVrzEfEC/LDhmlPYXWepsRx6H0McZDNY2WmLIyaaHkVbgZVSJinUIAbKUPwB8tUiVMcd1uyp91YfzdUeK760=; 25:FOZ0JXNROAQYLONu6hmXAooCKqlIw8+NVY0K0vLG9gU5LHtug6RBtaLyTGQH4v5pj+p6oA2+OeKtf43nCcds00LjVNUXIucKY1ruqYABZpR9vDHYaqMmxs6PFN3lhmZ8K2Unbi7AJz77NV+KDKTWoAqsW7tmGtA0eh9Cov0rtz128JWWcf3kIvbv0Z8P0cAFyaXQathrvyJ0ecbtvgy3eW8Qx1BiXn2ZiZ5IA1rSCcrjLgcbCB/iZEZkRKMLTargDoKIExpQpK0WJlYYD18Luw==; 20:okphfgA2HOgH9Fq1C9B9HM4bLYKzVoMEvX+o2AOR2QYvv8Ij8TJKB+9naUSwRPfLtyhPJk6j/cez7NbhjW+o4Kg1zNVDriB9yfcyXkm5zrHUvYy+6DI+F/1PqCcZGKGDEy0thaVtCNLaEwrbexmojj3ga/1yrFF9iUnkHOT35Ik6z+BmZPNaKGLptGLTee4txpuK854JL4nr79+73ZTgdiplWwUHfEj/i+Ew9oXz4wE/r2jtUQnnyGymy1JJJuGhAbhry/vpT4CqPdGSYn2bvUaw5Hj/8+rFlrVDwGTDADT/PfGppVlcc1QDVtltj2VNVOad5TmIpo1S2AerORfJCpKZVWL3bH5vCMo1Y1rI0tc= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1232; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0863; 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:DM2PR0301MB1232; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1232; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1232; 4:uj7iU+72dsLfR92gI18GdMX4/sKnDJc/ZEap5eqziKm5wQwxW5/45FVroWUJAHUoliQemVJMGaWqXXQKDpDvU5YOVhTRbqiqk/ycvCf3wOMIPWxpHgiiZBJ1Z8yeGgshUNAmR+cpW3K9iE1mPSyhv+78BbL6GvaRwz+AOflaj3O8lns5rquRnMtMMxJq8KVEXzMix1Qhk0phltYvQ1fhgUTN55sYW2P+xaoKLYV1/Gka/m4giTuuWUPmQVgv0C8kwZcb7MLlazP1d0+U8tTscB266DlwuIoL/b5ksAUBz0s= X-Forefront-PRVS: 0638FD5066 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1232; 23:lhNSrDl6vM7l5ovcYq2rhFIAjAXKU+y9zS8dysQ?= =?us-ascii?Q?TIpk+hU0jRkxOduiaq0dSCo1x2+VWMbtH3Yylz46vTsvNrXwJ/eb2sjKHS3t?= =?us-ascii?Q?LhyyMYVsX9Rhh7m+DopT5C+LBfyPbzRB1cTSvEZ5c7MWbBjQZD6mBTXm6zV/?= =?us-ascii?Q?D1ZDQfFY4ixHf2df6uUTWjClYfkMNHPsm9TYTYvMWTpsZpHcevgSNxRdts7E?= =?us-ascii?Q?PtlCOgNQ7wKpuxsC83YnCLarLfz+kY9x0lPVuUqMtWOwferFBrEoi34upNbV?= =?us-ascii?Q?F+OyKEs0X+Rk3ZSDEkfnGcHQTodvw5KAfxbhLEK+1NIM1rzKbFxBvPYUX1Rf?= =?us-ascii?Q?QGvYhT97P+lI6CTaHiocq8otcAd/kNXhvL5DMgxF9/FFrVeg3F1Jqc2CRV4Y?= =?us-ascii?Q?8W/b3p9akeMMiYwXBr/0OUPohJR0sXZyDfffMejDVuDHJdGMYYtJ3atIyRyV?= =?us-ascii?Q?DhNj15VV3q7tPN+o9oiJeH1jETa3qm/6W9c5cq1lxdNL1PBNJ6mXbkd3kHW6?= =?us-ascii?Q?fo6kZty8ZPe2C/hJ+z/KU4hK9VPnvRhG071dNEJKczJZv2szmPFuhdifpBg2?= =?us-ascii?Q?lqjQns3/StUJMHpExxyMfdTbj0YzfX1bnwLrPKSo7/GbHRATugWy3S/e/m8m?= =?us-ascii?Q?c8LFtm43P2ROXVxWkxs9BEuy0Q6IinEP+50oOQywVKTsdEK9FgURkE12opl8?= =?us-ascii?Q?nIiXReQ69OES4Ts0mAufH0l5gFTYDObblDCmFuQEJjaCLE0cx3Hv9hRzp2zS?= =?us-ascii?Q?UBjcuDi06vhGp1l/cnrEPvx4YjCE5sz+VGTnPu9ketKbCPJwoAyTvGZjHhuq?= =?us-ascii?Q?j9RJ9VT0vF/yjaLB/5e9wO9kxI7jRUP1WFvrHZ3WQbRceEOfy9FFaWcVL8Lc?= =?us-ascii?Q?Sd8YIFnQ+1PhzlyJfn0Ao1OX441UsKWBP1HMuxSwoQszppMTwgTimmhEnOhE?= =?us-ascii?Q?vdOi8TVK8XoJJ/pCzL5/ugJ7dIc58ZfCG8sF0Hr0HpSbuxg9IHYpWKSs5bQV?= =?us-ascii?Q?nidcSxCGZC1kQ0EgPmIDCkR0P?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1232; 5:nUeIrFS8RidALSVKOcgRR0MgvMzWp191gJHuU1Lwu/oQ6j5SAduJW7agfftEN4v0ljEvQcc/ttbwV3mulA1Lm6viBxJe35PLZlpdOxa4zckw/BG8NZCj21mSuob79wa40/S4zQAHMziagQcXpudqog==; 24:+q2LfGkJPQYztFEQABdSAszMJp2ooAz3tfhF0z5M6HPJLNpUj1XYao4ROJV0QG716hossur9Am3MRGvXRsJuwsimgC6qIoA1nJdRsyMpTy0=; 20:ErmWztPhwAg6ffzz2wkevwvBp2wH3Cay0yhQw+VMstM42ciu/52ddQCNtHLoYt8Cpy6G8wodfJhUTQviwogjQw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 22:50:28.9117 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1232 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0863; 2:UZlSyDR81WieWHkE10Hmxhhndfl8bFybiO9jR4Ik4AnLZSe64cOMs4n/BZiGUwdN; 3:Vz8/HsCzxOTiPbSBKENCSCeMxAxxRLfe6x6FnES0/u8z1HHIHEYwOQiXPpNsSN9wmS7Hev9TDdxHOgDcRWRdHsL/7RwJS7wmItj3MRBC6n6MNsU0BgttVf9zKuHkyPpr8AQ12C7VCWIqQ9Z6DkR1M3eSnddKLhwV0ZpTMJFdlsx/3vjZFbEhUUdoK8KYDun9CCfVDM5ZteOFpNaIvAdRmpsTjpkXyKVN45ZtS60ewgc=; 25:JcIYTihy0DL4NkZmNx4eai8U2GEZ5RfeCVMrscXYXQdgf6ezbwlYfeR/ICzJ86V97CNUmncGOu2L9iM6L8KXszPq9Q9tj8JMY6uTbMNtEWo02VzUj5uw76lGbaUFHB7tFgEqBSBgIhkvuwpGLhQH6QddmYdv4eRq+simF6ZLvdvqhAqRfOSN5p0HXYYdqx2sqBU7RMnT4km9of+it28JyYdYcREV+yMW/lwc/Iuy7dT2WRZ45S4UjLzVQ0VYmIyaDePXbVKfEeQP883i7ZseXw==; 23:NKtLm1zrdTvDTwmToccWgS7lFqrxqeMz72zrhtuRKjXK+0OapNMeQgjovopLNlYta/rkFpZFgxG0tjadEyqs4wVZtW2BC/rN6YFYMoeLzA9ynx7awIWNGYUzzb4fbvnSoh0tGbgAHZpC8dGaaTAFeuYdSCOdNXmrWgHiWZmdi9z6IJpNTRhkO1cDyLaA122BN3Kn80Pe6zqUQseefnWEX2b79uNu5QfpkcTBDj7J7J2u1hXBvkQi+dWp4cLYB14Z X-OriginatorOrg: freescale.com X-Mailman-Approved-At: Thu, 16 Jul 2015 02:33:39 +0200 Cc: Fabio.Estevam@freescale.com, otavio@ossystems.com.br Subject: [U-Boot] [PATCH 09/11] imx: system counter driver for imx7d and mx6ul X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" * The system counter driver for imx7d abd mx6ul, move this timer driver to imx-common and rename it as syscounter.c For mx6ul and mx7, configurations are used for choose the GPT timer or system counter timer (default). GPT timer: CONFIG_GPT_TIMER System counter timer: CONFIG_SYSCOUNTER_TIMER For mx6dqp GPT timer is the default setting. Signed-off-by: Adrian Alonso Signed-off-by: Ye.Li --- arch/arm/imx-common/syscounter.c | 126 +++++++++++++++++++++++++++ arch/arm/include/asm/imx-common/syscounter.h | 29 ++++++ include/configs/mx6_common.h | 1 + 3 files changed, 156 insertions(+) create mode 100644 arch/arm/imx-common/syscounter.c create mode 100644 arch/arm/include/asm/imx-common/syscounter.h diff --git a/arch/arm/imx-common/syscounter.c b/arch/arm/imx-common/syscounter.c new file mode 100644 index 0000000..f5e5cdc --- /dev/null +++ b/arch/arm/imx-common/syscounter.c @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * The file use ls102xa/timer.c as a reference. + */ + +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +/* + * This function is intended for SHORT delays only. + * It will overflow at around 10 seconds @ 400MHz, + * or 20 seconds @ 200MHz. + */ +unsigned long usec2ticks(unsigned long usec) +{ + ulong ticks; + + if (usec < 1000) + ticks = ((usec * (get_tbclk()/1000)) + 500) / 1000; + else + ticks = ((usec / 10) * (get_tbclk() / 100000)); + + return ticks; +} + +static inline unsigned long long tick_to_time(unsigned long long tick) +{ + unsigned long freq; + + asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq)); + + tick *= CONFIG_SYS_HZ; + do_div(tick, freq); + + return tick; +} + +static inline unsigned long long us_to_tick(unsigned long long usec) +{ + unsigned long freq; + + asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq)); + + usec = usec * freq + 999999; + do_div(usec, 1000000); + + return usec; +} + +int timer_init(void) +{ + struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR; + unsigned long val, freq; + + freq = CONFIG_SC_TIMER_CLK; + asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq)); + + writel(freq, &sctr->cntfid0); + + /* Enable system counter */ + val = readl(&sctr->cntcr); + val &= ~(SC_CNTCR_FREQ0 | SC_CNTCR_FREQ1); + val |= SC_CNTCR_FREQ0 | SC_CNTCR_ENABLE | SC_CNTCR_HDBG; + writel(val, &sctr->cntcr); + + gd->arch.tbl = 0; + gd->arch.tbu = 0; + + return 0; +} + +unsigned long long get_ticks(void) +{ + unsigned long long now; + + asm("mrrc p15, 0, %Q0, %R0, c14" : "=r" (now)); + + gd->arch.tbl = (unsigned long)(now & 0xffffffff); + gd->arch.tbu = (unsigned long)(now >> 32); + + return now; +} + +ulong get_timer_masked(void) +{ + return tick_to_time(get_ticks()); +} + +ulong get_timer(ulong base) +{ + return get_timer_masked() - base; +} + +void __udelay(unsigned long usec) +{ + unsigned long long tmp; + ulong tmo; + + tmo = us_to_tick(usec); + tmp = get_ticks() + tmo; /* get current timestamp */ + + while (get_ticks() < tmp) /* loop till event */ + /*NOP*/; +} + +/* + * This function is derived from PowerPC code (timebase clock frequency). + * On ARM it returns the number of timer ticks per second. + */ +ulong get_tbclk(void) +{ + unsigned long freq; + + asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq)); + + return freq; +} diff --git a/arch/arm/include/asm/imx-common/syscounter.h b/arch/arm/include/asm/imx-common/syscounter.h new file mode 100644 index 0000000..ddb412e --- /dev/null +++ b/arch/arm/include/asm/imx-common/syscounter.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _ASM_ARCH_SYSTEM_COUNTER_H +#define _ASM_ARCH_SYSTEM_COUNTER_H + +/* System Counter */ +struct sctr_regs { + u32 cntcr; + u32 cntsr; + u32 cntcv1; + u32 cntcv2; + u32 resv1[4]; + u32 cntfid0; + u32 cntfid1; + u32 cntfid2; + u32 resv2[1001]; + u32 counterid[1]; +}; + +#define SC_CNTCR_ENABLE (1 << 0) +#define SC_CNTCR_HDBG (1 << 1) +#define SC_CNTCR_FREQ0 (1 << 8) +#define SC_CNTCR_FREQ1 (1 << 9) + +#endif diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 86d7b16..690038d 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -30,6 +30,7 @@ #define CONFIG_MP #define CONFIG_MXC_GPT_HCLK +#define CONFIG_GPT_TIMER #define CONFIG_SYS_NO_FLASH