Tegra114: Initialize System Counter (TSC) with osc frequency
Subsystems (2)
PATCH 1/1 Tegra114: Initialize System Counter (TSC) with osc frequency
T114 needs the SYSCTR0 counter initialized so the TSC can be read by the kernel. Do it in the bootloader since it's a write-once deal (secure/non-secure mode dependent).
--- arch/arm/cpu/tegra-common/clock.c | 3 +++ arch/arm/cpu/tegra114-common/clock.c | 22 ++++++++++++++++++ arch/arm/cpu/tegra20-common/clock.c | 4 ++++ arch/arm/cpu/tegra30-common/clock.c | 4 ++++ arch/arm/include/asm/arch-tegra/clock.h | 3 +++ arch/arm/include/asm/arch-tegra114/sysctr.h | 35 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-tegra114/tegra.h | 1 + 7 files changed, 72 insertions(+) create mode 100644 arch/arm/include/asm/arch-tegra114/sysctr.h
arch/arm/cpu/tegra-common/clock.c +3 -0
@@ -557,4 +557,7 @@ void clock_init(void)debug ("PLLP = %d\n" , pll_rate[CLOCK_ID_PERIPH ]);debug ("PLLC = %d\n" , pll_rate[CLOCK_ID_CGENERAL ]);debug ("PLLX = %d\n" , pll_rate[CLOCK_ID_XCPU ]); + +/* Do any special system timer/TSC setup */ +arch_timer_init (); }
arch/arm/cpu/tegra114-common/clock.c +22 -0
@@ -19,6 +19,7 @@#include <common.h> #include <asm/io.h> #include <asm/arch/clock.h> +#include <asm/arch/sysctr.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/timer.h>
@@ -653,3 +654,24 @@ void clock_early_init(void)writel (0x40000C10 , &clkrst->crc_pll[CLOCK_ID_DISPLAY ].pll_misc);udelay (2 ); } + +void arch_timer_init (void ) +{ +struct sysctr_ctlr *sysctr = (struct sysctr_ctlr *)NV_PA_TSC_BASE ; +u32 freq, val; + + freq =clock_get_rate (CLOCK_ID_OSC ); +debug ("%s: osc freq is %dHz [0x%08X]\n" , __func__, freq, freq); + +/* ARM CNTFRQ */ + asm("mcr p15, 0, %0, c14, c0, 0\n" : :"r" (freq)); + +/* Only T114 has the System Counter regs */ +debug ("%s: setting CNTFID0 to 0x%08X\n" , __func__, freq); +writel (freq, &sysctr->cntfid0); + + val =readl (&sysctr->cntcr); + val |=TSC_CNTCR_ENABLE |TSC_CNTCR_HDBG ; +writel (val, &sysctr->cntcr); +debug ("%s: TSC CNTCR = 0x%08X\n" , __func__, val); +}
arch/arm/cpu/tegra20-common/clock.c +4 -0
@@ -559,3 +559,7 @@ void clock_early_init(void)break ; } } + +void arch_timer_init (void ) +{ +}
arch/arm/cpu/tegra30-common/clock.c +4 -0
@@ -616,3 +616,7 @@ void clock_early_init(void)break ; } } + +void arch_timer_init (void ) +{ +}
arch/arm/include/asm/arch-tegra/clock.h +3 -0
@@ -317,4 +317,7 @@ int clock_set_rate(enum clock_id clkid, u32 n, u32 m, u32 p, u32 cpcon);#define periphc_internal_id_isvalid (id) ((id) >= 0 && \ (id) < PERIPHC_COUNT) +/* SoC-specific TSC init */ +void arch_timer_init (void ); +#endif /* _TEGRA_CLOCK_H_ */
arch/arm/include/asm/arch-tegra114/sysctr.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _TEGRA114_SYSCTR_H_ +#define _TEGRA114_SYSCTR_H_ + +struct sysctr_ctlr { +u32 cntcr;/* 0x00: SYSCTR0_CNTCR Counter Control */ +u32 cntsr;/* 0x04: SYSCTR0_CNTSR Counter Status */ +u32 cntcv0;/* 0x08: SYSCTR0_CNTCV0 Counter Count 31:00 */ +u32 cntcv1;/* 0x0C: SYSCTR0_CNTCV1 Counter Count 63:32 */ +u32 reserved1[4 ];/* 0x10 - 0x1C */ +u32 cntfid0;/* 0x20: SYSCTR0_CNTFID0 Freq Table Entry */ +u32 cntfid1;/* 0x24: SYSCTR0_CNTFID1 Freq Table End */ +u32 reserved2[1002 ];/* 0x28 - 0xFCC */ +u32 counterid[12 ];/* 0xFD0 - 0xFxx CounterID regs, RO */ +}; + +#define TSC_CNTCR_ENABLE (1 << 0)/* Enable */ +#define TSC_CNTCR_HDBG (1 << 1)/* Halt on debug */ + +#endif /* _TEGRA114_SYSCTR_H_ */
arch/arm/include/asm/arch-tegra114/tegra.h +1 -0
@@ -18,6 +18,7 @@#define _TEGRA114_H_#define NV_PA_SDRAM_BASE 0x80000000/* 0x80000000 for real T114 */ +#define NV_PA_TSC_BASE 0x700F0000/* System Counter TSC regs */ #include <asm/arch-tegra/tegra.h>
Signature · 1 line
1.8.1.5
PATCH 1/1 Tegra114: Initialize System Counter (TSC) with osc frequency
Quoted 7 lines · Tom Warren
T114 needs the SYSCTR0 counter initialized so the TSC can be read by the kernel. Do it in the bootloader since it's a write-once deal (secure/non-secure mode dependent).
arch/arm/cpu/tegra-common/clock.c +0
-0@@ -557,4 +557,7 @@ void clock_init(void)
...
arch/arm/cpu/tegra-common/clock.c void clock_init(void) · line 562
Quoted 2 lines
arch/arm/cpu/tegra-common/clock.c +2
-0+/* Do any special system timer/TSC setup */ +arch_timer_init ();
I wonder if we shouldn't ifdef that, so that ...
arch/arm/cpu/tegra20-common/clock.c
Quoted 5 lines
arch/arm/cpu/tegra20-common/clock.c +3
-0+void arch_timer_init (void ) +{ +}
We don't need those stubs on the chips that don't support this. (I imagine that for future chips, the implementation will be common and will move out of the chip-specific file into some arch-timers file).
Either way though,
PATCH 1/1 Tegra114: Initialize System Counter (TSC) with osc frequency
Quoted 28 lines
-----Original Message-----
From: Stephen Warren [mailto:swarren at wwwdotorg.org]
Sent: Wednesday, April 03, 2013 4:26 PM
To: Tom Warren
Cc: u-boot at lists.denx.de; Stephen Warren; Tom Warren
Subject: Re: [U-Boot] [PATCH] Tegra114: Initialize System Counter (TSC) with osc frequencyQuoted 8 lines · Tom Warren
T114 needs the SYSCTR0 counter initialized so the TSC can be read by the kernel. Do it in the bootloader since it's a write-once deal (secure/non-secure mode dependent).
arch/arm/cpu/tegra-common/clock.c +0
-0@@ -557,4 +557,7 @@ void clock_init(void)...
arch/arm/cpu/tegra-common/clock.c void clock_init(void) · line 562
Quoted 2 lines
arch/arm/cpu/tegra-common/clock.c +2
-0+/* Do any special system timer/TSC setup */ +arch_timer_init ();I wonder if we shouldn't ifdef that, so that ...
Quoted 2 lines
arch/arm/cpu/tegra20-common/clock.c +0
-0
Quoted 7 lines
arch/arm/cpu/tegra20-common/clock.c
Quoted 3 lines
arch/arm/cpu/tegra20-common/clock.c +3
-0+void arch_timer_init (void ) +{ +}We don't need those stubs on the chips that don't support this. (I imagine that for future chips, the implementation will be common and will move out of the chip-specific file into some arch-timers file).
I had an ifdef in there originally, but I don't like to add #ifdefs if they can be avoided, and I wasn't sure if there might not be some T20/T30-specific TSC/HPT init needed later.
Quoted 3 lines
Either way though,
Reviewed-by Stephen Warren <[email protected]>
Thanks
--
nvpublic