Hi Eric, all,
On Tue, Aug 23, 2016 at 05:30:36PM -0700, Eric Nelson wrote:
Hi Gary and Peng,
On 08/23/2016 02:55 PM, Gary Bisson wrote:
From: Peng Fan van.freenix@gmail.com
This commit "2bb014820c49a63902103bac710bc86b5772e843" do some clean up to use the code in lib/time.c. But usec2ticks is still being used by security related job ring code. Bring back the function to avoid build break when CONFIG_FSL_CAAM is defined. The computation logic has been changed, using 64-bit variable to ease the process, making it work on older (MX5) platforms.
Signed-off-by: Peng Fan van.freenix@gmail.com Signed-off-by: Troy Kisky troy.kisky@boundarydevices.com Signed-off-by: Gary Bisson gary.bisson@boundarydevices.com
arch/arm/imx-common/timer.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index a01590c..a04c7ae 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -119,3 +119,19 @@ ulong get_tbclk(void) { return gpt_get_clk(); }
+/*
- This function is intended for SHORT delays only.
- It will overflow at around 10 seconds @ 400MHz,
- or 20 seconds @ 200MHz.
- */
+unsigned long usec2ticks(unsigned long _usec) +{
- unsigned long long usec = _usec;
- usec *= get_tbclk();
- usec += 999999;
- do_div(usec, 1000000);
- return usec;
+}
What about the version in imx-common/syscounter.c?
It seems that only one should be needed.
Well syscounter.c is only built for mx7 platforms whereas timer.c only applies to mx6|mx5 (see Makefile).
Regards, Gary