Move ARC timer code into drivers/clocksource/
Subsystems (4)
v3 cover Move ARC timer code into drivers/clocksource/
Hi,
This series addresses the long pending move of ARC timer code into drivers/clocksource/.
Thx,
-Vineet
v2 -> v3
- Fixed a bunch of typos in changelogs [Daniel]
- aux.h: stubs for {read,write}_aux_reg() inline functions(vs. macros)
to cleanly avoid warnings in !ARC builds [Daniel]
- Remove __maybe_used in driver given above [Daniel]
- Ran checkpatch and fixed some space/tab issues
v1 -> v2
- Now 10 patches instead of 9 to handle BIG ENDIAN in arch agnostic way
- Moved fix for RTC (v1 2/9) ahead of queue (v2 1/10) to allow for easier stable backport
- Folded the Kconfig items for RTC and GFRC into single ARC_TIMERS_64BIT So no special casing for UP/SMP in Kconfig.
Driver already handles the UP vs. SMP at runtime as needed
- convert WARN() to pr_warn() [Daniel]
- Use of _BITUL() vs. constant 0x8000_0000 [Daniel]
- changelog spellos: [Daniel]
s/depedency/dependency/
s/seperate/separate/
v2: http://lists.infradead.org/pipermail/linux-snps-arc/2016-November/001724.html
v1: http://lists.infradead.org/pipermail/linux-snps-arc/2016-October/001676.html
Vineet Gupta (10):
ARC: timer: rtc: implement read loop in "C" vs. inline asm
ARC: timer: gfrc, rtc: deuglify big endian code
ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ...
ARC: timer: gfrc: boot print alongside other timers
ARC: time: move time_init() out of the driver
ARC: timer: Build gfrc, rtc under same option (64-bit timers)
ARC: breakout aux handling into a separate header
ARC: move mcip.h into include/soc and adjust the includes
ARC: breakout timer include code into separate header ...
clocksource: import ARC timer driver
MAINTAINERS | 1 +
arch/arc/Kconfig | 13 +--
arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +-
arch/arc/configs/vdk_hs38_smp_defconfig | 2 +-
arch/arc/include/asm/arcregs.h | 94 +---------------
arch/arc/kernel/Makefile | 2 +-
arch/arc/kernel/mcip.c | 2 +-
arch/arc/kernel/setup.c | 17 ++-
arch/arc/plat-axs10x/axs10x.c | 2 +-
drivers/clocksource/Kconfig | 19 ++++
drivers/clocksource/Makefile | 1 +
.../time.c => drivers/clocksource/arc_timer.c | 125 +++++++--------------
include/soc/arc/aux.h | 63 +++++++++++
{arch/arc/include/asm => include/soc/arc}/mcip.h | 10 +-
include/soc/arc/timers.h | 38 +++++++
include/soc/nps/common.h | 4 +-
16 files changed, 191 insertions(+), 204 deletions(-)
rename arch/arc/kernel/time.c => drivers/clocksource/arc_timer.c (72%)
create mode 100644 include/soc/arc/aux.h
rename {arch/arc/include/asm => include/soc/arc}/mcip.h (95%)
create mode 100644 include/soc/arc/timers.hSignature · 1 line
2.7.4
PATCH v3 1/10 ARC: timer: rtc: implement read loop in "C" vs. inline asm
The current code doesn't even compile as somehow the inline assembly can't see the register names defined as ARC_RTC_*
I'm pretty sure It worked when I first got it merged, but the tools were definitely different then.
So better to write this in "C" anyways.
--- arch/arc/kernel/time.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
arch/arc/kernel/time.c +11 -8
@@ -152,14 +152,17 @@ static cycle_t arc_read_rtc(struct clocksource *cs)cycle_t full; } stamp; - - __asm__ __volatile( - "1: \n" - " lr %0, [AUX_RTC_LOW] \n" - " lr %1, [AUX_RTC_HIGH] \n" - " lr %2, [AUX_RTC_CTRL] \n" - " bbit0.nt %2, 31, 1b \n" - : "=r" (stamp.low), "=r" (stamp.high), "=r" (status)); +/* +* hardware has an internal state machine which tracks readout of +* low/high and updates the CTRL.status if +* - interrupt/exception taken between the two reads +* - high increments after low has been read +*/ +do { + stamp.low =read_aux_reg (AUX_RTC_LOW ); + stamp.high =read_aux_reg (AUX_RTC_HIGH ); + status =read_aux_reg (AUX_RTC_CTRL ); + }while (!(status &_BITUL (31 )));return stamp.full; }
Signature · 1 line
2.7.4
PATCH v3 2/10 ARC: timer: gfrc, rtc: deuglify big endian code
In reply to Vineet GuptaA standard "C" shift will be handled appropriately by the compiler depending on the endian for the build. So we don't need the explicit distinction in code
--- arch/arc/kernel/time.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-)
arch/arc/kernel/time.c +8 -22
@@ -86,26 +86,19 @@ static int noinline arc_get_timer_clk(struct device_node *node)static cycle_t arc_read_gfrc (struct clocksource *cs) {unsigned long flags; -union { -#ifdef CONFIG_CPU_BIG_ENDIAN -struct {u32 h, l; }; -#else -struct {u32 l, h; }; -#endif -cycle_t full; - } stamp; +u32 l, h;local_irq_save (flags);__mcip_cmd (CMD_GFRC_READ_LO ,0 ); - stamp.l =read_aux_reg (ARC_REG_MCIP_READBACK ); + l =read_aux_reg (ARC_REG_MCIP_READBACK );__mcip_cmd (CMD_GFRC_READ_HI ,0 ); - stamp.h =read_aux_reg (ARC_REG_MCIP_READBACK ); + h =read_aux_reg (ARC_REG_MCIP_READBACK );local_irq_restore (flags); -return stamp.full; +return (((cycle_t )h) <<32 ) | l; }static struct clocksource arc_counter_gfrc = {
@@ -143,14 +136,7 @@ CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);static cycle_t arc_read_rtc (struct clocksource *cs) {unsigned long status; -union { -#ifdef CONFIG_CPU_BIG_ENDIAN -struct {u32 high, low; }; -#else -struct {u32 low, high; }; -#endif -cycle_t full; - } stamp; +u32 l, h;/* * hardware has an internal state machine which tracks readout of
@@ -159,12 +145,12 @@ static cycle_t arc_read_rtc(struct clocksource *cs)* - high increments after low has been read */ do { - stamp.low =read_aux_reg (AUX_RTC_LOW ); - stamp.high =read_aux_reg (AUX_RTC_HIGH ); + l =read_aux_reg (AUX_RTC_LOW ); + h =read_aux_reg (AUX_RTC_HIGH ); status =read_aux_reg (AUX_RTC_CTRL ); }while (!(status &_BITUL (31 ))); -return stamp.full; +return (((cycle_t )h) <<32 ) | l; }static struct clocksource arc_counter_rtc = {
Signature · 1 line
2.7.4
PATCH v3 3/10 ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ...
In reply to Vineet Gupta... don't rely on cpuinfo populated in arc boot code. This paves way for moving this code in drivers/clocksource/
And while at it, convert the WARN() to pr_warn() as sugested by Daniel
--- arch/arc/kernel/time.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
arch/arc/kernel/time.c +13 -5
@@ -111,11 +111,14 @@ static struct clocksource arc_counter_gfrc = {static int __init arc_cs_setup_gfrc (struct device_node *node) { -int exists = cpuinfo_arc700[0 ].extn.gfrc; +struct mcip_bcr mp;int ret; -if (WARN (!exists,"Global-64-bit-Ctr clocksource not detected" )) +READ_BCR (ARC_REG_MCIP_BCR , mp); +if (!mp.gfrc) { +pr_warn ("Global-64-bit-Ctr clocksource not detected" );return -ENXIO ; + } ret =arc_get_timer_clk (node);if (ret)
@@ -163,15 +166,20 @@ static struct clocksource arc_counter_rtc = {static int __init arc_cs_setup_rtc (struct device_node *node) { -int exists = cpuinfo_arc700[smp_processor_id ()].extn.rtc; +struct bcr_timer timer;int ret; -if (WARN (!exists,"Local-64-bit-Ctr clocksource not detected" )) +READ_BCR (ARC_REG_TIMERS_BCR , timer); +if (!timer.rtc) { +pr_warn ("Local-64-bit-Ctr clocksource not detected" );return -ENXIO ; + }/* Local to CPU hence not usable in SMP */ -if (WARN (IS_ENABLED (CONFIG_SMP ),"Local-64-bit-Ctr not usable in SMP" )) +if (IS_ENABLED (CONFIG_SMP )) { +pr_warn ("Local-64-bit-Ctr not usable in SMP" );return -EINVAL ; + } ret =arc_get_timer_clk (node);if (ret)
Signature · 1 line
2.7.4
PATCH v3 4/10 ARC: timer: gfrc: boot print alongside other timers
In reply to Vineet Gupta--- arch/arc/kernel/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arc/kernel/setup.c +3 -3
@@ -234,11 +234,11 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)is_isa_arcompact () ?"ARCompact" :"ARCv2" , IS_AVAIL1(cpu->isa.be, "[Big-Endian]")); - n +=scnprintf (buf + n, len - n,"Timers\t\t: %s%s%s%s\nISA Extn\t: " , + n +=scnprintf (buf + n, len - n,"Timers\t\t: %s%s%s%s%s%s\nISA Extn\t: " ,IS_AVAIL1 (cpu->extn.timer0,"Timer0 " ),IS_AVAIL1 (cpu->extn.timer1,"Timer1 " ), -IS_AVAIL2 (cpu->extn.rtc,"Local-64-bit-Ctr " , -CONFIG_ARC_HAS_RTC )); +IS_AVAIL2 (cpu->extn.rtc,"RTC [UP 64-bit] " ,CONFIG_ARC_HAS_RTC ), +IS_AVAIL2 (cpu->extn.gfrc,"GFRC [SMP 64-bit] " ,CONFIG_ARC_HAS_GFRC )); n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s", IS_AVAIL2(cpu->isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),
Signature · 1 line
2.7.4
PATCH v3 5/10 ARC: time: move time_init() out of the driver
In reply to Vineet Guptato allow future git mv of the driver into drivers/clocksource
--- arch/arc/kernel/setup.c | 11 +++++++++++ arch/arc/kernel/time.c | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-)
arch/arc/kernel/setup.c +11 -0
@@ -10,6 +10,8 @@#include <linux/fs.h> #include <linux/delay.h> #include <linux/root_dev.h> +#include <linux/clk-provider.h> +#include <linux/clocksource.h> #include <linux/console.h> #include <linux/module.h> #include <linux/cpu.h>
@@ -449,6 +451,15 @@ void __init setup_arch(char **cmdline_p)arc_unwind_init (); } +/* +* Called from start_kernel() - boot CPU only +*/ +void __init time_init (void ) +{ +of_clk_init (NULL ); +clocksource_probe (); +} +static int __init customize_machine (void ) {if (machine_desc->init_machine)
arch/arc/kernel/time.c +0 -9
@@ -365,12 +365,3 @@ static int __init arc_of_timer_init(struct device_node *np)return ret; }CLOCKSOURCE_OF_DECLARE (arc_clkevt,"snps,arc-timer" , arc_of_timer_init); - -/* -* Called from start_kernel() - boot CPU only -*/ -void __init time_init (void ) -{ -of_clk_init (NULL ); -clocksource_probe (); -}
Signature · 1 line
2.7.4
PATCH v3 6/10 ARC: timer: Build gfrc, rtc under same option (64-bit timers)
In reply to Vineet GuptaThe original distinction was done as they were developed at different times and primarily because they are specific to UP (RTC) and SMP (GFRC).
But given that driver handles that at runtime, (i.e. not allowing RTC as clocksource in SMP), we can simplify things a bit.
--- arch/arc/Kconfig | 10 ++-------- arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- arch/arc/kernel/setup.c | 4 ++-- arch/arc/kernel/time.c | 6 +----- 5 files changed, 7 insertions(+), 17 deletions(-)
arch/arc/Kconfig +2 -8
@@ -410,15 +410,9 @@ config ARC_HAS_DIV_REM bool "Insn: div, divu, rem, remu" default y -config ARC_HAS_RTC - bool "Local 64-bit r/o cycle counter" - default n - depends on !SMP - -config ARC_HAS_GFRC - bool "SMP synchronized 64-bit cycle counter" +config ARC_TIMERS_64BIT + bool "64-bit r/o cycle counters RTC (up) and GFRC (smp)" default y - depends on SMP config ARC_NUMBER_OF_INTERRUPTS int "Number of interrupts"
arch/arc/configs/nsimosci_hs_smp_defconfig +1 -1
@@ -21,7 +21,7 @@ CONFIG_MODULES=y CONFIG_ARC_PLAT_SIM=y CONFIG_ISA_ARCV2=y CONFIG_SMP=y -# CONFIG_ARC_HAS_GFRC is not set +# CONFIG_ARC_TIMERS_64BIT is not set CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci_hs_idu" CONFIG_PREEMPT=y # CONFIG_COMPACTION is not set
arch/arc/configs/vdk_hs38_smp_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_ARC_PLAT_AXS10X=y CONFIG_AXS103=y CONFIG_ISA_ARCV2=y CONFIG_SMP=y -# CONFIG_ARC_HAS_GFRC is not set +# CONFIG_ARC_TIMERS_64BIT is not set CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp" CONFIG_PREEMPT=y
arch/arc/kernel/setup.c +2 -2
@@ -239,8 +239,8 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len) n +=scnprintf (buf + n, len - n,"Timers\t\t: %s%s%s%s%s%s\nISA Extn\t: " ,IS_AVAIL1 (cpu->extn.timer0,"Timer0 " ),IS_AVAIL1 (cpu->extn.timer1,"Timer1 " ), -IS_AVAIL2 (cpu->extn.rtc,"RTC [UP 64-bit] " ,CONFIG_ARC_HAS_RTC ), -IS_AVAIL2 (cpu->extn.gfrc,"GFRC [SMP 64-bit] " ,CONFIG_ARC_HAS_GFRC )); +IS_AVAIL2 (cpu->extn.rtc,"RTC [UP 64-bit] " ,CONFIG_ARC_TIMERS_64BIT ), +IS_AVAIL2 (cpu->extn.gfrc,"GFRC [SMP 64-bit] " ,CONFIG_ARC_TIMERS_64BIT )); n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s", IS_AVAIL2(cpu->isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),
arch/arc/kernel/time.c +1 -5
@@ -81,7 +81,7 @@ static int noinline arc_get_timer_clk(struct device_node *node)/********** Clock Source Device *********/ -#ifdef CONFIG_ARC_HAS_GFRC +#ifdef CONFIG_ARC_TIMERS_64BIT static cycle_t arc_read_gfrc (struct clocksource *cs) {
@@ -128,10 +128,6 @@ static int __init arc_cs_setup_gfrc(struct device_node *node) }CLOCKSOURCE_OF_DECLARE (arc_gfrc,"snps,archs-timer-gfrc" , arc_cs_setup_gfrc); -#endif - -#ifdef CONFIG_ARC_HAS_RTC -#define AUX_RTC_CTRL 0x103#define AUX_RTC_LOW 0x104#define AUX_RTC_HIGH 0x105
Signature · 1 line
2.7.4
PATCH v3 7/10 ARC: breakout aux handling into a separate header
In reply to Vineet GuptaARC timers use aux registers for programming and this paves way for moving ARC timer drivers into drivers/clocksource
--- arch/arc/include/asm/arcregs.h | 85 +----------------------------------------- arch/arc/include/asm/mcip.h | 2 +- include/soc/arc/aux.h | 63 +++++++++++++++++++++++++++++++ include/soc/nps/common.h | 4 +- 4 files changed, 67 insertions(+), 87 deletions(-) create mode 100644 include/soc/arc/aux.h
arch/arc/include/asm/arcregs.h +1 -84
@@ -110,90 +110,7 @@#ifndef __ASSEMBLY__ -/* -****************************************************************** -* Inline ASM macros to read/write AUX Regs -* Essentially invocation of lr/sr insns from "C" -*/ - -#if 1 - -#define read_aux_reg (reg) __builtin_arc_lr(reg) - -/* gcc builtin sr needs reg param to be long immediate */ -#define write_aux_reg (reg_immed, val) \ - __builtin_arc_sr((unsigned int)(val), reg_immed) - -#else - -#define read_aux_reg (reg) \ -({ \ - unsigned int __ret; \ - __asm__ __volatile__( \ - " lr %0, [%1]" \ - : "=r"(__ret) \ - : "i"(reg)); \ - __ret; \ -}) - -/* -* Aux Reg address is specified as long immediate by caller -* e.g. -* write_aux_reg(0x69, some_val); -* This generates tightest code. -*/ -#define write_aux_reg (reg_imm, val) \ -({ \ - __asm__ __volatile__( \ - " sr %0, [%1] \n" \ - : \ - : "ir"(val), "i"(reg_imm)); \ -}) - -/* -* Aux Reg address is specified in a variable -* * e.g. -* reg_num = 0x69 -* write_aux_reg2(reg_num, some_val); -* This has to generate glue code to load the reg num from -* memory to a reg hence not recommended. -*/ -#define write_aux_reg2 (reg_in_var, val) \ -({ \ - unsigned int tmp; \ - \ - __asm__ __volatile__( \ - " ld %0, [%2] \n\t" \ - " sr %1, [%0] \n\t" \ - : "=&r"(tmp) \ - : "r"(val), "memory"(®_in_var)); \ -}) - -#endif - -#define READ_BCR (reg, into) \ -{ \ - unsigned int tmp; \ - tmp = read_aux_reg(reg); \ - if (sizeof(tmp) == sizeof(into)) { \ - into = *((typeof(into) *)&tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} - -#define WRITE_AUX (reg, into) \ -{ \ - unsigned int tmp; \ - if (sizeof(tmp) == sizeof(into)) { \ - tmp = (*(unsigned int *)&(into)); \ - write_aux_reg(reg, tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} +#include <soc/arc/aux.h> /* Helpers */ #define TO_KB (bytes) ((bytes) >> 10)
arch/arc/include/asm/mcip.h +1 -1
@@ -13,7 +13,7 @@#ifdef CONFIG_ISA_ARCV2 -#include <asm/arcregs.h> +#include <soc/arc/aux.h> #define ARC_REG_MCIP_BCR 0x0d0#define ARC_REG_MCIP_CMD 0x600
include/soc/arc/aux.h new file +63 -0
63 lines not on this page · raw message
include/soc/nps/common.h +2 -2
@@ -47,6 +47,8 @@#ifndef __ASSEMBLY__ +#include <soc/arc/aux.h> +/* In order to increase compilation test coverage */ #ifdef CONFIG_ARC static inline void nps_ack_gic (void )
@@ -59,8 +61,6 @@ static inline void nps_ack_gic(void) }#else static inline void nps_ack_gic (void ) { } -#define write_aux_reg (r, v) -#define read_aux_reg (r) 0#endif /* CPU global ID */
Signature · 1 line
2.7.4
kbuild test robot
build botRe: [PATCH v3 07/10] ARC: breakout aux handling into a separate header
url: https://github.com/0day-ci/linux/commits/Vineet-Gupta/Move-ARC-timer-code-into-drivers-clocksource/20161104-074042 config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian…
Hi Vineet,
[auto build test ERROR on linus/master]
[also build test ERROR on v4.9-rc3 next-20161028]
[cannot apply to arc/for-next]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Vineet-Gupta/Move-ARC-timer-code-into-drivers-clocksource/20161104-074042
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=i386 All errors (new ones prefixed by >>):
drivers/irqchip/irq-eznps.c: In function 'nps400_irq_mask':
>> drivers/irqchip/irq-eznps.c:61:22: error: 'AUX_IENABLE' undeclared (first use in this function)
ienb = read_aux_reg(AUX_IENABLE);
^~~~~~~~~~~
drivers/irqchip/irq-eznps.c:61:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/irqchip/irq-eznps.c: In function 'nps400_irq_unmask':
drivers/irqchip/irq-eznps.c:71:22: error: 'AUX_IENABLE' undeclared (first use in this function)
ienb = read_aux_reg(AUX_IENABLE);
^~~~~~~~~~~
drivers/irqchip/irq-eznps.c: In function 'nps400_irq_eoi_global':
>> drivers/irqchip/irq-eznps.c:80:16: error: 'CTOP_AUX_IACK' undeclared (first use in this function)
write_aux_reg(CTOP_AUX_IACK, 1 << irq);
^~~~~~~~~~~~~
drivers/irqchip/irq-eznps.c: In function 'nps400_irq_ack':
drivers/irqchip/irq-eznps.c:92:16: error: 'CTOP_AUX_IACK' undeclared (first use in this function)
write_aux_reg(CTOP_AUX_IACK, 1 << irq);
^~~~~~~~~~~~~vim +/AUX_IENABLE +61 drivers/irqchip/irq-eznps.c
44df427c8 Noam Camus 2015-10-29 55
44df427c8 Noam Camus 2015-10-29 56 static void nps400_irq_mask(struct irq_data *irqd)
44df427c8 Noam Camus 2015-10-29 57 {
44df427c8 Noam Camus 2015-10-29 58 unsigned int ienb;
44df427c8 Noam Camus 2015-10-29 59 unsigned int irq = irqd_to_hwirq(irqd);
44df427c8 Noam Camus 2015-10-29 60
44df427c8 Noam Camus 2015-10-29 @61 ienb = read_aux_reg(AUX_IENABLE);
44df427c8 Noam Camus 2015-10-29 62 ienb &= ~(1 << irq);
44df427c8 Noam Camus 2015-10-29 63 write_aux_reg(AUX_IENABLE, ienb);
44df427c8 Noam Camus 2015-10-29 64 }
44df427c8 Noam Camus 2015-10-29 65
44df427c8 Noam Camus 2015-10-29 66 static void nps400_irq_unmask(struct irq_data *irqd)
44df427c8 Noam Camus 2015-10-29 67 {
44df427c8 Noam Camus 2015-10-29 68 unsigned int ienb;
44df427c8 Noam Camus 2015-10-29 69 unsigned int irq = irqd_to_hwirq(irqd);
44df427c8 Noam Camus 2015-10-29 70
44df427c8 Noam Camus 2015-10-29 71 ienb = read_aux_reg(AUX_IENABLE);
44df427c8 Noam Camus 2015-10-29 72 ienb |= (1 << irq);
44df427c8 Noam Camus 2015-10-29 73 write_aux_reg(AUX_IENABLE, ienb);
44df427c8 Noam Camus 2015-10-29 74 }
44df427c8 Noam Camus 2015-10-29 75
44df427c8 Noam Camus 2015-10-29 76 static void nps400_irq_eoi_global(struct irq_data *irqd)
44df427c8 Noam Camus 2015-10-29 77 {
44df427c8 Noam Camus 2015-10-29 78 unsigned int __maybe_unused irq = irqd_to_hwirq(irqd);
44df427c8 Noam Camus 2015-10-29 79
44df427c8 Noam Camus 2015-10-29 @80 write_aux_reg(CTOP_AUX_IACK, 1 << irq);
44df427c8 Noam Camus 2015-10-29 81
44df427c8 Noam Camus 2015-10-29 82 /* Don't ack GIC before all device access attempts are done */
44df427c8 Noam Camus 2015-10-29 83 mb();:::::: The code at line 61 was first introduced by commit
:::::: 44df427c894a4357e43bb35769baefa7cdf09833 irqchip: add nps Internal and external irqchips
:::::: TO: Noam Camus <noamc at ezchip.com>
:::::: CC: Vineet Gupta <vgupta at synopsys.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/gzip
Size: 56826 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-snps-arc/attachments/20161104/bddf77d4/attachment-0001.gz>
PATCH v4 7/10 ARC: breakout aux handling into a separate header
ARC timers use aux registers for programming and this paves way for moving ARC timer drivers into drivers/clocksource
---
v3 -> v4
- rolled back update of nps header to use the new aux header as that requires prior fixing.
--- arch/arc/include/asm/arcregs.h | 85 +----------------------------------------- arch/arc/include/asm/mcip.h | 2 +- include/soc/arc/aux.h | 63 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 85 deletions(-) create mode 100644 include/soc/arc/aux.h
arch/arc/include/asm/arcregs.h +1 -84
@@ -110,90 +110,7 @@#ifndef __ASSEMBLY__ -/* -****************************************************************** -* Inline ASM macros to read/write AUX Regs -* Essentially invocation of lr/sr insns from "C" -*/ - -#if 1 - -#define read_aux_reg (reg) __builtin_arc_lr(reg) - -/* gcc builtin sr needs reg param to be long immediate */ -#define write_aux_reg (reg_immed, val) \ - __builtin_arc_sr((unsigned int)(val), reg_immed) - -#else - -#define read_aux_reg (reg) \ -({ \ - unsigned int __ret; \ - __asm__ __volatile__( \ - " lr %0, [%1]" \ - : "=r"(__ret) \ - : "i"(reg)); \ - __ret; \ -}) - -/* -* Aux Reg address is specified as long immediate by caller -* e.g. -* write_aux_reg(0x69, some_val); -* This generates tightest code. -*/ -#define write_aux_reg (reg_imm, val) \ -({ \ - __asm__ __volatile__( \ - " sr %0, [%1] \n" \ - : \ - : "ir"(val), "i"(reg_imm)); \ -}) - -/* -* Aux Reg address is specified in a variable -* * e.g. -* reg_num = 0x69 -* write_aux_reg2(reg_num, some_val); -* This has to generate glue code to load the reg num from -* memory to a reg hence not recommended. -*/ -#define write_aux_reg2 (reg_in_var, val) \ -({ \ - unsigned int tmp; \ - \ - __asm__ __volatile__( \ - " ld %0, [%2] \n\t" \ - " sr %1, [%0] \n\t" \ - : "=&r"(tmp) \ - : "r"(val), "memory"(®_in_var)); \ -}) - -#endif - -#define READ_BCR (reg, into) \ -{ \ - unsigned int tmp; \ - tmp = read_aux_reg(reg); \ - if (sizeof(tmp) == sizeof(into)) { \ - into = *((typeof(into) *)&tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} - -#define WRITE_AUX (reg, into) \ -{ \ - unsigned int tmp; \ - if (sizeof(tmp) == sizeof(into)) { \ - tmp = (*(unsigned int *)&(into)); \ - write_aux_reg(reg, tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} +#include <soc/arc/aux.h> /* Helpers */ #define TO_KB (bytes) ((bytes) >> 10)
arch/arc/include/asm/mcip.h +1 -1
@@ -13,7 +13,7 @@#ifdef CONFIG_ISA_ARCV2 -#include <asm/arcregs.h> +#include <soc/arc/aux.h> #define ARC_REG_MCIP_BCR 0x0d0#define ARC_REG_MCIP_CMD 0x600
include/soc/arc/aux.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 7/10 ARC: breakout aux handling into a separate header
ARC timers use aux registers for programming and this paves way for moving ARC timer drivers into drivers/clocksource
---
v3 -> v4
- rolled back update of nps header to use the new aux header as that requires prior fixing.
--- arch/arc/include/asm/arcregs.h | 85 +----------------------------------------- arch/arc/include/asm/mcip.h | 2 +- include/soc/arc/aux.h | 63 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 85 deletions(-) create mode 100644 include/soc/arc/aux.h
arch/arc/include/asm/arcregs.h +1 -84
@@ -110,90 +110,7 @@#ifndef __ASSEMBLY__ -/* -****************************************************************** -* Inline ASM macros to read/write AUX Regs -* Essentially invocation of lr/sr insns from "C" -*/ - -#if 1 - -#define read_aux_reg (reg) __builtin_arc_lr(reg) - -/* gcc builtin sr needs reg param to be long immediate */ -#define write_aux_reg (reg_immed, val) \ - __builtin_arc_sr((unsigned int)(val), reg_immed) - -#else - -#define read_aux_reg (reg) \ -({ \ - unsigned int __ret; \ - __asm__ __volatile__( \ - " lr %0, [%1]" \ - : "=r"(__ret) \ - : "i"(reg)); \ - __ret; \ -}) - -/* -* Aux Reg address is specified as long immediate by caller -* e.g. -* write_aux_reg(0x69, some_val); -* This generates tightest code. -*/ -#define write_aux_reg (reg_imm, val) \ -({ \ - __asm__ __volatile__( \ - " sr %0, [%1] \n" \ - : \ - : "ir"(val), "i"(reg_imm)); \ -}) - -/* -* Aux Reg address is specified in a variable -* * e.g. -* reg_num = 0x69 -* write_aux_reg2(reg_num, some_val); -* This has to generate glue code to load the reg num from -* memory to a reg hence not recommended. -*/ -#define write_aux_reg2 (reg_in_var, val) \ -({ \ - unsigned int tmp; \ - \ - __asm__ __volatile__( \ - " ld %0, [%2] \n\t" \ - " sr %1, [%0] \n\t" \ - : "=&r"(tmp) \ - : "r"(val), "memory"(®_in_var)); \ -}) - -#endif - -#define READ_BCR (reg, into) \ -{ \ - unsigned int tmp; \ - tmp = read_aux_reg(reg); \ - if (sizeof(tmp) == sizeof(into)) { \ - into = *((typeof(into) *)&tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} - -#define WRITE_AUX (reg, into) \ -{ \ - unsigned int tmp; \ - if (sizeof(tmp) == sizeof(into)) { \ - tmp = (*(unsigned int *)&(into)); \ - write_aux_reg(reg, tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} +#include <soc/arc/aux.h> /* Helpers */ #define TO_KB (bytes) ((bytes) >> 10)
arch/arc/include/asm/mcip.h +1 -1
@@ -13,7 +13,7 @@#ifdef CONFIG_ISA_ARCV2 -#include <asm/arcregs.h> +#include <soc/arc/aux.h> #define ARC_REG_MCIP_BCR 0x0d0#define ARC_REG_MCIP_CMD 0x600
include/soc/arc/aux.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH v3 07/10] ARC: breakout aux handling into a separate header
In reply to Vineet GuptaQuoted 195 lines · Vineet Gupta
ARC timers use aux registers for programming and this paves way for moving ARC timer drivers into
drivers/clocksourceSigned-off-by Vineet Gupta <vgupta at synopsys.com>--- arch/arc/include/asm/arcregs.h | 85 +----------------------------------------- arch/arc/include/asm/mcip.h | 2 +- include/soc/arc/aux.h | 63 +++++++++++++++++++++++++++++++ include/soc/nps/common.h | 4 +- 4 files changed, 67 insertions(+), 87 deletions(-) create mode 100644 include/soc/arc/aux.harch/arc/include/asm/arcregs.h +1
-84@@ -110,90 +110,7 @@#ifndef __ASSEMBLY__ -/* -****************************************************************** -* Inline ASM macros to read/write AUX Regs -* Essentially invocation of lr/sr insns from "C" -*/ - -#if 1 - -#define read_aux_reg (reg) __builtin_arc_lr(reg) - -/* gcc builtin sr needs reg param to be long immediate */ -#define write_aux_reg (reg_immed, val) \ - __builtin_arc_sr((unsigned int)(val), reg_immed) - -#else - -#define read_aux_reg (reg) \ -({ \ - unsigned int __ret; \ - __asm__ __volatile__( \ - " lr %0, [%1]" \ - : "=r"(__ret) \ - : "i"(reg)); \ - __ret; \ -}) - -/* -* Aux Reg address is specified as long immediate by caller -* e.g. -* write_aux_reg(0x69, some_val); -* This generates tightest code. -*/ -#define write_aux_reg (reg_imm, val) \ -({ \ - __asm__ __volatile__( \ - " sr %0, [%1] \n" \ - : \ - : "ir"(val), "i"(reg_imm)); \ -}) - -/* -* Aux Reg address is specified in a variable -* * e.g. -* reg_num = 0x69 -* write_aux_reg2(reg_num, some_val); -* This has to generate glue code to load the reg num from -* memory to a reg hence not recommended. -*/ -#define write_aux_reg2 (reg_in_var, val) \ -({ \ - unsigned int tmp; \ - \ - __asm__ __volatile__( \ - " ld %0, [%2] \n\t" \ - " sr %1, [%0] \n\t" \ - : "=&r"(tmp) \ - : "r"(val), "memory"(®_in_var)); \ -}) - -#endif - -#define READ_BCR (reg, into) \ -{ \ - unsigned int tmp; \ - tmp = read_aux_reg(reg); \ - if (sizeof(tmp) == sizeof(into)) { \ - into = *((typeof(into) *)&tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} - -#define WRITE_AUX (reg, into) \ -{ \ - unsigned int tmp; \ - if (sizeof(tmp) == sizeof(into)) { \ - tmp = (*(unsigned int *)&(into)); \ - write_aux_reg(reg, tmp); \ - } else { \ - extern void bogus_undefined(void); \ - bogus_undefined(); \ - } \ -} +#include <soc/arc/aux.h> /* Helpers */ #define TO_KB (bytes) ((bytes) >> 10)arch/arc/include/asm/mcip.h +1
-1@@ -13,7 +13,7 @@#ifdef CONFIG_ISA_ARCV2 -#include <asm/arcregs.h> +#include <soc/arc/aux.h> #define ARC_REG_MCIP_BCR 0x0d0#define ARC_REG_MCIP_CMD 0x600include/soc/arc/aux.h new file +63
-0@@ -0,0 +1,63 @@ +/* +* Copyright (C) 2016-2017 Synopsys, Inc. (www.synopsys.com) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#ifndef __SOC_ARC_AUX_H__ +#define __SOC_ARC_AUX_H__ + +#ifdef CONFIG_ARC + +#define read_aux_reg (r) __builtin_arc_lr(r) + +/* gcc builtin sr needs reg param to be long immediate */ +#define write_aux_reg (r, v) __builtin_arc_sr((unsigned int)(v), r) + +#else /* !CONFIG_ARC */ + +static inline int read_aux_reg (u32 r) +{ +return 0 ; +} + +/* +* function helps elide unused variable warning +* see: http://lists.infradead.org/pipermail/linux-snps-arc/2016-November/001748.html +*/ +static inline void write_aux_reg (u32 r,u32 v) +{ + ; +} + +#endif + +#define READ_BCR (reg, into) \ +{ \ + unsigned int tmp; \ + tmp = read_aux_reg(reg); \ + if (sizeof(tmp) == sizeof(into)) { \ + into = *((typeof(into) *)&tmp); \ + } else { \ + extern void bogus_undefined(void); \ + bogus_undefined(); \ + } \ +} + +#define WRITE_AUX (reg, into) \ +{ \ + unsigned int tmp; \ + if (sizeof(tmp) == sizeof(into)) { \ + tmp = (*(unsigned int *)&(into)); \ + write_aux_reg(reg, tmp); \ + } else { \ + extern void bogus_undefined(void); \ + bogus_undefined(); \ + } \ +} + + +#endif include/soc/nps/common.h +0
-0
include/soc/nps/common.h line 51
Quoted 5 lines
include/soc/nps/common.h +2
-0@@ -47,6 +47,8 @@#ifndef __ASSEMBLY__ +#include <soc/arc/aux.h> +
So looks like the usage of inline function stub unearthed a small issue in nps irqchip driver. I think for now I would back out the change above nand fix the irqchip first before switching over to this header - OK ?
Quoted 13 lines
include/soc/nps/common.h +0
-2/* In order to increase compilation test coverage */ #ifdef CONFIG_ARC static inline void nps_ack_gic (void )@@ -59,8 +61,6 @@ static inline void nps_ack_gic(void) }#else static inline void nps_ack_gic (void ) { } -#define write_aux_reg (r, v) -#define read_aux_reg (r) 0#endif /* CPU global ID */
PATCH v3 8/10 ARC: move mcip.h into include/soc and adjust the includes
In reply to Vineet GuptaAlso remove the dependency on ARCv2, to increase compile coverage for !ARCV2 builds
---
arch/arc/kernel/mcip.c | 2 +-
arch/arc/kernel/time.c | 2 +-
arch/arc/plat-axs10x/axs10x.c | 2 +-
{arch/arc/include/asm => include/soc/arc}/mcip.h | 8 ++------
4 files changed, 5 insertions(+), 9 deletions(-)
rename {arch/arc/include/asm => include/soc/arc}/mcip.h (96%)arch/arc/kernel/mcip.c +1 -1
@@ -11,8 +11,8 @@#include <linux/smp.h> #include <linux/irq.h> #include <linux/spinlock.h> +#include <soc/arc/mcip.h> #include <asm/irqflags-arcv2.h> -#include <asm/mcip.h> #include <asm/setup.h> static DEFINE_RAW_SPINLOCK (mcip_lock);
arch/arc/kernel/time.c +1 -1
@@ -40,7 +40,7 @@#include <asm/irq.h> #include <asm/arcregs.h> -#include <asm/mcip.h> +#include <soc/arc/mcip.h> /* Timer related Aux registers */ #define ARC_REG_TIMER0_LIMIT 0x23/* timer 0 limit */
arch/arc/plat-axs10x/axs10x.c +1 -1
@@ -21,7 +21,7 @@#include <asm/asm-offsets.h> #include <asm/io.h> #include <asm/mach_desc.h> -#include <asm/mcip.h> +#include <soc/arc/mcip.h> #define AXS_MB_CGU 0xE0010000#define AXS_MB_CREG 0xE0011000
include/soc/arc/mcip.h renamed from arch/arc/include/asm/mcip.h +2 -6
@@ -8,10 +8,8 @@* published by the Free Software Foundation. */ -#ifndef __ASM_MCIP_H -#define __ASM_MCIP_H - -#ifdef CONFIG_ISA_ARCV2 +#ifndef __SOC_ARC_MCIP_H +#define __SOC_ARC_MCIP_H#include <soc/arc/aux.h>
@@ -103,5 +101,3 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param, }#endif - -#endif
Signature · 1 line
2.7.4
PATCH v3 9/10 ARC: breakout timer include code into separate header ...
In reply to Vineet Gupta... which allows for use in drivers/clocksource later
--- arch/arc/include/asm/arcregs.h | 9 +-------- arch/arc/kernel/time.c | 18 +++--------------- include/soc/arc/timers.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 include/soc/arc/timers.h
arch/arc/include/asm/arcregs.h +1 -8
@@ -20,7 +20,6 @@#define ARC_REG_FP_V2_BCR 0xc8/* ARCv2 FPU */ #define ARC_REG_SLC_BCR 0xce#define ARC_REG_DCCM_BUILD 0x74/* DCCM size (common) */ -#define ARC_REG_TIMERS_BCR 0x75#define ARC_REG_AP_BCR 0x76#define ARC_REG_ICCM_BUILD 0x78/* ICCM size (common) */ #define ARC_REG_XY_MEM_BCR 0x79
@@ -206,13 +205,7 @@ struct bcr_fp_arcv2 {#endif }; -struct bcr_timer { -#ifdef CONFIG_CPU_BIG_ENDIAN -unsigned int pad2:15 , rtsc:1 , pad1:5 , rtc:1 , t1:1 , t0:1 , ver:8 ; -#else -unsigned int ver:8 , t0:1 , t1:1 , rtc:1 , pad1:5 , rtsc:1 , pad2:15 ; -#endif -}; +#include <soc/arc/timers.h> struct bcr_bpu_arcompact {#ifdef CONFIG_CPU_BIG_ENDIAN
arch/arc/kernel/time.c +3 -15
@@ -38,22 +38,10 @@#include <linux/of.h> #include <linux/of_irq.h> #include <asm/irq.h> -#include <asm/arcregs.h> +#include <soc/arc/timers.h> #include <soc/arc/mcip.h> -/* Timer related Aux registers */ -#define ARC_REG_TIMER0_LIMIT 0x23/* timer 0 limit */ -#define ARC_REG_TIMER0_CTRL 0x22/* timer 0 control */ -#define ARC_REG_TIMER0_CNT 0x21/* timer 0 count */ -#define ARC_REG_TIMER1_LIMIT 0x102/* timer 1 limit */ -#define ARC_REG_TIMER1_CTRL 0x101/* timer 1 control */ -#define ARC_REG_TIMER1_CNT 0x100/* timer 1 count */ - -#define TIMER_CTRL_IE (1 << 0)/* Interrupt when Count reaches limit */ -#define TIMER_CTRL_NH (1 << 1)/* Count only when CPU NOT halted */ - -#define ARC_TIMER_MAX 0xFFFFFFFFstatic unsigned long arc_timer_freq;
@@ -218,7 +206,7 @@ static int __init arc_cs_setup_timer1(struct device_node *node)if (ret)return ret; -write_aux_reg (ARC_REG_TIMER1_LIMIT ,ARC_TIMER_MAX ); +write_aux_reg (ARC_REG_TIMER1_LIMIT ,ARC_TIMERN_MAX );write_aux_reg (ARC_REG_TIMER1_CNT ,0 );write_aux_reg (ARC_REG_TIMER1_CTRL ,TIMER_CTRL_NH );
@@ -296,7 +284,7 @@ static int arc_timer_starting_cpu(unsigned int cpu) evt->cpumask =cpumask_of (smp_processor_id ()); -clockevents_config_and_register (evt, arc_timer_freq,0 ,ARC_TIMER_MAX ); +clockevents_config_and_register (evt, arc_timer_freq,0 ,ARC_TIMERN_MAX );enable_percpu_irq (arc_timer_irq,0 );return 0 ; }
include/soc/arc/timers.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright (C) 2016-17 Synopsys, Inc. (www.synopsys.com) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __SOC_ARC_TIMERS_H +#define __SOC_ARC_TIMERS_H + +#include <soc/arc/aux.h> + +/* Timer related Aux registers */ +#define ARC_REG_TIMER0_LIMIT 0x23/* timer 0 limit */ +#define ARC_REG_TIMER0_CTRL 0x22/* timer 0 control */ +#define ARC_REG_TIMER0_CNT 0x21/* timer 0 count */ +#define ARC_REG_TIMER1_LIMIT 0x102/* timer 1 limit */ +#define ARC_REG_TIMER1_CTRL 0x101/* timer 1 control */ +#define ARC_REG_TIMER1_CNT 0x100/* timer 1 count */ + +/* CTRL reg bits */ +#define TIMER_CTRL_IE (1 << 0)/* Interrupt when Count reaches limit */ +#define TIMER_CTRL_NH (1 << 1)/* Count only when CPU NOT halted */ + +#define ARC_TIMERN_MAX 0xFFFFFFFF + +#define ARC_REG_TIMERS_BCR 0x75 + +struct bcr_timer { +#ifdef CONFIG_CPU_BIG_ENDIAN +unsigned int pad2:15 , rtsc:1 , pad1:5 , rtc:1 , t1:1 , t0:1 , ver:8 ; +#else +unsigned int ver:8 , t0:1 , t1:1 , rtc:1 , pad1:5 , rtsc:1 , pad2:15 ; +#endif +}; + +#endif
Signature · 1 line
2.7.4
PATCH v3 10/10 clocksource: import ARC timer driver
In reply to Vineet GuptaThis adds support for
- CONFIG_ARC_TIMERS : legacy 32-bit TIMER0 and TIMER1 which count UP from @CNT to @LIMIT, before optionally triggering an interrupt. These are programmed using ARC auxiliary register interface. These are present in all ARC cores (ARC700 and ARC HS38) TIMER0 serves as clockevent for all ARC linux builds. TIMER1 is used for clocksource in arc700 builds.
- CONFIG_ARC_TIMERS_64BIT: 64-bit counters, RTC and GFRC found in ARC HS38 cores. These are independnet IP blocks with different programming model respectively.
--- MAINTAINERS | 1 + arch/arc/Kconfig | 7 ++---- arch/arc/kernel/Makefile | 2 +- drivers/clocksource/Kconfig | 19 +++++++++++++++ drivers/clocksource/Makefile | 1 + .../time.c => drivers/clocksource/arc_timer.c | 27 +++++----------------- 6 files changed, 30 insertions(+), 27 deletions(-) rename arch/arc/kernel/time.c => drivers/clocksource/arc_timer.c (90%)
MAINTAINERS +1 -0
@@ -11632,6 +11632,7 @@ S: Supported F: arch/arc/ F: Documentation/devicetree/bindings/arc/* F: Documentation/devicetree/bindings/interrupt-controller/snps,arc* +F: drivers/clocksource/arc_timer.c F: drivers/tty/serial/arc_uart.c T: git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
arch/arc/Kconfig +2 -5
@@ -8,9 +8,9 @@ config ARC def_bool y + select ARC_TIMERS select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC select BUILDTIME_EXTABLE_SORT - select CLKSRC_OF select CLONE_BACKWARDS select COMMON_CLK select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)
@@ -115,6 +115,7 @@ config ISA_ARCOMPACT config ISA_ARCV2 bool "ARC ISA v2" + select ARC_TIMERS_64BIT help ISA for the Next Generation ARC-HS cores
@@ -410,10 +411,6 @@ config ARC_HAS_DIV_REM bool "Insn: div, divu, rem, remu" default y -config ARC_TIMERS_64BIT - bool "64-bit r/o cycle counters RTC (up) and GFRC (smp)" - default y - config ARC_NUMBER_OF_INTERRUPTS int "Number of interrupts" range 8 240
arch/arc/kernel/Makefile +1 -1
@@ -8,7 +8,7 @@ # Pass UTS_MACHINE for user_regset definition CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -obj-y := arcksyms.o setup.o irq.o time.o reset.o ptrace.o process.o devtree.o +obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o obj-$(CONFIG_ISA_ARCV2) += entry-arcv2.o intc-arcv2.o
drivers/clocksource/Kconfig +19 -0
@@ -282,6 +282,25 @@ config CLKSRC_MPS2 select CLKSRC_MMIO select CLKSRC_OF +config ARC_TIMERS + bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + select CLKSRC_OF + help + These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores + (ARC700 as well as ARC HS38). + TIMER0 serves as clockevent while TIMER1 provides clocksource + +config ARC_TIMERS_64BIT + bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + select CLKSRC_OF + help + This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP) + RTC is implemented inside the core, while GFRC sits outside the core in + ARConnect IP block. Driver automatically picks one of them for clocksource + as appropriate. + config ARM_ARCH_TIMER bool select CLKSRC_OF if OF
drivers/clocksource/Makefile +1 -0
@@ -51,6 +51,7 @@ obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o obj-$(CONFIG_CLKSRC_NPS) += timer-nps.o obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o +obj-$(CONFIG_ARC_TIMERS) += arc_timer.o obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.o obj-$(CONFIG_ARMV7M_SYSTICK) += armv7m_systick.o
drivers/clocksource/arc_timer.c renamed from arch/arc/kernel/time.c +6 -21
@@ -1,32 +1,18 @@/* +* Copyright (C) 2016-17 Synopsys, Inc. (www.synopsys.com) * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. -* -* vineetg: Jan 1011 -* -sched_clock( ) no longer jiffies based. Uses the same clocksource -* as gtod -* -* Rajeshwarr/Vineetg: Mar 2008 -* -Implemented CONFIG_GENERIC_TIME (rather deleted arch specific code) -* for arch independent gettimeofday() -* -Implemented CONFIG_GENERIC_CLOCKEVENTS as base for hrtimers -* -* Vineetg: Mar 2008: Forked off from time.c which now is time-jiff.c */ -/* ARC700 has two 32bit independent prog Timers: TIMER0 and TIMER1 -* Each can programmed to go from @count to @limit and optionally -* interrupt when that happens. -* A write to Control Register clears the Interrupt -* -* We've designated TIMER0 for events (clockevents) -* while TIMER1 for free running (clocksource) +/* ARC700 has two 32bit independent prog Timers: TIMER0 and TIMER1, Each can be +* programmed to go from @count to @limit and optionally interrupt. +* We've designated TIMER0 for clockevents and TIMER1 for clocksource * -* Newer ARC700 cores have 64bit clk fetching RTSC insn, preferred over TIMER1 -* which however is currently broken +* ARCv2 based HS38 cores have RTC (in-core) and GFRC (inside ARConnect/MCIP) +* which are suitable for UP and SMP based clocksources respectively */ #include <linux/interrupt.h>
@@ -37,7 +23,6 @@#include <linux/cpu.h> #include <linux/of.h> #include <linux/of_irq.h> -#include <asm/irq.h> #include <soc/arc/timers.h> #include <soc/arc/mcip.h>
Signature · 1 line
2.7.4
Re: [PATCH v3 10/10] clocksource: import ARC timer driver
Quoted 15 lines · Vineet Gupta
This adds support for
-
CONFIG_ARC_TIMERS: legacy 32-bit TIMER0 and TIMER1 which count UP from @CNT to @LIMIT, before optionally triggering an interrupt. These are programmed using ARC auxiliary register interface. These are present in all ARC cores (ARC700 and ARC HS38) TIMER0 serves as clockevent for all ARC linux builds. TIMER1 is used for clocksource in arc700 builds.-
CONFIG_ARC_TIMERS_64BIT: 64-bit counters, RTC and GFRC found in ARC HS38 cores. These are independnet IP blocks with different programming model respectively.Signed-off-by Vineet Gupta <vgupta at synopsys.com>---
[ ... ]
Quoted 76 lines
config ARC
arch/arc/Kconfig +2
-5def_bool y + select ARC_TIMERS select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC select BUILDTIME_EXTABLE_SORT - select CLKSRC_OF select CLONE_BACKWARDS select COMMON_CLK select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)@@ -115,6 +115,7 @@ config ISA_ARCOMPACT config ISA_ARCV2 bool "ARC ISA v2" + select ARC_TIMERS_64BIT help ISA for the Next Generation ARC-HS cores@@ -410,10 +411,6 @@ config ARC_HAS_DIV_REM bool "Insn: div, divu, rem, remu" default y -config ARC_TIMERS_64BIT - bool "64-bit r/o cycle counters RTC (up) and GFRC (smp)" - default y - config ARC_NUMBER_OF_INTERRUPTS int "Number of interrupts" range 8 240arch/arc/kernel/Makefile +1
-1@@ -8,7 +8,7 @@ # Pass UTS_MACHINE for user_regset definition CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -obj-y := arcksyms.o setup.o irq.o time.o reset.o ptrace.o process.o devtree.o +obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o obj-$(CONFIG_ISA_ARCV2) += entry-arcv2.o intc-arcv2.odrivers/clocksource/Kconfig +19
-0@@ -282,6 +282,25 @@ config CLKSRC_MPS2 select CLKSRC_MMIO select CLKSRC_OF +config ARC_TIMERS + bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + select CLKSRC_OF + help + These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores + (ARC700 as well as ARC HS38). + TIMER0 serves as clockevent while TIMER1 provides clocksource + +config ARC_TIMERS_64BIT + bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + select CLKSRC_OF + help + This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP) + RTC is implemented inside the core, while GFRC sits outside the core in + ARConnect IP block. Driver automatically picks one of them for clocksource + as appropriate. + config ARM_ARCH_TIMER bool select CLKSRC_OF if OFdrivers/clocksource/Makefile +0
-0
drivers/clocksource/Makefile obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o · line 54
Quoted 4 lines
drivers/clocksource/Makefile +1
-0@@ -51,6 +51,7 @@ obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o obj-$(CONFIG_CLKSRC_NPS) += timer-nps.o obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o +obj-$(CONFIG_ARC_TIMERS) += arc_timer.o
I don't see arc_timer.o compiled if ARC_TIMERS_64BIT only is set.
Wouldn't make sense to fold ARC_TIMERS and ARC_TIMERS_64BIT ?
Re: [PATCH v3 10/10] clocksource: import ARC timer driver
Quoted 98 lines · Daniel Lezcano
Quoted 15 lines · Vineet Gupta
This adds support for
-
CONFIG_ARC_TIMERS: legacy 32-bit TIMER0 and TIMER1 which count UP from @CNT to @LIMIT, before optionally triggering an interrupt. These are programmed using ARC auxiliary register interface. These are present in all ARC cores (ARC700 and ARC HS38) TIMER0 serves as clockevent for all ARC linux builds. TIMER1 is used for clocksource in arc700 builds.-
CONFIG_ARC_TIMERS_64BIT: 64-bit counters, RTC and GFRC found in ARC HS38 cores. These are independnet IP blocks with different programming model respectively.Signed-off-by Vineet Gupta <vgupta at synopsys.com>---
[ ... ]
Quoted 79 lines
config ARC
arch/arc/Kconfig +2
-5def_bool y + select ARC_TIMERS select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC select BUILDTIME_EXTABLE_SORT - select CLKSRC_OF select CLONE_BACKWARDS select COMMON_CLK select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)@@ -115,6 +115,7 @@ config ISA_ARCOMPACT config ISA_ARCV2 bool "ARC ISA v2" + select ARC_TIMERS_64BIT help ISA for the Next Generation ARC-HS cores@@ -410,10 +411,6 @@ config ARC_HAS_DIV_REM bool "Insn: div, divu, rem, remu" default y -config ARC_TIMERS_64BIT - bool "64-bit r/o cycle counters RTC (up) and GFRC (smp)" - default y - config ARC_NUMBER_OF_INTERRUPTS int "Number of interrupts" range 8 240arch/arc/kernel/Makefile +1
-1@@ -8,7 +8,7 @@ # Pass UTS_MACHINE for user_regset definition CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -obj-y := arcksyms.o setup.o irq.o time.o reset.o ptrace.o process.o devtree.o +obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o obj-$(CONFIG_ISA_ARCV2) += entry-arcv2.o intc-arcv2.odrivers/clocksource/Kconfig +19
-0@@ -282,6 +282,25 @@ config CLKSRC_MPS2 select CLKSRC_MMIO select CLKSRC_OF +config ARC_TIMERS + bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + select CLKSRC_OF + help + These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores + (ARC700 as well as ARC HS38). + TIMER0 serves as clockevent while TIMER1 provides clocksource + +config ARC_TIMERS_64BIT + bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + select CLKSRC_OF + help + This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP) + RTC is implemented inside the core, while GFRC sits outside the core in + ARConnect IP block. Driver automatically picks one of them for clocksource + as appropriate. + config ARM_ARCH_TIMER bool select CLKSRC_OF if OFdrivers/clocksource/Makefile +0
-0@@ -51,6 +51,7 @@ obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o obj-$(CONFIG_CLKSRC_NPS) += timer-nps.o obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o
Quoted 7 lines
drivers/clocksource/Makefile obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o · line 54
Quoted 1 line
drivers/clocksource/Makefile +1
-0+obj-$(CONFIG_ARC_TIMERS) += arc_timer.oI don't see arc_timer.o compiled if
ARC_TIMERS_64BITonly is set.Wouldn't make sense to fold
ARC_TIMERSandARC_TIMERS_64BIT?From ARC point of view that would be an invalid configuration as the base TIMER0
is set up as clockevent in all configurations and cores and is needed independent of 64 timers being there or not. So better to add that as explicit dependency here which would also address the build issue you raise.
Thx,
-Vineet
Quoted 65 lines · Vineet Gupta
Hi,
This series addresses the long pending move of ARC timer code into
drivers/clocksource/.Thx,
-Vineetv2 -> v3
- Fixed a bunch of typos in changelogs [Daniel]
-
aux.h: stubs for {read,write}_aux_reg() inline functions(vs. macros)
to cleanly avoid warnings in !ARC builds [Daniel]- Remove
__maybe_usedin driver given above [Daniel]- Ran checkpatch and fixed some space/tab issues
v1 -> v2
- Now 10 patches instead of 9 to handle BIG ENDIAN in arch agnostic way
- Moved fix for RTC (v1 2/9) ahead of queue (v2 1/10) to allow for easier stable backport
- Folded the
Kconfigitems for RTC and GFRC into singleARC_TIMERS_64BITSo no special casing for UP/SMP inKconfig.
Driver already handles the UP vs. SMP at runtime as needed- convert
WARN()topr_warn()[Daniel]
- Use of_BITUL()vs. constant 0x8000_0000 [Daniel]
- changelog spellos: [Daniel]
s/depedency/dependency/
s/seperate/separate/v2: http://lists.infradead.org/pipermail/linux-snps-arc/2016-November/001724.html
v1: http://lists.infradead.org/pipermail/linux-snps-arc/2016-October/001676.htmlVineet Gupta (10):
ARC: timer: rtc: implement read loop in "C" vs. inline asm
ARC: timer: gfrc, rtc: deuglify big endian code
ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ...
ARC: timer: gfrc: boot print alongside other timers
ARC: time: movetime_init()out of the driver
ARC: timer: Build gfrc, rtc under same option (64-bit timers)
ARC: breakout aux handling into a separate header
ARC: movemcip.hintoinclude/socand adjust the includes
ARC: breakout timer include code into separate header ...
clocksource: import ARC timer driverMAINTAINERS | 1 + arch/arc/Kconfig | 13 +-- arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- arch/arc/include/asm/arcregs.h | 94 +--------------- arch/arc/kernel/Makefile | 2 +- arch/arc/kernel/mcip.c | 2 +- arch/arc/kernel/setup.c | 17 ++- arch/arc/plat-axs10x/axs10x.c | 2 +- drivers/clocksource/Kconfig | 19 ++++ drivers/clocksource/Makefile | 1 + .../time.c => drivers/clocksource/arc_timer.c | 125 +++++++-------------- include/soc/arc/aux.h | 63 +++++++++++
Quoted 9 lines
{arch/arc/include/asm => include/soc/arc}/mcip.h | 10 +-
include/soc/arc/timers.h | 38 +++++++
include/soc/nps/common.h | 4 +-
16 files changed, 191 insertions(+), 204 deletions(-)
rename arch/arc/kernel/time.c => drivers/clocksource/arc_timer.c (72%)
create mode 100644 include/soc/arc/aux.h
rename {arch/arc/include/asm => include/soc/arc}/mcip.h (95%)
create mode 100644 include/soc/arc/timers.hGentle ping. @Daniel can we please try to get closure on this sometime this week. I've sent a fixup (patch v4) for the build failure reported by o-dat test robot.
Thx,
-Vineet