summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/io.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/io.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/io.c b/drivers/gpu/nvgpu/common/linux/io.c
index cde90ddd..c06512a5 100644
--- a/drivers/gpu/nvgpu/common/linux/io.c
+++ b/drivers/gpu/nvgpu/common/linux/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms and conditions of the GNU General Public License, 5 * under the terms and conditions of the GNU General Public License,
@@ -23,11 +23,11 @@ void nvgpu_writel(struct gk20a *g, u32 r, u32 v)
23 23
24 if (unlikely(!l->regs)) { 24 if (unlikely(!l->regs)) {
25 __gk20a_warn_on_no_regs(); 25 __gk20a_warn_on_no_regs();
26 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v); 26 nvgpu_log(g, gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v);
27 } else { 27 } else {
28 writel_relaxed(v, l->regs + r); 28 writel_relaxed(v, l->regs + r);
29 nvgpu_wmb(); 29 nvgpu_wmb();
30 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x", r, v); 30 nvgpu_log(g, gpu_dbg_reg, "r=0x%x v=0x%x", r, v);
31 } 31 }
32} 32}
33 33
@@ -48,10 +48,10 @@ u32 __nvgpu_readl(struct gk20a *g, u32 r)
48 48
49 if (unlikely(!l->regs)) { 49 if (unlikely(!l->regs)) {
50 __gk20a_warn_on_no_regs(); 50 __gk20a_warn_on_no_regs();
51 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v); 51 nvgpu_log(g, gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v);
52 } else { 52 } else {
53 v = readl(l->regs + r); 53 v = readl(l->regs + r);
54 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x", r, v); 54 nvgpu_log(g, gpu_dbg_reg, "r=0x%x v=0x%x", r, v);
55 } 55 }
56 56
57 return v; 57 return v;
@@ -63,13 +63,13 @@ void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v)
63 63
64 if (unlikely(!l->regs)) { 64 if (unlikely(!l->regs)) {
65 __gk20a_warn_on_no_regs(); 65 __gk20a_warn_on_no_regs();
66 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v); 66 nvgpu_log(g, gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v);
67 } else { 67 } else {
68 nvgpu_wmb(); 68 nvgpu_wmb();
69 do { 69 do {
70 writel_relaxed(v, l->regs + r); 70 writel_relaxed(v, l->regs + r);
71 } while (readl(l->regs + r) != v); 71 } while (readl(l->regs + r) != v);
72 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x", r, v); 72 nvgpu_log(g, gpu_dbg_reg, "r=0x%x v=0x%x", r, v);
73 } 73 }
74} 74}
75 75
@@ -79,11 +79,11 @@ void nvgpu_bar1_writel(struct gk20a *g, u32 b, u32 v)
79 79
80 if (unlikely(!l->bar1)) { 80 if (unlikely(!l->bar1)) {
81 __gk20a_warn_on_no_regs(); 81 __gk20a_warn_on_no_regs();
82 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x (failed)", b, v); 82 nvgpu_log(g, gpu_dbg_reg, "b=0x%x v=0x%x (failed)", b, v);
83 } else { 83 } else {
84 nvgpu_wmb(); 84 nvgpu_wmb();
85 writel_relaxed(v, l->bar1 + b); 85 writel_relaxed(v, l->bar1 + b);
86 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x", b, v); 86 nvgpu_log(g, gpu_dbg_reg, "b=0x%x v=0x%x", b, v);
87 } 87 }
88} 88}
89 89
@@ -94,10 +94,10 @@ u32 nvgpu_bar1_readl(struct gk20a *g, u32 b)
94 94
95 if (unlikely(!l->bar1)) { 95 if (unlikely(!l->bar1)) {
96 __gk20a_warn_on_no_regs(); 96 __gk20a_warn_on_no_regs();
97 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x (failed)", b, v); 97 nvgpu_log(g, gpu_dbg_reg, "b=0x%x v=0x%x (failed)", b, v);
98 } else { 98 } else {
99 v = readl(l->bar1 + b); 99 v = readl(l->bar1 + b);
100 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x", b, v); 100 nvgpu_log(g, gpu_dbg_reg, "b=0x%x v=0x%x", b, v);
101 } 101 }
102 102
103 return v; 103 return v;