Skip to contentSkip to conversation

ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register

PATCH New Sricharan R 3 participants 5 messages Oct 10, 2013 – Oct 12, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register

From: R Sricharan <[email protected]>

The realtime counter called master counter, produces the count used by the private timer peripherals in the MPU_CLUSTER. The CNTFRQ per cpu register is used to denote the frequency of the counter. Currently the frequency value is passed from the
DT file, but this is not scalable when we have other non-DT guest OS. This register must be set to the right value by the secure rom code. Setting this register helps in propagating the right frequency value across OSes.

More discussions and the reason for adding this in a non-DT way can be seen from below.
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg93832.html

So configuring this secure register for all the cpus here.

Cc Santosh Shilimkar <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Rajendra Nayak <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Tony Lindgren <[email protected]>

---
[V5] Removed the use of extern variable in omap-smp.c
as per suggestion from Santosh Shilimkar <[email protected]>

 arch/arm/mach-omap2/omap-secure.h |    4 ++++
 arch/arm/mach-omap2/omap-smp.c    |    7 +++++++
 arch/arm/mach-omap2/timer.c       |   10 ++++++++++
 3 files changed, 21 insertions(+)
arch/arm/mach-omap2/omap-secure.h +4 -0
index 0e72917..a5ee09d 100644
@@ -42,6 +42,8 @@
 #define OMAP4_MON_L2X0_AUXCTRL_INDEX	0x109
 #define OMAP4_MON_L2X0_PREFETCH_INDEX	0x113
 
+#define OMAP5_DRA7_MON_SET_CNTFRQ_INDEX	0x109
+
 /* Secure PPA(Primary Protected Application) APIs */
 #define OMAP4_PPA_L2_POR_INDEX		0x23
 #define OMAP4_PPA_CPU_ACTRL_SMP_INDEX	0x25
@@ -60,5 +62,7 @@ extern int omap_barrier_reserve_memblock(void);
 static inline void omap_barrier_reserve_memblock(void)
 { }
 #endif
+
+void set_cntfreq(void);
 #endif /* __ASSEMBLER__ */
 #endif /* OMAP_ARCH_OMAP_SECURE_H */
arch/arm/mach-omap2/omap-smp.c +7 -0
index 22c3129..b1c6e5d 100644
@@ -78,6 +78,13 @@ static void omap4_secondary_init(unsigned int cpu)
 							4, 0, 0, 0, 0, 0);
 
 	/*
+	 * Configure the CNTFRQ register for the secondary cpu's which
+	 * indicates the frequency of the cpu local timers.
+	 */
+	if (soc_is_omap54xx() || soc_is_dra7xx())
+		set_cntfreq();
+
+	/*
 	 * Synchronise with the boot thread.
 	 */
 	spin_lock(&boot_lock);
arch/arm/mach-omap2/timer.c +10 -0
index fa74a06..60df58a 100644
@@ -55,6 +55,7 @@
 #include "soc.h"
 #include "common.h"
 #include "powerdomain.h"
+#include "omap-secure.h"
 
 #define REALTIME_COUNTER_BASE				0x48243200
 #define INCREMENTER_NUMERATOR_OFFSET			0x10
@@ -65,6 +66,12 @@
 
 static struct omap_dm_timer clkev;
 static struct clock_event_device clockevent_gpt;
+static unsigned long arch_timer_freq;
+
+void set_cntfreq(void)
+{
+	omap_smc1(OMAP5_DRA7_MON_SET_CNTFRQ_INDEX, arch_timer_freq);
+}
 
 static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
 {
@@ -542,6 +549,9 @@ static void __init realtime_counter_init(void)
 	reg |= den;
 	__raw_writel(reg, base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET);
 
+	arch_timer_freq = (rate / den) * num;
+	set_cntfreq();
+
 	iounmap(base);
 }
 #else
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v5 1/1 ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register

Quoted 26 lines · Sricharan R

From: R Sricharan <[email protected]>

The realtime counter called master counter, produces the count used by the private timer peripherals in the MPU_CLUSTER. The CNTFRQ per cpu register is used to denote the frequency of the counter. Currently the frequency value is passed from the
DT file, but this is not scalable when we have other non-DT guest OS. This register must be set to the right value by the secure rom code. Setting this register helps in propagating the right frequency value across OSes.

More discussions and the reason for adding this in a non-DT way can be seen from below.
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg93832.html

So configuring this secure register for all the cpus here.

Cc Santosh Shilimkar <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Rajendra Nayak <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Tony Lindgren <[email protected]>
Quoted 4 lines

---
[V5] Removed the use of extern variable in omap-smp.c
as per suggestion from Santosh Shilimkar <[email protected]>

Thanks for the updates Sricharan. Looks fine now.

Tony, Can you apply this version if you are fine with it.

Regards,
Santosh

maintainer
#2 lore raw

PATCH v5 1/1 ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register

Quoted 31 lines · Santosh Shilimkar
Quoted 26 lines · Sricharan R

