gpu: nvgpu: Move gm206 HW headers

Move the gm206 HW headers to a new directory specially for them:

  include/nvgpu/hw/gm206

And change the code to include like so:

  #include <nvgpu/hw/gm206/hw_fb_gm206.h>

This is part of the process to restructure the nvgpu driver.

Bug 1799159

Change-Id: I90dc39e64e1b58ee9e87fbc26ad0d18c361e239c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1244792
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

31 files changed, 41 insertions, 35 deletions

diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.c b/drivers/gpu/nvgpu/gm206/acr_gm206.c
index a0e60833..523f0c33 100644
--- a/drivers/gpu/nvgpu/gm206/acr_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/acr_gm206.c
@@ -22,11 +22,13 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/semaphore_gk20a.h"
-#include "hw_pwr_gm206.h"
+
 #include "acr.h"
 #include "acr_gm206.h"
 #include "nvgpu_common.h"
 
+#include <nvgpu/hw/gm206/hw_pwr_gm206.h>
+
 /*Defines*/
 #define gm206_dbg_pmu(fmt, arg...) \
         gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index c278cb08..bfb90e19 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -19,13 +19,14 @@
 #include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"
 #include "fifo_gm206.h"
-#include "hw_pwr_gm206.h"
-#include "hw_mc_gm206.h"
-#include "hw_xve_gm206.h"
-#include "hw_top_gm206.h"
 #include "bios_gm206.h"
 #include "nvgpu_common.h"
 
+#include <nvgpu/hw/gm206/hw_pwr_gm206.h>
+#include <nvgpu/hw/gm206/hw_mc_gm206.h>
+#include <nvgpu/hw/gm206/hw_xve_gm206.h>
+#include <nvgpu/hw/gm206/hw_top_gm206.h>
+
 #define BIT_HEADER_ID 0xb8ff
 #define BIT_HEADER_SIGNATURE 0x00544942
 #define BIOS_SIZE 0x40000
diff --git a/drivers/gpu/nvgpu/gm206/ce_gm206.c b/drivers/gpu/nvgpu/gm206/ce_gm206.c
index 393a148d..5d5fd432 100644
--- a/drivers/gpu/nvgpu/gm206/ce_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/ce_gm206.c
@@ -30,13 +30,14 @@
 
 #include "gk20a/debug_gk20a.h"
 #include "gk20a/semaphore_gk20a.h"
-#include "hw_ce2_gm206.h"
-#include "hw_pbdma_gm206.h"
-#include "hw_ccsr_gm206.h"
-#include "hw_ram_gm206.h"
-#include "hw_top_gm206.h"
-#include "hw_mc_gm206.h"
-#include "hw_gr_gm206.h"
+
+#include <nvgpu/hw/gm206/hw_ce2_gm206.h>
+#include <nvgpu/hw/gm206/hw_pbdma_gm206.h>
+#include <nvgpu/hw/gm206/hw_ccsr_gm206.h>
+#include <nvgpu/hw/gm206/hw_ram_gm206.h>
+#include <nvgpu/hw/gm206/hw_top_gm206.h>
+#include <nvgpu/hw/gm206/hw_mc_gm206.h>
+#include <nvgpu/hw/gm206/hw_gr_gm206.h>
 
 /* TODO: We need generic way for query the intr_status register offset.
  * As of now, there is no way to query this information from dev_ceN_pri.h */
diff --git a/drivers/gpu/nvgpu/gm206/fifo_gm206.c b/drivers/gpu/nvgpu/gm206/fifo_gm206.c
index 6caf30f4..01fb2f82 100644
--- a/drivers/gpu/nvgpu/gm206/fifo_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/fifo_gm206.c
@@ -14,11 +14,13 @@
 #include <linux/delay.h>
 #include <linux/types.h>
 
+#include "fifo_gm206.h"
+
 #include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"
