gpu: nvgpu: Move sysfs dependencies from HAL to Linux

Move sysfs dependencies from gk20a/ and gp10b/ to common/linux. At
the same time the gk20a and gp10b variants are merged into one.

JIRA NVGPU-48

Change-Id: I212be8f1beb8d20a57de04a57513e8fa0e2e83b4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master/r/1466055
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 2 insertions, 92 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/gp10b_sysfs.c b/drivers/gpu/nvgpu/gp10b/gp10b_sysfs.c
deleted file mode 100644
index 1c90d2f9..00000000
--- a/drivers/gpu/nvgpu/gp10b/gp10b_sysfs.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * GP10B specific sysfs files
- *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#include <linux/platform_device.h>
-
-#include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
-#include "gp10b_sysfs.h"
-
-#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
-
-#define ROOTRW (S_IRWXU|S_IRGRP|S_IROTH)
-
-static ssize_t czf_bypass_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
-{
-        struct gk20a *g = get_gk20a(dev);
-        unsigned long val;
-
-        if (kstrtoul(buf, 10, &val) < 0)
-                return -EINVAL;
-
-        if (val >= 4)
-                return -EINVAL;
-
-        g->gr.czf_bypass = val;
-
-        return count;
-}
-
-static ssize_t czf_bypass_read(struct device *dev,
-                struct device_attribute *attr, char *buf)
-{
-        struct gk20a *g = get_gk20a(dev);
-
-        return sprintf(buf, "%d\n", g->gr.czf_bypass);
-}
-
-static DEVICE_ATTR(czf_bypass, ROOTRW, czf_bypass_read, czf_bypass_store);
-
-void gp10b_create_sysfs(struct device *dev)
-{
-        struct gk20a *g = get_gk20a(dev);
-        int error = 0;
-
-        g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v();
-
-        error |= device_create_file(dev, &dev_attr_czf_bypass);
-        if (error)
-                nvgpu_err(g, "Failed to create sysfs attributes!");
-}
-
-void gp10b_remove_sysfs(struct device *dev)
-{
-        device_remove_file(dev, &dev_attr_czf_bypass);
-}
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b_sysfs.h b/drivers/gpu/nvgpu/gp10b/gp10b_sysfs.h
deleted file mode 100644
index f56ccfc7..00000000
--- a/drivers/gpu/nvgpu/gp10b/gp10b_sysfs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * GP10B specific sysfs files
- *
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#ifndef _GP10B_SYSFS_H_
-#define _GP10B_SYSFS_H_
-
-void gp10b_create_sysfs(struct device *dev);
-void gp10b_remove_sysfs(struct device *dev);
-
-#endif /*_GP10B_SYSFS_H_*/
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 3bddef4c..f27e2605 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -31,7 +31,6 @@
 
 #include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
-#include "gp10b_sysfs.h"
 
 #include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
@@ -2292,6 +2291,8 @@ static int gr_gp10b_init_preemption_state(struct gk20a *g)
                         gr_debug_2_gfxp_wfi_always_injects_wfi_enabled_f());
         gk20a_writel(g, gr_debug_2_r(), debug_2);
 
+        g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v();
+
         return 0;
 }
 
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
index 58844e8f..a113d22e 100644
--- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
@@ -23,7 +23,6 @@
 #include "gm20b/pmu_gm20b.h"
 
 #include "pmu_gp10b.h"
-#include "gp10b_sysfs.h"
 
 #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h>