gpu: nvgpu: debugging API update

Update the debugging APIs in nvgpu to be more coherent and less dependent
on Linux kernel APIs and data structures. The old API is maintained for
backwards compatibility but the prints themselves are changed.

The old API now prints stuff like this:

  [   46.376077] nvgpu:              gk20a_channel_suspend:3430 [DBG]  suspend channel 508
  [   46.376242] nvgpu:              gk20a_channel_suspend:3430 [DBG]  suspend channel 509
  [   46.376359] nvgpu:              gk20a_channel_suspend:3430 [DBG]  suspend channel 510
  [   46.376466] nvgpu:              gk20a_channel_suspend:3430 [DBG]  suspend channel 511
  [   46.376604] nvgpu:   gk20a_fifo_update_runlist_locked:3090 [DBG]  runlist_id : 0, switch to new buffer 0x       4003a0000
  [   46.378348] nvgpu:                  gk20a_mm_l2_flush:5259 [DBG]  l2_flush_dirty 0x2
  [   46.378562] nvgpu:                     clk_config_pll:170  [DBG]  low_PL 1(div1), high_PL 2(div2)
  [   46.378684] nvgpu:                     clk_config_pll:170  [DBG]  low_PL 8(div8), high_PL 17(div17)

Each line starts with 'nvgpu:' since this is the nvgpu driver. Then there's
the function name which is is right justified and post-fixed with a line
number. This keeps all statements lined up so long as the function name does
not exceed the length of characters alloted for function names (33 currently).
Lines are also left justified with 4 available spaces since there are currently
no source files with over 9999 lines. The type of message (DBG, WRN, ERR) is
then printed in brackets. Finally there's whatever message is to be printed.

The new API will be largely the same except there will be an additional
print of the GPU that the message has originated from in order to help debug
cases where both an iGPU and dGPU are active. Also the implicit newline
added in the legacy API has been removed. This is inline with essentially
every other print function in the C world. There are numerous places where
'\n' is added despite it not being needed which results in log files being
littered with blank lines. This makes the logs much harder to read.

Bug ...

Change-Id: I7bc87f2dbbaebf6eb6c9de1a629a0e2963e1804c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1329487
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 5 insertions, 78 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index ec27ed77..2a9f8a06 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -41,9 +41,10 @@ struct dbg_profiler_object_data;
 
 #include "../../../arch/arm/mach-tegra/iomap.h"
 
+#include <nvgpu/as.h>
+#include <nvgpu/log.h>
 #include <nvgpu/pramin.h>
 #include <nvgpu/acr/nvgpu_acr.h>
-#include <nvgpu/as.h>
 
 #include "clk_gk20a.h"
 #include "ce2_gk20a.h"
@@ -927,6 +928,9 @@ struct gk20a {
         bool power_on;
         bool suspended;
 
+        u32 log_mask;
+        u32 log_trace;
+
         struct rw_semaphore busy_lock;
 
         struct clk_gk20a clk;
@@ -1193,89 +1197,12 @@ struct gk20a_cyclestate_buffer_elem {
         u64 data;
 };
 
-/* debug accessories */
-
-#ifdef CONFIG_DEBUG_FS
-    /* debug info, default is compiled-in but effectively disabled (0 mask) */
-    /*e.g: echo 1 > /d/gk20a.0/dbg_mask */
-    #define GK20A_DEFAULT_DBG_MASK 0
-#else
-    /* manually enable and turn it on the mask */
-    #define GK20A_DEFAULT_DBG_MASK (dbg_info)
-#endif
-
-enum gk20a_dbg_categories {
-        gpu_dbg_info    = BIT(0),  /* lightly verbose info */
-        gpu_dbg_fn      = BIT(2),  /* fn name tracing */
-        gpu_dbg_reg     = BIT(3),  /* register accesses, very verbose */
-        gpu_dbg_pte     = BIT(4),  /* gmmu ptes */
-        gpu_dbg_intr    = BIT(5),  /* interrupts */
-        gpu_dbg_pmu     = BIT(6),  /* gk20a pmu */
-        gpu_dbg_clk     = BIT(7),  /* gk20a clk */
-        gpu_dbg_map     = BIT(8),  /* mem mappings */
-        gpu_dbg_gpu_dbg = BIT(9),  /* gpu debugger/profiler */
-        gpu_dbg_cde     = BIT(10), /* cde info messages */
-        gpu_dbg_cde_ctx = BIT(11), /* cde context usage messages */
-        gpu_dbg_ctxsw   = BIT(12), /* ctxsw tracing */
-        gpu_dbg_sched   = BIT(13), /* sched control tracing */
-        gpu_dbg_map_v   = BIT(14), /* verbose mem mappings */
-        gpu_dbg_sema    = BIT(15), /* semaphore debugging */
-        gpu_dbg_sema_v  = BIT(16), /* verbose semaphore debugging */
-        gpu_dbg_pmu_pstate = BIT(17), /* p state controlled by pmu */
-        gpu_dbg_xv      = BIT(18), /* XVE debugging */
-        gpu_dbg_shutdown = BIT(19), /* GPU shutdown tracing */
-        gpu_dbg_kmem    = BIT(20), /* Kmem tracking debugging */
-        gpu_dbg_mem     = BIT(31), /* memory accesses, very verbose */
-};
-
 /* operations that will need to be executed on non stall workqueue */
 enum gk20a_nonstall_ops {
         gk20a_nonstall_ops_wakeup_semaphore = BIT(0), /* wake up semaphore */
         gk20a_nonstall_ops_post_events = BIT(1),
 };
 
-extern u32 gk20a_dbg_mask;
-#ifdef CONFIG_GK20A_TRACE_PRINTK
-extern u32 gk20a_dbg_ftrace;
-#define gk20a_dbg(dbg_mask, format, arg...)                             \
-do {                                                                    \
-        if (unlikely((dbg_mask) & gk20a_dbg_mask)) {            \
-                if (gk20a_dbg_ftrace)                                   \
-                        trace_printk(format "\n", ##arg);               \
-                else                                                    \
-                        pr_info("gk20a %s: " format "\n",               \
-                                        __func__, ##arg);               \
-        }                                                               \
-} while (0)
-#else
-#define gk20a_dbg(dbg_mask, format, arg...)                             \
-do {                                                                    \
-        if (unlikely((dbg_mask) & gk20a_dbg_mask)) {            \
-                pr_info("gk20a %s: " format "\n",               \
-                                __func__, ##arg);               \
-        }                                                               \
-} while (0)
-#endif
-
-#define gk20a_err(d, fmt, arg...)                                       \
-        do {                                                            \
-                if (d)                                                  \
-                        dev_err(d, "%s: " fmt "\n", __func__, ##arg);   \
-        } while (0)
-
-#define gk20a_warn(d, fmt, arg...)                                      \
-        do {                                                            \
-                if (d)                                                  \
-                        dev_warn(d, "%s: " fmt "\n", __func__, ##arg);  \
-        } while (0)
-
-
-#define gk20a_dbg_fn(fmt, arg...) \
-        gk20a_dbg(gpu_dbg_fn, fmt, ##arg)
-
-#define gk20a_dbg_info(fmt, arg...) \
-        gk20a_dbg(gpu_dbg_info, fmt, ##arg)
-
 void gk20a_init_clk_ops(struct gpu_ops *gops);
 
 /* register accessors */