From: R Sricharan <[email protected]>

The realtime counter called master counter, produces the count used by the private timer peripherals in the MPU_CLUSTER. The CNTFRQ per cpu register is used to denote the frequency of the counter. Currently the frequency value is passed from the
DT file, but this is not scalable when we have other non-DT guest OS. This register must be set to the right value by the secure rom code. Setting this register helps in propagating the right frequency value across OSes.

More discussions and the reason for adding this in a non-DT way can be seen from below.
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg93832.html

So configuring this secure register for all the cpus here.

Cc Santosh Shilimkar <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Rajendra Nayak <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Tony Lindgren <[email protected]>
Quoted 4 lines

---
[V5] Removed the use of extern variable in omap-smp.c
as per suggestion from Santosh Shilimkar <[email protected]>

Quoted 3 lines

Thanks for the updates Sricharan. Looks fine now.

Tony, Can you apply this version if you are fine with it.

Yes thanks looks good to me now. Applying into omap-for-v3.13/soc.

Tony

maintainer
#3 lore raw

PATCH v5 1/1 ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register

Quoted 32 lines · Tony Lindgren
Quoted 31 lines · Santosh Shilimkar
Quoted 30 lines · Sricharan R

From: R Sricharan <[email protected]>

The realtime counter called master counter, produces the count used by the private timer peripherals in the MPU_CLUSTER. The CNTFRQ per cpu register is used to denote the frequency of the counter. Currently the frequency value is passed from the
DT file, but this is not scalable when we have other non-DT guest OS. This register must be set to the right value by the secure rom code. Setting this register helps in propagating the right frequency value across OSes.

More discussions and the reason for adding this in a non-DT way can be seen from below.
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg93832.html

So configuring this secure register for all the cpus here.

Cc Santosh Shilimkar <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Rajendra Nayak <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Tony Lindgren <[email protected]>

---
[V5] Removed the use of extern variable in omap-smp.c
as per suggestion from Santosh Shilimkar <[email protected]>

Quoted 5 lines
Quoted 3 lines

Thanks for the updates Sricharan. Looks fine now.

Tony, Can you apply this version if you are fine with it.

Yes thanks looks good to me now. Applying into omap-for-v3.13/soc.

Grr, had to apply the following fix on top of this for some configs.

Tony

8< ---------------------------

From: Tony Lindgren <[email protected]>
Date: Fri, 11 Oct 2013 17:28:04 -0700
Subject: [PATCH] ARM: OMAP2+: Fix build error for realtime counter init if not enabled

Otherwise we can get an error with some configs:

arch/arm/mach-omap2/timer.c:73: undefined reference to `omap_smc1'

arch/arm/mach-omap2/timer.c +3 -0
@@ -66,12 +66,15 @@
 
 static struct omap_dm_timer clkev;
 static struct clock_event_device clockevent_gpt;
+
+#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
 static unsigned long arch_timer_freq;
 
 void set_cntfreq(void)
 {
 	omap_smc1(OMAP5_DRA7_MON_SET_CNTFRQ_INDEX, arch_timer_freq);
 }
+#endif
 
 static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
 {
#4 lore raw

PATCH v5 1/1 ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register

Quoted 33 lines · Tony Lindgren
Quoted 32 lines · Tony Lindgren
Quoted 31 lines · Santosh Shilimkar
Quoted 30 lines · Sricharan R

From: R Sricharan <[email protected]>

The realtime counter called master counter, produces the count used by the private timer peripherals in the MPU_CLUSTER. The CNTFRQ per cpu register is used to denote the frequency of the counter. Currently the frequency value is passed from the
DT file, but this is not scalable when we have other non-DT guest OS. This register must be set to the right value by the secure rom code. Setting this register helps in propagating the right frequency value across OSes.

More discussions and the reason for adding this in a non-DT way can be seen from below.
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg93832.html

So configuring this secure register for all the cpus here.

Cc Santosh Shilimkar <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Rajendra Nayak <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Tony Lindgren <[email protected]>

---
[V5] Removed the use of extern variable in omap-smp.c
as per suggestion from Santosh Shilimkar <[email protected]>

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Thanks for the updates Sricharan. Looks fine now.

Tony, Can you apply this version if you are fine with it.

Yes thanks looks good to me now. Applying into omap-for-v3.13/soc.

Grr, had to apply the following fix on top of this for some configs.

Looks like Sricharan missed some builds. Sorry for the trouble Tony.

Quoted 7 lines

8< ---------------------------

From: Tony Lindgren <[email protected]>
Date: Fri, 11 Oct 2013 17:28:04 -0700
Subject: [PATCH] ARM: OMAP2+: Fix build error for realtime counter init if not enabled

Quoted 6 lines

Otherwise we can get an error with some configs:

arch/arm/mach-omap2/timer.c:73: undefined reference to `omap_smc1'

Looks fine to me. Thanks

Regards,
Santosh