Commit 5523e409 authored by R Sricharan's avatar R Sricharan Committed by Tony Lindgren
Browse files

ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register 

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@vger.kernel.org/msg93832.html



So configuring this secure register for all the cpus here.

Cc: Nishanth Menon <nm@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarSricharan R <r.sricharan@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent aa2f4b16

arch/arm/mach-omap2/omap-secure.h

+4 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ static void omap4_secondary_init(unsigned int cpu) 
		omap_secure_dispatcher(OMAP4_PPA_CPU_ACTRL_SMP_INDEX,

							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.

	 */

arch/arm/mach-omap2/timer.c

+10 −0
Original line number Diff line number Diff line
@@ -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)

{
@@ -546,6 +553,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE