From: Zhen Lei <thunder.leizhen@huawei.com>
To: Rob Herring <robh+dt@kernel.org>,
devicetree <devicetree@vger.kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Haojian Zhuang <haojian.zhuang@linaro.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>,
Libin <huawei.libin@huawei.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
Jianguo Chen <chenjianguo3@huawei.com>
Subject: [PATCH v3 8/9] clocksource: sp804: enable Hisilicon sp804 timer 64bit mode
Date: Fri, 18 Sep 2020 21:22:36 +0800 [thread overview]
Message-ID: <20200918132237.3552-9-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20200918132237.3552-1-thunder.leizhen@huawei.com>
A 100MHZ 32-bit timer will be wrapped up less than 43s. Although the
kernel maintains a software high 32-bit count in the tick IRQ. But it's
not applicable to the user mode APPs.
Note: The kernel still uses the lower 32 bits of the timer.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/clocksource/timer-sp.h | 6 ++++++
drivers/clocksource/timer-sp804.c | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/drivers/clocksource/timer-sp.h b/drivers/clocksource/timer-sp.h
index 1ab75cbed0e09e5..811f840be0e52fd 100644
--- a/drivers/clocksource/timer-sp.h
+++ b/drivers/clocksource/timer-sp.h
@@ -33,12 +33,15 @@
struct sp804_timer {
int load;
+ int load_h;
int value;
+ int value_h;
int ctrl;
int intclr;
int ris;
int mis;
int bgload;
+ int bgload_h;
int timer_base[NR_TIMERS];
int width;
};
@@ -46,12 +49,15 @@ struct sp804_timer {
struct sp804_clkevt {
void __iomem *base;
void __iomem *load;
+ void __iomem *load_h;
void __iomem *value;
+ void __iomem *value_h;
void __iomem *ctrl;
void __iomem *intclr;
void __iomem *ris;
void __iomem *mis;
void __iomem *bgload;
+ void __iomem *bgload_h;
unsigned long reload;
int width;
};
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index f0783d19522f048..6e8ad4a4ea3c737 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -24,12 +24,15 @@
#define HISI_TIMER_1_BASE 0x00
#define HISI_TIMER_2_BASE 0x40
#define HISI_TIMER_LOAD 0x00
+#define HISI_TIMER_LOAD_H 0x04
#define HISI_TIMER_VALUE 0x08
+#define HISI_TIMER_VALUE_H 0x0c
#define HISI_TIMER_CTRL 0x10
#define HISI_TIMER_INTCLR 0x14
#define HISI_TIMER_RIS 0x18
#define HISI_TIMER_MIS 0x1c
#define HISI_TIMER_BGLOAD 0x20
+#define HISI_TIMER_BGLOAD_H 0x24
struct sp804_timer __initdata arm_sp804_timer = {
@@ -43,7 +46,9 @@ struct sp804_timer __initdata arm_sp804_timer = {
struct sp804_timer __initdata hisi_sp804_timer = {
.load = HISI_TIMER_LOAD,
+ .load_h = HISI_TIMER_LOAD_H,
.value = HISI_TIMER_VALUE,
+ .value_h = HISI_TIMER_VALUE_H,
.ctrl = HISI_TIMER_CTRL,
.intclr = HISI_TIMER_INTCLR,
.timer_base = {HISI_TIMER_1_BASE, HISI_TIMER_2_BASE},
@@ -129,6 +134,10 @@ int __init sp804_clocksource_and_sched_clock_init(void __iomem *base,
writel(0, clkevt->ctrl);
writel(0xffffffff, clkevt->load);
writel(0xffffffff, clkevt->value);
+ if (clkevt->width == 64) {
+ writel(0xffffffff, clkevt->load_h);
+ writel(0xffffffff, clkevt->value_h);
+ }
writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
clkevt->ctrl);
@@ -245,7 +254,9 @@ static void __init sp804_clkevt_init(struct sp804_timer *timer, void __iomem *ba
clkevt = &sp804_clkevt[i];
clkevt->base = timer_base;
clkevt->load = timer_base + timer->load;
+ clkevt->load_h = timer_base + timer->load_h;
clkevt->value = timer_base + timer->value;
+ clkevt->value_h = timer_base + timer->value_h;
clkevt->ctrl = timer_base + timer->ctrl;
clkevt->intclr = timer_base + timer->intclr;
clkevt->width = timer->width;
--
1.8.3
next prev parent reply other threads:[~2020-09-18 13:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:22 [PATCH v3 0/9] clocksource: sp804: add support for Hisilicon sp804 timer Zhen Lei
2020-09-18 13:22 ` [PATCH v3 1/9] clocksource: sp804: cleanup clk_get_sys() Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Cleanup clk_get_sys() tip-bot2 for Kefeng Wang
2020-09-18 13:22 ` [PATCH v3 2/9] clocksource: sp804: remove unused sp804_timer_disable() and timer-sp804.h Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Remove " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 3/9] clocksource: sp804: delete the leading "__" of some functions Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Delete " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 4/9] clocksource: sp804: remove a mismatched comment Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Remove " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 5/9] clocksource: sp804: prepare for support non-standard register offset Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Prepare " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 6/9] clocksource: sp804: " Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Support " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 7/9] clocksource: sp804: add support for Hisilicon sp804 timer Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Add " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` Zhen Lei [this message]
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Enable Hisilicon sp804 timer 64bit mode tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 9/9] dt-bindings: sp804: add support for Hisilicon sp804 timer Zhen Lei
2020-09-19 11:43 ` Daniel Lezcano
2020-09-19 12:36 ` Leizhen (ThunderTown)
2020-09-19 11:51 ` [PATCH v3 0/9] clocksource: " Daniel Lezcano
2020-09-19 12:19 ` Leizhen (ThunderTown)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918132237.3552-9-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=chenjianguo3@huawei.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=haojian.zhuang@linaro.org \
--cc=huawei.libin@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
--cc=wangkefeng.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.