gpu: nvgpu: move duplicate timer api to common

The high level API for the timer unit is the same across all OSs, so
get rid of the slight code duplication by moving the timer init
functions under a new file in common code:

- nvgpu_timeout_init_cpu_timer
- nvgpu_timeout_init_cpu_timer_sw
- nvgpu_timeout_init_retry

Much of the timer logic is also duplicated, but it is mixed between OS
specific current time retrieval. With some refactoring and addition of
an OS independent time keeping layer, that logic could also be made
shared.

Change-Id: I75d02ceb0d32022b0ba7f3bcd9fdb13d47039dbc
Signed-off-by: Konsta Hölttä <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2669510
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>

arch/nvgpu-common.yaml

@@ -247,6 +247,9 @@ sim:
              include/nvgpu/hw_sim_pci.h,
              include/nvgpu/sim.h ]
 
+timers:
+  sources: [ common/timers_common.c ]
+
 utils:
   safe: yes
   owner: Alex W

drivers/gpu/nvgpu/Makefile

@@ -232,6 +232,7 @@ nvgpu-y += \
 	common/utils/rbtree.o \
 	common/utils/string.o \
 	common/utils/worker.o \
+	common/timers_common.o \
 	common/swdebug/profile.o \
 	common/ptimer/ptimer.o \
 	common/perf/perfbuf.o \

drivers/gpu/nvgpu/Makefile.sources

@@ -97,6 +97,7 @@ srcs +=	common/device.c \
 	common/utils/rbtree.c \
 	common/utils/string.c \
 	common/utils/worker.c \
+	common/timers_common.c \
 	common/swdebug/profile.c \
 	common/init/nvgpu_init.c \
 	common/mm/allocators/nvgpu_allocator.c \

drivers/gpu/nvgpu/common/timers_common.c

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <nvgpu/timers.h>
+
+void nvgpu_timeout_init_cpu_timer(struct gk20a *g, struct nvgpu_timeout *timeout,
+		       u32 duration_ms)
+{
+	int err = nvgpu_timeout_init_flags(g, timeout, duration_ms,
+					   NVGPU_TIMER_CPU_TIMER);
+
+	nvgpu_assert(err == 0);
+}
+
+void nvgpu_timeout_init_cpu_timer_sw(struct gk20a *g, struct nvgpu_timeout *timeout,
+		       u32 duration_ms)
+{
+	int err = nvgpu_timeout_init_flags(g, timeout, duration_ms,
+					   NVGPU_TIMER_CPU_TIMER |
+					   NVGPU_TIMER_NO_PRE_SI);
+
+	nvgpu_assert(err == 0);
+}
+
+void nvgpu_timeout_init_retry(struct gk20a *g, struct nvgpu_timeout *timeout,
+		       u32 duration_count)
+{
+	int err = nvgpu_timeout_init_flags(g, timeout, duration_count,
+					   NVGPU_TIMER_RETRY_TIMER);
+
+	nvgpu_assert(err == 0);
+}
+

drivers/gpu/nvgpu/include/nvgpu/timers.h

@@ -24,6 +24,7 @@
 #define NVGPU_TIMERS_H
 
 #include <nvgpu/types.h>
+#include <nvgpu/bitops.h>
 #include <nvgpu/utils.h>
 
 #ifndef __KERNEL__

drivers/gpu/nvgpu/os/linux/timers.c

@@ -36,34 +36,6 @@ static int nvgpu_timeout_is_pre_silicon(struct nvgpu_timeout *timeout)
 	return !nvgpu_platform_is_silicon(timeout->g);
 }
 
-void nvgpu_timeout_init_cpu_timer(struct gk20a *g, struct nvgpu_timeout *timeout,
-		       u32 duration_ms)
-{
-	int err = nvgpu_timeout_init_flags(g, timeout, duration_ms,
-					   NVGPU_TIMER_CPU_TIMER);
-
-	nvgpu_assert(err == 0);
-}
-
-void nvgpu_timeout_init_cpu_timer_sw(struct gk20a *g, struct nvgpu_timeout *timeout,
-		       u32 duration_ms)
-{
-	int err = nvgpu_timeout_init_flags(g, timeout, duration_ms,
-					   NVGPU_TIMER_CPU_TIMER |
-					   NVGPU_TIMER_NO_PRE_SI);
-
-	nvgpu_assert(err == 0);
-}
-
-void nvgpu_timeout_init_retry(struct gk20a *g, struct nvgpu_timeout *timeout,
-		       u32 duration_count)
-{
-	int err = nvgpu_timeout_init_flags(g, timeout, duration_count,
-					   NVGPU_TIMER_RETRY_TIMER);
-
-	nvgpu_assert(err == 0);
-}
-
 /**
  * nvgpu_timeout_init - Init timer.
  *

drivers/gpu/nvgpu/os/posix/timers.c

@@ -123,34 +123,6 @@ static bool time_after(s64 a, s64 b)
 	return (nvgpu_safe_sub_s64(a, b) > 0);
 }
 
-void nvgpu_timeout_init_cpu_timer(struct gk20a *g, struct nvgpu_timeout *timeout,
-		       u32 duration_ms)
-{
-	int err = nvgpu_timeout_init_flags(g, timeout, duration_ms,
-					   NVGPU_TIMER_CPU_TIMER);
-
-	nvgpu_assert(err == 0);
-}
-
-void nvgpu_timeout_init_cpu_timer_sw(struct gk20a *g, struct nvgpu_timeout *timeout,
-		       u32 duration_ms)
-{
-	int err = nvgpu_timeout_init_flags(g, timeout, duration_ms,
-					   NVGPU_TIMER_CPU_TIMER |
-					   NVGPU_TIMER_NO_PRE_SI);
-
-	nvgpu_assert(err == 0);
-}
-
-void nvgpu_timeout_init_retry(struct gk20a *g, struct nvgpu_timeout *timeout,
-		       u32 duration_count)
-{
-	int err = nvgpu_timeout_init_flags(g, timeout, duration_count,
-					   NVGPU_TIMER_RETRY_TIMER);
-
-	nvgpu_assert(err == 0);
-}
-
 int nvgpu_timeout_init_flags(struct gk20a *g, struct nvgpu_timeout *timeout,
 		       u32 duration, unsigned long flags)
 {