summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2018-04-17 20:26:34 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-04-25 12:36:42 -0400
commit98dce7eaac374ccd5c4d7cf6d76decc4e9cd3896 (patch)
treecbf7869961ed89cccfebf4c94a233bf4bf41ba10 /drivers/gpu/nvgpu/gv11b/fb_gv11b.c
parent687b1059f078daf41024b223065107bc16822e71 (diff)
gpu: nvgpu: move mss nvlink credit init to os specific code
The code uses ioremap, readl_relaxed/writel_relaxed, which only exists on linux. So move them to linux folder. Also fix build errors on qnx. Jira VQRM-2344 Change-Id: Ide1176d0bf954a804187aa842a6bbfdecbdb0286 Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1698973 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/fb_gv11b.c')
-rw-r--r--drivers/gpu/nvgpu/gv11b/fb_gv11b.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index 4ad350d1..30a2bca2 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -22,13 +22,12 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <linux/types.h>
26
27#include <nvgpu/dma.h> 25#include <nvgpu/dma.h>
28#include <nvgpu/log.h> 26#include <nvgpu/log.h>
29#include <nvgpu/enabled.h> 27#include <nvgpu/enabled.h>
30#include <nvgpu/gmmu.h> 28#include <nvgpu/gmmu.h>
31#include <nvgpu/barrier.h> 29#include <nvgpu/barrier.h>
30#include <nvgpu/bug.h>
32#include <nvgpu/soc.h> 31#include <nvgpu/soc.h>
33 32
34#include "gk20a/gk20a.h" 33#include "gk20a/gk20a.h"
@@ -57,37 +56,7 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g)
57 nvgpu_log(g, gpu_dbg_info, "nvlink soc credits init done by bpmp"); 56 nvgpu_log(g, gpu_dbg_info, "nvlink soc credits init done by bpmp");
58 } else { 57 } else {
59#ifndef __NVGPU_POSIX__ 58#ifndef __NVGPU_POSIX__
60 /* MSS_NVLINK_1_BASE */ 59 nvgpu_mss_nvlink_init_credits(g);
61 void __iomem *soc1 = ioremap(0x01f20010, 4096);
62 /* MSS_NVLINK_2_BASE */
63 void __iomem *soc2 = ioremap(0x01f40010, 4096);
64 /* MSS_NVLINK_3_BASE */
65 void __iomem *soc3 = ioremap(0x01f60010, 4096);
66 /* MSS_NVLINK_4_BASE */
67 void __iomem *soc4 = ioremap(0x01f80010, 4096);
68 u32 val;
69
70 nvgpu_log(g, gpu_dbg_info, "init nvlink soc credits");
71
72 val = readl_relaxed(soc1);
73 writel_relaxed(val, soc1);
74 val = readl_relaxed(soc1 + 4);
75 writel_relaxed(val, soc1 + 4);
76
77 val = readl_relaxed(soc2);
78 writel_relaxed(val, soc2);
79 val = readl_relaxed(soc2 + 4);
80 writel_relaxed(val, soc2 + 4);
81
82 val = readl_relaxed(soc3);
83 writel_relaxed(val, soc3);
84 val = readl_relaxed(soc3 + 4);
85 writel_relaxed(val, soc3 + 4);
86
87 val = readl_relaxed(soc4);
88 writel_relaxed(val, soc4);
89 val = readl_relaxed(soc4 + 4);
90 writel_relaxed(val, soc4 + 4);
91#endif 60#endif
92 } 61 }
93} 62}