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

@@ -22,9 +22,9 @@
#include "clk.h"
#include "os_linux.h"
#include "platform_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)
{

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,302 @@
/*
* GK20A Platform (SoC) Interface
*
* Copyright (c) 2014-2017, 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.
*/
#ifndef _GK20A_PLATFORM_H_
#define _GK20A_PLATFORM_H_
#include <linux/device.h>
#include <nvgpu/lock.h>
#include "gk20a/gk20a.h"
#define GK20A_CLKS_MAX 4
struct gk20a;
struct channel_gk20a;
struct gr_ctx_buffer_desc;
struct gk20a_scale_profile;
struct secure_page_buffer {
void (*destroy)(struct gk20a *, struct secure_page_buffer *);
size_t size;
u64 iova;
};
struct gk20a_platform {
/* Populated by the gk20a driver before probing the platform. */
struct gk20a *g;
/* Should be populated at probe. */
bool can_railgate_init;
/* Should be populated at probe. */
bool can_elpg_init;
/* Should be populated at probe. */
bool has_syncpoints;
/* channel limit after which to start aggressive sync destroy */
unsigned int aggressive_sync_destroy_thresh;
/* flag to set sync destroy aggressiveness */
bool aggressive_sync_destroy;
/* set if ASPM should be disabled on boot; only makes sense for PCI */
bool disable_aspm;
/* Set if the platform can unify the small/large address spaces. */
bool unify_address_spaces;
/* Clock configuration is stored here. Platform probe is responsible
* for filling this data. */
struct clk *clk[GK20A_CLKS_MAX];
int num_clks;
#ifdef CONFIG_RESET_CONTROLLER
/* Reset control for device */
struct reset_control *reset_control;
#endif
/* Delay before rail gated */
int railgate_delay_init;
/* Second Level Clock Gating: true = enable false = disable */
bool enable_slcg;
/* Block Level Clock Gating: true = enable flase = disable */
bool enable_blcg;
/* Engine Level Clock Gating: true = enable flase = disable */
bool enable_elcg;
/* Should be populated at probe. */
bool can_slcg;
/* Should be populated at probe. */
bool can_blcg;
/* Should be populated at probe. */
bool can_elcg;
/* Engine Level Power Gating: true = enable flase = disable */
bool enable_elpg;
/* Adaptative ELPG: true = enable flase = disable */
bool enable_aelpg;
/* PMU Perfmon: true = enable false = disable */
bool enable_perfmon;
/* Memory System Clock Gating: true = enable flase = disable*/
bool enable_mscg;
/* Timeout for per-channel watchdog (in mS) */
u32 ch_wdt_timeout_ms;
/* Enable SMMU bypass by default */
bool bypass_smmu;
/* Disable big page support */
bool disable_bigpage;
/*
* gk20a_do_idle() API can take GPU either into rail gate or CAR reset
* This flag can be used to force CAR reset case instead of rail gate
*/
bool force_reset_in_do_idle;
/* default pri timeout, on PCIe it should be lower than timeout
* detection
*/
u32 default_pri_timeout;
/* Initialize the platform interface of the gk20a driver.
*
* The platform implementation of this function must
* - set the power and clocks of the gk20a device to a known
* state, and
* - populate the gk20a_platform structure (a pointer to the
* structure can be obtained by calling gk20a_get_platform).
*
* After this function is finished, the driver will initialise
* pm runtime and genpd based on the platform configuration.
*/
int (*probe)(struct device *dev);
/* Second stage initialisation - called once all power management
* initialisations are done.
*/
int (*late_probe)(struct device *dev);
/* Remove device after power management has been done
*/
int (*remove)(struct device *dev);
/* Poweron platform dependencies */
int (*busy)(struct device *dev);
/* Powerdown platform dependencies */
void (*idle)(struct device *dev);
struct secure_page_buffer secure_buffer;
/* Device is going to be suspended */
int (*suspend)(struct device *);
/* Called to turn off the device */
int (*railgate)(struct device *dev);
/* Called to turn on the device */
int (*unrailgate)(struct device *dev);
struct nvgpu_mutex railgate_lock;
/* Called to check state of device */
bool (*is_railgated)(struct device *dev);
/* get supported frequency list */
int (*get_clk_freqs)(struct device *pdev,
unsigned long **freqs, int *num_freqs);
/* clk related supported functions */
long (*clk_round_rate)(struct device *dev,
unsigned long rate);
/* Called to register GPCPLL with common clk framework */
int (*clk_register)(struct gk20a *g);
/* Postscale callback is called after frequency change */
void (*postscale)(struct device *dev,
unsigned long freq);
/* Pre callback is called before frequency change */
void (*prescale)(struct device *dev);
/* Devfreq governor name. If scaling is enabled, we request
* this governor to be used in scaling */
const char *devfreq_governor;
/* Quality of service notifier callback. If this is set, the scaling
* routines will register a callback to Qos. Each time we receive
* a new value, this callback gets called. */
int (*qos_notify)(struct notifier_block *nb,
unsigned long n, void *p);
/* Called as part of debug dump. If the gpu gets hung, this function
* is responsible for delivering all necessary debug data of other
* hw units which may interact with the gpu without direct supervision
* of the CPU.
*/
void (*dump_platform_dependencies)(struct device *dev);
/* Callbacks to assert/deassert GPU reset */
int (*reset_assert)(struct device *dev);
int (*reset_deassert)(struct device *dev);
struct clk *clk_reset;
struct dvfs_rail *gpu_rail;
bool virtual_dev;
#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
void *vgpu_priv;
#endif
/* source frequency for ptimer in hz */
u32 ptimer_src_freq;
bool has_cde;
/* soc name for finding firmware files */
const char *soc_name;
/* false if vidmem aperture actually points to sysmem */
bool honors_aperture;
/* unified or split memory with separate vidmem? */
bool unified_memory;
/* true if all channels must be in TSG */
bool tsg_required;
/* minimum supported VBIOS version */
u32 vbios_min_version;
/* true if we run preos microcode on this board */
bool run_preos;
/* true if we need to program sw threshold for
* power limits
*/
bool hardcode_sw_threshold;
/* i2c device index, port and address for INA3221 */
u32 ina3221_dcb_index;
u32 ina3221_i2c_address;
u32 ina3221_i2c_port;
};
static inline struct gk20a_platform *gk20a_get_platform(
struct device *dev)
{
return (struct gk20a_platform *)dev_get_drvdata(dev);
}
#ifdef CONFIG_TEGRA_GK20A
extern struct gk20a_platform gm20b_tegra_platform;
extern struct gk20a_platform gp10b_tegra_platform;
#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
extern struct gk20a_platform vgpu_tegra_platform;
#endif
#endif
int gk20a_tegra_busy(struct device *dev);
void gk20a_tegra_idle(struct device *dev);
void gk20a_tegra_debug_dump(struct device *pdev);
static inline struct gk20a *get_gk20a(struct device *dev)
{
return gk20a_get_platform(dev)->g;
}
static inline struct gk20a *gk20a_from_dev(struct device *dev)
{
if (!dev)
return NULL;
return ((struct gk20a_platform *)dev_get_drvdata(dev))->g;
}
static inline bool gk20a_gpu_is_virtual(struct device *dev)
{
struct gk20a_platform *platform = dev_get_drvdata(dev);
return platform->virtual_dev;
}
static inline int support_gk20a_pmu(struct device *dev)
{
if (IS_ENABLED(CONFIG_GK20A_PMU)) {
/* gPMU is not supported for vgpu */
return !gk20a_gpu_is_virtual(dev);
}
return 0;
}
#endif

View File

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

View File

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

View File

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

View File

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

View File

@@ -21,7 +21,8 @@
#include <nvgpu/soc.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.

View File

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