gk20a: nvgpu: Remove io.h dependency from gk20a.h

In the current code, gk20a.h includes io.h which gets directly included
in a lot of other files. io.h contains methods which uses a struct
gk20a as a parameter leading to a circular dependency between io.h
and gk20a.h. This can be mitigated by removing io.h from gk20a.h as
part of larger effort to moving gk20a.h to nvgpu/gk20a.h

JIRA NVGPU-597

Change-Id: I93e504fa9371b88152737b342a75580c65e8f712
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1787316
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/gpu/nvgpu/clk/clk_vin.c

@@ -22,6 +22,7 @@
 
 #include <nvgpu/bios.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/common/bus/bus_gk20a.c

@@ -23,6 +23,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "bus_gk20a.h"

drivers/gpu/nvgpu/common/bus/bus_gm20b.c

@@ -25,6 +25,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "bus_gm20b.h"

drivers/gpu/nvgpu/common/bus/bus_gp10b.c

@@ -22,6 +22,7 @@
 
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "bus_gp10b.h"
 #include "gk20a/gk20a.h"

drivers/gpu/nvgpu/common/bus/bus_gv100.c

@@ -22,6 +22,7 @@
 
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "bus_gv100.h"
 #include "gk20a/gk20a.h"

drivers/gpu/nvgpu/common/fb/fb_gk20a.c

@@ -29,6 +29,7 @@
 #include "fb_gk20a.h"
 
 #include <nvgpu/timers.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_fb_gk20a.h>

drivers/gpu/nvgpu/common/fb/fb_gm20b.c

@@ -29,6 +29,8 @@
 #include "fb_gk20a.h"
 #include "fb_gm20b.h"
 
+#include <nvgpu/io.h>
+
 #include <nvgpu/hw/gm20b/hw_fb_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_top_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h>

drivers/gpu/nvgpu/common/fb/fb_gp106.c

@@ -25,6 +25,8 @@
 #include "fb_gp10b.h"
 #include "fb_gp106.h"
 
+#include <nvgpu/io.h>
+
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
 #define HW_SCRUB_TIMEOUT_DEFAULT	100 /* usec */

drivers/gpu/nvgpu/common/fb/fb_gv100.c

@@ -35,6 +35,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/falcon.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gm20b/acr_gm20b.h"

drivers/gpu/nvgpu/common/fb/fb_gv11b.c

@@ -30,6 +30,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"

drivers/gpu/nvgpu/common/pramin.c

@@ -24,6 +24,7 @@
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c

@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/log.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "ptimer_gk20a.h"

drivers/gpu/nvgpu/common/sim_pci.c

@@ -25,6 +25,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/hw_sim_pci.h>
 #include <nvgpu/sim.h>
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 
 static inline u32 sim_msg_header_size(void)

drivers/gpu/nvgpu/common/vbios/bios.c

@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/bios.h>
+#include <nvgpu/io.h>
 #include <nvgpu/hw/gp106/hw_gc6_gp106.h>
 
 #include "gk20a/gk20a.h"

drivers/gpu/nvgpu/gk20a/ce2_gk20a.c

@@ -30,6 +30,7 @@
 
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gk20a/hw_ce2_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>

drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c

@@ -31,6 +31,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "css_gr_gk20a.h"

drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c

@@ -28,6 +28,7 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"

drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c

@@ -37,6 +37,7 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/ctxsw_trace.h>
+#include <nvgpu/io.h>
 
 #include "fecs_trace_gk20a.h"
 #include "gk20a.h"

drivers/gpu/nvgpu/gk20a/fifo_gk20a.c

@@ -41,6 +41,7 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "mm_gk20a.h"

drivers/gpu/nvgpu/gk20a/flcn_gk20a.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, 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"),
@@ -21,6 +21,7 @@
  */
 #include <nvgpu/falcon.h>
 #include <nvgpu/pmu.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/flcn_gk20a.h"

drivers/gpu/nvgpu/gk20a/gk20a.h

@@ -47,7 +47,6 @@ struct nvgpu_ctxsw_trace_filter;
 
 #include <nvgpu/lock.h>
 #include <nvgpu/thread.h>
-#include <nvgpu/io.h>
 
 #include <nvgpu/mm.h>
 #include <nvgpu/as.h>

drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c

@@ -27,6 +27,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/firmware.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "gr_ctx_gk20a.h"

