From patchwork Wed Nov 23 17:29:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kochetkov X-Patchwork-Id: 9443989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BDE4A6075F for ; Wed, 23 Nov 2016 17:34:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C93B927165 for ; Wed, 23 Nov 2016 17:34:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCC9227CAF; Wed, 23 Nov 2016 17:34:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 553D327165 for ; Wed, 23 Nov 2016 17:34:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9bPe-0007xf-HZ; Wed, 23 Nov 2016 17:32:50 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9bN5-0005Ox-KU; Wed, 23 Nov 2016 17:30:13 +0000 Received: by mail-lf0-x244.google.com with SMTP id 98so623226lfs.0; Wed, 23 Nov 2016 09:29:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QRpcm8cjunKtwIvdMPgutZc/AsLJ2ZHKMmj9sg5V+P0=; b=W1yw4u4R/KbZhEHbxTEnJPTYtys8gKsQjIMqG5WhZ+CnFFun4gSIz71JnnhKfREK/L WIJDgxY5fSkpzMIOgqtcOPpeiAdZLv0QfHw9YFGFWonwYdPPuH0zuU8fOiF99Tpb6z/H 8bbEeBO2dZqF/Mi3F8o5j+XYHU4bZTdR2OTM0q+y9WhsnIalIGAJ3L19TAwq+JYrgIxQ 6jYyVfaEKSwvUHOPZxehcjXAqHm3gInoT0nGbI6pCgx4H8hUqjCybWQ4nKQUfdi8rtmf HNjebKyUr7H0tUZ5Eam5fcik8nNv1d94jfO5fO0xAUp7WPnEABzUmaR6a28VwYre2O0j cmIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QRpcm8cjunKtwIvdMPgutZc/AsLJ2ZHKMmj9sg5V+P0=; b=UBmUpD+AnOMzxHFyFCgz6ND97tYlq8yDcGGapqHjF5+ShoH4k3TZyyG/hlh5K92BLk TWieE/JNHnPQkfwOTJug+frIN/Fp7AQ1zqoOqXVvoLCK+QM392gJKJYeSG7TnH0Mpcwn Fz2ErsdKimXrYqNkQjfhXiPy+c7J0cRzlYCmX5Oz0YeHKoySsjWmxj2IhXZF2QLmNYC7 v94RzzCd1kDpROX00AgPTN4g2v0NO+XykcktpK26SmKirqhDmnuknNHFkYb2yTmAZgqb RGF56CtSauX7ThKHRm4aTBdnNWQ7BIH/dPkDLFrBDKLNbWEa4luuS6Aorh0iyT5rEDlP ytJA== X-Gm-Message-State: AKaTC03cXtrMasbqperKCWvQ3PphO7rDfjoqu4SLZzVytLwOUu1LIbSufGqncxejSFtRyg== X-Received: by 10.25.76.195 with SMTP id z186mr1418006lfa.104.1479922188485; Wed, 23 Nov 2016 09:29:48 -0800 (PST) Received: from ubuntu.lintech.local ([185.35.119.87]) by smtp.gmail.com with ESMTPSA id h71sm7455138ljh.21.2016.11.23.09.29.47 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 09:29:47 -0800 (PST) From: Alexander Kochetkov To: daniel.lezcano@linaro.org, tglx@linutronix.de, heiko@sntech.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 6/9] clocksource/drivers/rockchip_timer: implement reading 64bit value from timer Date: Wed, 23 Nov 2016 20:29:34 +0300 Message-Id: <1479922177-20136-6-git-send-email-al.kochet@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1479922177-20136-1-git-send-email-al.kochet@gmail.com> References: <1479922177-20136-1-git-send-email-al.kochet@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161123_093012_042602_DE09FBA5 X-CRM114-Status: UNSURE ( 7.97 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Kochetkov MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alexander Kochetkov --- drivers/clocksource/rockchip_timer.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index f4c26be..61787c5 100644 --- a/drivers/clocksource/rockchip_timer.c +++ b/drivers/clocksource/rockchip_timer.c @@ -19,6 +19,8 @@ #define TIMER_LOAD_COUNT0 0x00 #define TIMER_LOAD_COUNT1 0x04 +#define TIMER_CURRENT_VALUE0 0x08 +#define TIMER_CURRENT_VALUE1 0x0C #define TIMER_CONTROL_REG3288 0x10 #define TIMER_CONTROL_REG3399 0x1c #define TIMER_INT_STATUS 0x18 @@ -72,6 +74,25 @@ static void rk_timer_update_counter(u64 cycles, struct rk_timer *timer) writel_relaxed(upper, timer->base + TIMER_LOAD_COUNT1); } +static u64 rk_timer_counter_read(struct rk_timer *timer) +{ + u64 counter; + u32 lower; + u32 upper, old_upper; + + upper = readl_relaxed(timer->base + TIMER_CURRENT_VALUE1); + do { + old_upper = upper; + lower = readl_relaxed(timer->base + TIMER_CURRENT_VALUE0); + upper = readl_relaxed(timer->base + TIMER_CURRENT_VALUE1); + } while (upper != old_upper); + + counter = upper; + counter <<= 32; + counter |= lower; + return counter; +} + static void rk_timer_interrupt_clear(struct rk_timer *timer) { writel_relaxed(1, timer->base + TIMER_INT_STATUS);