-#include "fifo_gm206.h"
-#include "hw_ccsr_gm206.h"
-#include "hw_fifo_gm206.h"
+
+#include <nvgpu/hw/gm206/hw_ccsr_gm206.h>
+#include <nvgpu/hw/gm206/hw_fifo_gm206.h>
 
 static u32 gm206_fifo_get_num_fifos(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gm206/gr_gm206.c b/drivers/gpu/nvgpu/gm206/gr_gm206.c
index cad080ac..782eda8b 100644
--- a/drivers/gpu/nvgpu/gm206/gr_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/gr_gm206.c
@@ -23,8 +23,9 @@
 
 #include "gm20b/gr_gm20b.h"
 #include "gr_gm206.h"
-#include "hw_fb_gm206.h"
-#include "hw_gr_gm206.h"
+
+#include <nvgpu/hw/gm206/hw_fb_gm206.h>
+#include <nvgpu/hw/gm206/hw_gr_gm206.h>
 
 static void gr_gm206_init_gpc_mmu(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gm206/hal_gm206.c b/drivers/gpu/nvgpu/gm206/hal_gm206.c
index d8793c18..6ecbbfed 100644
--- a/drivers/gpu/nvgpu/gm206/hal_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/hal_gm206.c
@@ -13,21 +13,22 @@
 
 #include <linux/types.h>
 #include <linux/printk.h>
-
 #include <linux/types.h>
 
-#include "gk20a/gk20a.h"
+#include "ce_gm206.h"
+#include "fifo_gm206.h"
+#include "bios_gm206.h"
+#include "gr_gm206.h"
 
+#include "gk20a/gk20a.h"
+#include "gk20a/dbg_gpu_gk20a.h"
+#include "gk20a/css_gr_gk20a.h"
 #include "gm20b/mc_gm20b.h"
 #include "gm20b/ltc_gm20b.h"
 #include "gm20b/mm_gm20b.h"
-#include "gm206/mm_gm206.h"
-#include "ce_gm206.h"
 #include "gm20b/fb_gm20b.h"
 #include "gm20b/pmu_gm20b.h"
 #include "gm20b/gr_gm20b.h"
-#include "gm206/pmu_gm206.h"
-#include "gm206/acr_gm206.h"
 #include "gm20b/gr_ctx_gm20b.h"
 #include "gm20b/gm20b_gating_reglist.h"
 #include "gm20b/regops_gm20b.h"
@@ -35,13 +36,11 @@
 #include "gm20b/therm_gm20b.h"
 #include "gm20b/clk_gm20b.h"
 #include "gm20b/debug_gm20b.h"
+#include "gm206/mm_gm206.h"
+#include "gm206/pmu_gm206.h"
+#include "gm206/acr_gm206.h"
 
-#include "fifo_gm206.h"
-#include "bios_gm206.h"
-#include "gr_gm206.h"
-#include "hw_proj_gm206.h"
-#include "gk20a/dbg_gpu_gk20a.h"
-#include "gk20a/css_gr_gk20a.h"
+#include <nvgpu/hw/gm206/hw_proj_gm206.h>
 
 static struct gpu_ops gm206_ops = {
         .clock_gating = {
diff --git a/drivers/gpu/nvgpu/gm206/mm_gm206.c b/drivers/gpu/nvgpu/gm206/mm_gm206.c
index ae410818..75c8a234 100644
--- a/drivers/gpu/nvgpu/gm206/mm_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/mm_gm206.c
@@ -17,8 +17,8 @@
 #include "gm20b/mm_gm20b.h"
 #include "gm206/mm_gm206.h"
 
-#include "hw_fbpa_gm206.h"
-#include "hw_top_gm206.h"
+#include <nvgpu/hw/gm206/hw_fbpa_gm206.h>
+#include <nvgpu/hw/gm206/hw_top_gm206.h>
 
 static size_t gm206_mm_get_vidmem_size(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gm206/pmu_gm206.c b/drivers/gpu/nvgpu/gm206/pmu_gm206.c
index 1aff6ea6..44ef8ae7 100644
--- a/drivers/gpu/nvgpu/gm206/pmu_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/pmu_gm206.c
@@ -11,7 +11,8 @@
  * more details.
  */
 
-#include <linux/delay.h>        /* for udelay */
+#include <linux/delay.h>
+
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
@@ -19,9 +20,9 @@
 #include "gm206/acr_gm206.h"
 #include "gm20b/pmu_gm20b.h"
 #include "gm206/pmu_gm206.h"
-#include "hw_gr_gm206.h"
-#include "hw_pwr_gm206.h"
 
+#include <nvgpu/hw/gm206/hw_gr_gm206.h>
+#include <nvgpu/hw/gm206/hw_pwr_gm206.h>
 
 #define gm206_dbg_pmu(fmt, arg...) \
         gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
@@ -166,4 +167,3 @@ void gm206_init_pmu_ops(struct gpu_ops *gops)
         gops->pmu.dump_secure_fuses = NULL;
         gops->pmu.reset = gk20a_pmu_reset;
 }
-
diff --git a/drivers/gpu/nvgpu/gm206/hw_bus_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_bus_gm206.h
index de1884f5..de1884f5 100644
--- a/drivers/gpu/nvgpu/gm206/hw_bus_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_bus_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_ccsr_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ccsr_gm206.h
index 729ad2e9..729ad2e9 100644
--- a/drivers/gpu/nvgpu/gm206/hw_ccsr_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ccsr_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_ce2_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ce2_gm206.h
index 2eda4a9e..2eda4a9e 100644
--- a/drivers/gpu/nvgpu/gm206/hw_ce2_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ce2_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_ctxsw_prog_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ctxsw_prog_gm206.h
index adb2f64c..adb2f64c 100644
--- a/drivers/gpu/nvgpu/gm206/hw_ctxsw_prog_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ctxsw_prog_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_fb_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fb_gm206.h
index 6d4b31c6..6d4b31c6 100644
--- a/drivers/gpu/nvgpu/gm206/hw_fb_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fb_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_fbpa_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fbpa_gm206.h
index 3a1d1981..3a1d1981 100644
--- a/drivers/gpu/nvgpu/gm206/hw_fbpa_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fbpa_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_fifo_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fifo_gm206.h
index 19148b03..19148b03 100644
--- a/drivers/gpu/nvgpu/gm206/hw_fifo_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fifo_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_flush_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_flush_gm206.h
index 8a37aecb..8a37aecb 100644
--- a/drivers/gpu/nvgpu/gm206/hw_flush_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_flush_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_fuse_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fuse_gm206.h
index f556ccfb..f556ccfb 100644
--- a/drivers/gpu/nvgpu/gm206/hw_fuse_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_fuse_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_gmmu_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gmmu_gm206.h
index c098de69..c098de69 100644
--- a/drivers/gpu/nvgpu/gm206/hw_gmmu_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gmmu_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_gr_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gr_gm206.h
index ff677844..ff677844 100644
--- a/drivers/gpu/nvgpu/gm206/hw_gr_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gr_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_ltc_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ltc_gm206.h
index 66afd80b..66afd80b 100644
--- a/drivers/gpu/nvgpu/gm206/hw_ltc_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ltc_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_mc_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_mc_gm206.h
index afbf556f..afbf556f 100644
--- a/drivers/gpu/nvgpu/gm206/hw_mc_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_mc_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_pbdma_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pbdma_gm206.h
index ea8dad45..ea8dad45 100644
--- a/drivers/gpu/nvgpu/gm206/hw_pbdma_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pbdma_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_perf_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_perf_gm206.h
index 5ac573c7..5ac573c7 100644
--- a/drivers/gpu/nvgpu/gm206/hw_perf_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_perf_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pri_ringmaster_gm206.h
index 6dcd9434..6dcd9434 100644
--- a/drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pri_ringmaster_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_pri_ringstation_sys_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pri_ringstation_sys_gm206.h
index 94efe04f..94efe04f 100644
--- a/drivers/gpu/nvgpu/gm206/hw_pri_ringstation_sys_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pri_ringstation_sys_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_proj_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_proj_gm206.h
index bdca905f..bdca905f 100644
--- a/drivers/gpu/nvgpu/gm206/hw_proj_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_proj_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_pwr_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pwr_gm206.h
index 8e755fcf..8e755fcf 100644
--- a/drivers/gpu/nvgpu/gm206/hw_pwr_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_pwr_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_ram_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ram_gm206.h
index 8007d8c2..8007d8c2 100644
--- a/drivers/gpu/nvgpu/gm206/hw_ram_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_ram_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_timer_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_timer_gm206.h
index 68c32507..68c32507 100644
--- a/drivers/gpu/nvgpu/gm206/hw_timer_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_timer_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_top_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_top_gm206.h
index b0d571cf..b0d571cf 100644
--- a/drivers/gpu/nvgpu/gm206/hw_top_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_top_gm206.h
diff --git a/drivers/gpu/nvgpu/gm206/hw_xve_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_xve_gm206.h
index e113dbeb..e113dbeb 100644
--- a/drivers/gpu/nvgpu/gm206/hw_xve_gm206.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_xve_gm206.h