drivers/gpu/nvgpu/gk20a/gr_gk20a.c

@@ -39,6 +39,7 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/ecc.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"

drivers/gpu/nvgpu/gk20a/mc_gk20a.c

@@ -28,6 +28,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/unit.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 

drivers/gpu/nvgpu/gk20a/mm_gk20a.c

@@ -40,6 +40,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "mm_gk20a.h"

drivers/gpu/nvgpu/gk20a/pmu_gk20a.c

@@ -31,6 +31,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"

drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c

@@ -27,6 +27,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h>

drivers/gpu/nvgpu/gk20a/regops_gk20a.c

@@ -30,6 +30,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/bsearch.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/io.h>
 
 static int regop_bsearch_range_cmp(const void *pkey, const void *pelem)
 {

drivers/gpu/nvgpu/gk20a/therm_gk20a.c

@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a.h"
 

drivers/gpu/nvgpu/gm20b/acr_gm20b.c

@@ -33,6 +33,7 @@
 #include <nvgpu/falcon.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"

drivers/gpu/nvgpu/gm20b/clk_gm20b.c

@@ -30,6 +30,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/log.h>
 #include <nvgpu/types.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gm20b/hw_trim_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_therm_gm20b.h>

drivers/gpu/nvgpu/gm20b/fifo_gm20b.c

@@ -33,6 +33,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ram_gm20b.h>

drivers/gpu/nvgpu/gm20b/fuse_gm20b.c

@@ -1,7 +1,7 @@
 /*
  * GM20B FUSE
  *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, 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"),
@@ -25,6 +25,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/gm20b/gr_gm20b.c

@@ -27,6 +27,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/debug.h>
 #include <nvgpu/fuse.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"

drivers/gpu/nvgpu/gm20b/ltc_gm20b.c

@@ -28,6 +28,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/ltc.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h>

drivers/gpu/nvgpu/gm20b/pmu_gm20b.c

@@ -26,6 +26,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"

drivers/gpu/nvgpu/gm20b/therm_gm20b.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 
 #include "therm_gm20b.h"

drivers/gpu/nvgpu/gp106/acr_gp106.c

@@ -27,6 +27,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"

drivers/gpu/nvgpu/gp106/bios_gp106.c

@@ -26,6 +26,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"

drivers/gpu/nvgpu/gp106/clk_gp106.c

@@ -28,6 +28,7 @@
 #endif
 
 #include <nvgpu/kmem.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/mclk_gp106.h"

drivers/gpu/nvgpu/gp106/fuse_gp106.c

@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/fuse_gp106.h"

drivers/gpu/nvgpu/gp106/gr_gp106.c

@@ -29,6 +29,8 @@
 #include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
 
+#include <nvgpu/io.h>
+
 #include "gr_gp106.h"
 
 #include <nvgpu/hw/gp106/hw_gr_gp106.h>

drivers/gpu/nvgpu/gp106/mclk_gp106.c

@@ -24,6 +24,7 @@
 #include <nvgpu/bios.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS

drivers/gpu/nvgpu/gp106/mm_gp106.c

@@ -1,7 +1,7 @@
 /*
  * GP106 memory management
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, 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"),
@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/sizes.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp10b/mm_gp10b.h"

drivers/gpu/nvgpu/gp106/pmu_gp106.c

@@ -22,6 +22,7 @@
 
 #include <nvgpu/pmu.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"

drivers/gpu/nvgpu/gp106/sec2_gp106.c

@@ -23,6 +23,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "sec2_gp106.h"

drivers/gpu/nvgpu/gp106/therm_gp106.c

@@ -20,6 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 
 #include "therm_gp106.h"

drivers/gpu/nvgpu/gp106/xve_gp106.c

@@ -26,6 +26,7 @@
 
 #include <nvgpu/bug.h>
 #include <nvgpu/xve.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gp106/hw_xp_gp106.h>
 #include <nvgpu/hw/gp106/hw_xve_gp106.h>

drivers/gpu/nvgpu/gp10b/ce_gp10b.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 
 #include "ce_gp10b.h"

drivers/gpu/nvgpu/gp10b/fifo_gp10b.c

@@ -26,6 +26,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/log2.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "fifo_gp10b.h"
 

drivers/gpu/nvgpu/gp10b/fuse_gp10b.c

@@ -25,6 +25,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/gp10b/gp10b.c

@@ -25,6 +25,7 @@
 #include "gk20a/gk20a.h"
 
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gp10b.h"
 

drivers/gpu/nvgpu/gp10b/gr_gp10b.c

@@ -30,6 +30,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"

drivers/gpu/nvgpu/gp10b/ltc_gp10b.c

@@ -27,6 +27,7 @@
 #include <nvgpu/ltc.h>
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>

drivers/gpu/nvgpu/gp10b/mc_gp10b.c

@@ -23,6 +23,7 @@
  */
 
 #include "gk20a/gk20a.h"
+#include <nvgpu/io.h>
 
 #include "mc_gp10b.h"
 

drivers/gpu/nvgpu/gp10b/pmu_gp10b.c

@@ -26,6 +26,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"

drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c

@@ -27,6 +27,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h>

drivers/gpu/nvgpu/gp10b/therm_gp10b.c

@@ -26,6 +26,7 @@
 #include "therm_gp10b.h"
 
 #include <nvgpu/soc.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
 

drivers/gpu/nvgpu/gv100/bios_gv100.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, 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"),
@@ -23,6 +23,7 @@
 #include <nvgpu/bios.h>
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/bios_gp106.h"

drivers/gpu/nvgpu/gv100/fifo_gv100.c

@@ -26,6 +26,7 @@
 #include "fifo_gv100.h"
 #include <nvgpu/timers.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gv100/hw_ccsr_gv100.h>
 #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>

drivers/gpu/nvgpu/gv100/gr_gv100.c

@@ -25,6 +25,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/debug.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"

drivers/gpu/nvgpu/gv100/mc_gv100.c

@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/types.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/gv100/mm_gv100.c

@@ -1,7 +1,7 @@
 /*
  * GV100 memory management
  *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, 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"),
@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/sizes.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gv100/mm_gv100.h"

drivers/gpu/nvgpu/gv100/nvlink_gv100.c

@@ -28,6 +28,7 @@
 #include <nvgpu/bitops.h>
 #include <nvgpu/nvlink.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "nvlink_gv100.h"

drivers/gpu/nvgpu/gv11b/acr_gv11b.c

@@ -31,6 +31,7 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/acr/nvgpu_acr.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "acr_gv11b.h"

drivers/gpu/nvgpu/gv11b/ce_gv11b.c

@@ -1,7 +1,7 @@
 /*
  * Volta GPU series Copy Engine.
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, 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"),
@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/io.h>
 #include "nvgpu/log.h"
 #include "nvgpu/bitops.h"
 

drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c

@@ -33,6 +33,7 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/dma.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/css_gr_gk20a.h"

drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c

@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/log.h>
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 #include "gv11b/dbg_gpu_gv11b.h"
 #include <nvgpu/hw/gv11b/hw_perf_gv11b.h>

drivers/gpu/nvgpu/gv11b/fifo_gv11b.c

@@ -37,6 +37,7 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/io_usermode.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"

drivers/gpu/nvgpu/gv11b/gr_gv11b.c

@@ -32,6 +32,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/soc.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"

drivers/gpu/nvgpu/gv11b/ltc_gv11b.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 #include "gp10b/ltc_gp10b.h"
 

drivers/gpu/nvgpu/gv11b/mc_gv11b.c

@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/types.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/gv11b/pmu_gv11b.c

@@ -26,6 +26,7 @@
 #include <nvgpu/falcon.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 

drivers/gpu/nvgpu/gv11b/therm_gv11b.c

@@ -26,6 +26,7 @@
 #include "therm_gv11b.h"
 
 #include <nvgpu/soc.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 NVIDIA Corporation.  All rights reserved.
+ * Copyright (C) 2017-2018 NVIDIA Corporation.  All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -16,6 +16,8 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
+#include <nvgpu/io.h>
+
 #include "gm20b/clk_gm20b.h"
 #include "os_linux.h"
 #include "platform_gk20a.h"

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

@@ -25,6 +25,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/hw_sim_pci.h>
 #include <nvgpu/sim.h>
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 #include "os_linux.h"
 #include "module.h"

drivers/gpu/nvgpu/vgpu/fifo_vgpu.c

@@ -29,6 +29,7 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/barrier.h>
+#include <nvgpu/io.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/vgpu/vgpu_ivc.h>
 #include <nvgpu/vgpu/vgpu.h>