gpu: nvgpu: move platform_gk20a.h to linux

Move gk20a/platform_gk20a.h to linux specific directory as
common/linux/platform_gk20a.h since this file includes all linux specific
stuff

Fix #includes in all the files to include this file with correct path

Remove #include of this file where it is no more needed

Fix gk20a_init_sim_support() to receive struct gk20a as parameter
instead of receiving linux specific struct platform_device

NVGPU-316

Change-Id: I5ec08e776b753af4d39d11c11f6f068be2ac236f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1589938
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2017-10-31 06:11:57 -07:00
committed by mobile promotions
parent 2d71b3efae
commit 25440e63d2
37 changed files with 38 additions and 40 deletions

View File

@@ -28,7 +28,6 @@
#include <nvgpu/vm.h> #include <nvgpu/vm.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
/* dumb allocator... */ /* dumb allocator... */
static int generate_as_share_id(struct gk20a_as *as) static int generate_as_share_id(struct gk20a_as *as)

View File

@@ -22,9 +22,9 @@
#include "clk.h" #include "clk.h"
#include "os_linux.h" #include "os_linux.h"
#include "platform_gk20a.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
static unsigned long nvgpu_linux_clk_get_rate(struct gk20a *g, u32 api_domain) static unsigned long nvgpu_linux_clk_get_rate(struct gk20a *g, u32 api_domain)
{ {

View File

@@ -23,13 +23,13 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/gr_gk20a.h" #include "gk20a/gr_gk20a.h"
#include "gk20a/platform_gk20a.h"
#include <nvgpu/kmem.h> #include <nvgpu/kmem.h>
#include <nvgpu/log.h> #include <nvgpu/log.h>
#include <nvgpu/atomic.h> #include <nvgpu/atomic.h>
#include <nvgpu/barrier.h> #include <nvgpu/barrier.h>
#include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
#include "ctxsw_trace.h" #include "ctxsw_trace.h"

View File

@@ -24,9 +24,9 @@
#include "debug_hal.h" #include "debug_hal.h"
#include "debug_xve.h" #include "debug_xve.h"
#include "os_linux.h" #include "os_linux.h"
#include "platform_gk20a.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>

View File

@@ -13,7 +13,7 @@
*/ */
#include "debug_cde.h" #include "debug_cde.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
#include <linux/debugfs.h> #include <linux/debugfs.h>

View File

@@ -16,9 +16,9 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "gk20a/platform_gk20a.h"
#include "gm20b/clk_gm20b.h" #include "gm20b/clk_gm20b.h"
#include "os_linux.h" #include "os_linux.h"
#include "platform_gk20a.h"
static int rate_get(void *data, u64 *val) static int rate_get(void *data, u64 *val)
{ {

View File

@@ -31,8 +31,8 @@
#include <nvgpu/linux/vidmem.h> #include <nvgpu/linux/vidmem.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
/* /*

View File

@@ -25,8 +25,8 @@
#include <nvgpu/linux/vidmem.h> #include <nvgpu/linux/vidmem.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "platform_gk20a.h"
#include "dmabuf.h" #include "dmabuf.h"
#include "os_linux.h" #include "os_linux.h"

View File

@@ -25,7 +25,7 @@
#include "scale.h" #include "scale.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "module.h" #include "module.h"
#include "os_linux.h" #include "os_linux.h"
#include "sysfs.h" #include "sysfs.h"

View File

@@ -21,7 +21,7 @@
#include <nvgpu/firmware.h> #include <nvgpu/firmware.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
static const struct firmware *do_request_firmware(struct device *dev, static const struct firmware *do_request_firmware(struct device *dev,

View File

@@ -22,7 +22,6 @@
#include <nvgpu/ctxsw_trace.h> #include <nvgpu/ctxsw_trace.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h"
#include "ioctl_channel.h" #include "ioctl_channel.h"
@@ -33,6 +32,7 @@
#include "module.h" #include "module.h"
#include "os_linux.h" #include "os_linux.h"
#include "ctxsw_trace.h" #include "ctxsw_trace.h"
#include "platform_gk20a.h"
#define GK20A_NUM_CDEVS 7 #define GK20A_NUM_CDEVS 7

View File

@@ -28,7 +28,7 @@
#include <nvgpu/linux/vm.h> #include <nvgpu/linux/vm.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "ioctl_as.h" #include "ioctl_as.h"
#include "os_linux.h" #include "os_linux.h"

View File

@@ -33,8 +33,8 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/fence_gk20a.h" #include "gk20a/fence_gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "platform_gk20a.h"
#include "ioctl_channel.h" #include "ioctl_channel.h"
#include "channel.h" #include "channel.h"
#include "os_linux.h" #include "os_linux.h"

View File

@@ -39,9 +39,9 @@
#include "ioctl_tsg.h" #include "ioctl_tsg.h"
#include "ioctl_channel.h" #include "ioctl_channel.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/fence_gk20a.h" #include "gk20a/fence_gk20a.h"
#include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
#include "dmabuf.h" #include "dmabuf.h"

View File

@@ -33,11 +33,11 @@
#include <nvgpu/linux/vm.h> #include <nvgpu/linux/vm.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/gr_gk20a.h" #include "gk20a/gr_gk20a.h"
#include "gk20a/regops_gk20a.h" #include "gk20a/regops_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
#include "platform_gk20a.h"
#include "ioctl_dbg.h" #include "ioctl_dbg.h"

View File

@@ -25,8 +25,8 @@
#include <nvgpu/log.h> #include <nvgpu/log.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/tsg_gk20a.h" #include "gk20a/tsg_gk20a.h"
#include "platform_gk20a.h"
#include "ioctl_tsg.h" #include "ioctl_tsg.h"
#include "ioctl_channel.h" #include "ioctl_channel.h"
#include "os_linux.h" #include "os_linux.h"

View File

@@ -20,7 +20,7 @@
#include <nvgpu/log.h> #include <nvgpu/log.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
/* /*

View File

@@ -33,7 +33,7 @@
#include <nvgpu/debug.h> #include <nvgpu/debug.h>
#include <nvgpu/ctxsw_trace.h> #include <nvgpu/ctxsw_trace.h>
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "sysfs.h" #include "sysfs.h"
#include "vgpu/vgpu.h" #include "vgpu/vgpu.h"
#include "scale.h" #include "scale.h"
@@ -661,7 +661,7 @@ static int gk20a_init_support(struct platform_device *dev)
goto fail; goto fail;
} }
err = gk20a_init_sim_support(dev); err = gk20a_init_sim_support(g);
if (err) if (err)
goto fail; goto fail;
} }

View File

@@ -23,13 +23,13 @@
#include <nvgpu/enabled.h> #include <nvgpu/enabled.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "clk/clk.h" #include "clk/clk.h"
#include "clk/clk_mclk.h" #include "clk/clk_mclk.h"
#include "module.h" #include "module.h"
#include "intr.h" #include "intr.h"
#include "sysfs.h" #include "sysfs.h"
#include "os_linux.h" #include "os_linux.h"
#include "platform_gk20a.h"
#include "pci.h" #include "pci.h"
#ifdef CONFIG_TEGRA_19x_GPU #ifdef CONFIG_TEGRA_19x_GPU

View File

@@ -29,7 +29,7 @@
#include <nvgpu/lock.h> #include <nvgpu/lock.h>
#include "gk20a.h" #include "gk20a/gk20a.h"
#define GK20A_CLKS_MAX 4 #define GK20A_CLKS_MAX 4

View File

@@ -47,10 +47,10 @@
#include <nvgpu/linux/dma.h> #include <nvgpu/linux/dma.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gm20b/clk_gm20b.h" #include "gm20b/clk_gm20b.h"
#include "scale.h" #include "scale.h"
#include "platform_gk20a.h"
#include "clk.h" #include "clk.h"
#include "os_linux.h" #include "os_linux.h"

View File

@@ -35,9 +35,9 @@
#include "clk.h" #include "clk.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "platform_gk20a.h"
#include "platform_gk20a_tegra.h" #include "platform_gk20a_tegra.h"
#include "gp10b/platform_gp10b.h" #include "gp10b/platform_gp10b.h"
#include "platform_gp10b_tegra.h" #include "platform_gp10b_tegra.h"

View File

@@ -27,7 +27,7 @@
#include <nvgpu/log.h> #include <nvgpu/log.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "scale.h" #include "scale.h"
#include "os_linux.h" #include "os_linux.h"

View File

@@ -23,7 +23,7 @@
#include <nvgpu/nvhost.h> #include <nvgpu/nvhost.h>
#include "sysfs.h" #include "sysfs.h"
#include "gk20a/platform_gk20a.h" #include "platform_gk20a.h"
#include "gk20a/pmu_gk20a.h" #include "gk20a/pmu_gk20a.h"
#include "gk20a/gr_gk20a.h" #include "gk20a/gr_gk20a.h"

View File

@@ -21,7 +21,8 @@
#include <nvgpu/soc.h> #include <nvgpu/soc.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "platform_gk20a.h"
/* /*
* Returns 1 if the platform is pre-Si and should ignore the timeout checking. * Returns 1 if the platform is pre-Si and should ignore the timeout checking.

View File

@@ -32,8 +32,8 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/mm_gk20a.h" #include "gk20a/mm_gk20a.h"
#include "gk20a/kind_gk20a.h" #include "gk20a/kind_gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "platform_gk20a.h"
#include "os_linux.h" #include "os_linux.h"
#include "dmabuf.h" #include "dmabuf.h"

View File

@@ -29,7 +29,6 @@
#include <nvgpu/mm.h> #include <nvgpu/mm.h>
#include "gk20a.h" #include "gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gr_gk20a.h" #include "gr_gk20a.h"
#include "dbg_gpu_gk20a.h" #include "dbg_gpu_gk20a.h"
#include "regops_gk20a.h" #include "regops_gk20a.h"

View File

@@ -41,7 +41,6 @@
#include <nvgpu/vidmem.h> #include <nvgpu/vidmem.h>
#include "gk20a.h" #include "gk20a.h"
#include "platform_gk20a.h"
#include "mm_gk20a.h" #include "mm_gk20a.h"
#include "fence_gk20a.h" #include "fence_gk20a.h"
#include "kind_gk20a.h" #include "kind_gk20a.h"

View File

@@ -23,7 +23,7 @@
*/ */
#include "gk20a.h" #include "gk20a.h"
#include "platform_gk20a.h" #include "common/linux/platform_gk20a.h"
#include "vgpu/clk_vgpu.h" #include "vgpu/clk_vgpu.h"
#include <nvgpu/nvhost.h> #include <nvgpu/nvhost.h>

View File

@@ -28,7 +28,6 @@
#include <nvgpu/linux/vm.h> #include <nvgpu/linux/vm.h>
#include "gk20a.h" #include "gk20a.h"
#include "platform_gk20a.h"
#include <nvgpu/hw/gk20a/hw_sim_gk20a.h> #include <nvgpu/hw/gk20a/hw_sim_gk20a.h>
@@ -104,11 +103,9 @@ static int alloc_and_kmap_iopage(struct gk20a *g,
} }
int gk20a_init_sim_support(struct platform_device *pdev) int gk20a_init_sim_support(struct gk20a *g)
{ {
int err = 0; int err = 0;
struct device *dev = &pdev->dev;
struct gk20a *g = get_gk20a(dev);
u64 phys; u64 phys;
/* allocate sim event/msg buffers */ /* allocate sim event/msg buffers */

View File

@@ -45,7 +45,7 @@ struct sim_gk20a {
void (*remove_support)(struct sim_gk20a *); void (*remove_support)(struct sim_gk20a *);
}; };
int gk20a_init_sim_support(struct platform_device *pdev); int gk20a_init_sim_support(struct gk20a *g);
int gk20a_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data); int gk20a_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data);
#endif /*__SIM_GK20A_H__*/ #endif /*__SIM_GK20A_H__*/

View File

@@ -26,6 +26,9 @@
#include <nvgpu/lock.h> #include <nvgpu/lock.h>
struct gk20a;
struct clk_gk20a;
struct nvgpu_clk_pll_debug_data { struct nvgpu_clk_pll_debug_data {
u32 trim_sys_sel_vco_reg; u32 trim_sys_sel_vco_reg;
u32 trim_sys_sel_vco_val; u32 trim_sys_sel_vco_val;

View File

@@ -25,9 +25,9 @@
#include <nvgpu/pmu.h> #include <nvgpu/pmu.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
#include "common/linux/os_linux.h" #include "common/linux/os_linux.h"
#include "common/linux/platform_gk20a.h"
#include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp.h"
#include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrp_e32.h"

View File

@@ -24,12 +24,12 @@
#include <nvgpu/bug.h> #include <nvgpu/bug.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "pwrpolicy.h" #include "pwrpolicy.h"
#include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp.h"
#include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrp_e32.h"
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
#include "common/linux/os_linux.h" #include "common/linux/os_linux.h"
#include "common/linux/platform_gk20a.h"
#define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output
#define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0)) #define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0))

View File

@@ -26,8 +26,8 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/channel_gk20a.h" #include "gk20a/channel_gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/css_gr_gk20a.h" #include "gk20a/css_gr_gk20a.h"
#include "common/linux/platform_gk20a.h"
#include "vgpu.h" #include "vgpu.h"
#include "css_vgpu.h" #include "css_vgpu.h"

View File

@@ -24,8 +24,8 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/channel_gk20a.h" #include "gk20a/channel_gk20a.h"
#include "gk20a/platform_gk20a.h"
#include "gk20a/tsg_gk20a.h" #include "gk20a/tsg_gk20a.h"
#include "common/linux/platform_gk20a.h"
#include "vgpu.h" #include "vgpu.h"
#include "fifo_vgpu.h" #include "fifo_vgpu.h"

View File

@@ -28,7 +28,7 @@
#include <linux/tegra_gr_comm.h> #include <linux/tegra_gr_comm.h>
#include <linux/tegra_vgpu.h> #include <linux/tegra_vgpu.h>
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "common/linux/platform_gk20a.h"
#include "common/linux/os_linux.h" #include "common/linux/os_linux.h"
#include <nvgpu/thread.h> #include <nvgpu/thread.h>