From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 20/48] clocksource: armv8-timer: Convert explicit assembly into helpers
Date: Sat, 26 May 2018 13:44:23 -0700 [thread overview]
Message-ID: <20180526204451.16530-21-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180526204451.16530-1-andrew.smirnov@gmail.com>
Move inline assembly related to querying and counter value as well as
getting and setting counter frequency register into asm/system.h as
well as converting it inot helper functions. This is done to make the
code availible to other parts of the system.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/include/asm/system.h | 24 ++++++++++++++++++++++++
drivers/clocksource/armv8-timer.c | 13 ++-----------
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index 57c76186b..5cf828ea3 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -77,6 +77,30 @@ static inline unsigned long read_mpidr(void)
return val;
}
+
+static inline void set_cntfrq(unsigned long cntfrq)
+{
+ asm volatile("msr cntfrq_el0, %0" : : "r" (cntfrq) : "memory");
+}
+
+static inline unsigned long get_cntfrq(void)
+{
+ unsigned long cntfrq;
+
+ asm volatile("mrs %0, cntfrq_el0" : "=r" (cntfrq));
+ return cntfrq;
+}
+
+static inline unsigned long get_cntpct(void)
+{
+ unsigned long cntpct;
+
+ isb();
+ asm volatile("mrs %0, cntpct_el0" : "=r" (cntpct));
+
+ return cntpct;
+}
+
#endif
static inline unsigned int get_cr(void)
{
diff --git a/drivers/clocksource/armv8-timer.c b/drivers/clocksource/armv8-timer.c
index 57b0b694c..c5306dcd2 100644
--- a/drivers/clocksource/armv8-timer.c
+++ b/drivers/clocksource/armv8-timer.c
@@ -22,12 +22,7 @@
uint64_t armv8_clocksource_read(void)
{
- unsigned long cntpct;
-
- isb();
- asm volatile("mrs %0, cntpct_el0" : "=r" (cntpct));
-
- return cntpct;
+ return get_cntpct();
}
static struct clocksource cs = {
@@ -38,11 +33,7 @@ static struct clocksource cs = {
static int armv8_timer_probe(struct device_d *dev)
{
- unsigned long cntfrq;
-
- asm volatile("mrs %0, cntfrq_el0" : "=r" (cntfrq));
-
- cs.mult = clocksource_hz2mult(cntfrq, cs.shift);
+ cs.mult = clocksource_hz2mult(get_cntfrq(), cs.shift);
return init_clock(&cs);
}
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-05-26 20:46 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-26 20:44 [PATCH v2 00/48] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 01/48] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-05-27 7:28 ` Sam Ravnborg
2018-05-28 1:03 ` Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 02/48] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 03/48] ARM: Add i.MX8 support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 04/48] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 05/48] Include our own include/dt-bindings Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 06/48] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 07/48] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 08/48] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 09/48] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 10/48] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 11/48] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 12/48] mmc: i.MX esdhc: " Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 13/48] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 14/48] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 15/48] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 16/48] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 17/48] scripts/imx: Add trivial i.MX8 support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 18/48] ARM: i.MX: Add basic CCM constants for i.MX8 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 19/48] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-05-26 20:44 ` Andrey Smirnov [this message]
2018-05-26 20:44 ` [PATCH v2 21/48] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 22/48] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 23/48] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 24/48] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 25/48] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 26/48] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 27/48] pinctrl: i.MX: " Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 28/48] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 29/48] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-05-28 15:23 ` Sascha Hauer
2018-05-28 18:02 ` Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 30/48] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 31/48] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 32/48] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 33/48] common/clock: Move delay and timeout functions to clock.h Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 34/48] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 35/48] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 36/48] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 37/48] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 38/48] ARM: lib64: Make string functions aware of MMU configuration Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 39/48] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 40/48] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 41/48] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 42/48] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 43/48] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 44/48] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 45/48] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 46/48] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 47/48] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-05-28 15:51 ` Sascha Hauer
2018-05-28 18:04 ` Andrey Smirnov
2018-05-28 16:04 ` Sascha Hauer
2018-05-28 18:07 ` Andrey Smirnov
2018-05-26 20:44 ` [PATCH v2 48/48] ARM: Introduce imx_v8_defconfig Andrey Smirnov
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=20180526204451.16530-21-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox