diff options
-rw-r--r-- | drivers/gpu/nvgpu/common/sim.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/sim_pci.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/sim.h | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c index 8261f270..618e8ffb 100644 --- a/drivers/gpu/nvgpu/common/sim.c +++ b/drivers/gpu/nvgpu/common/sim.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/hw_sim.h> | 28 | #include <nvgpu/hw_sim.h> |
29 | #include <nvgpu/sim.h> | 29 | #include <nvgpu/sim.h> |
30 | #include <nvgpu/utils.h> | 30 | #include <nvgpu/utils.h> |
31 | #include <nvgpu/bug.h> | ||
31 | 32 | ||
32 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
33 | 34 | ||
@@ -215,7 +216,7 @@ static int issue_rpc_and_wait(struct gk20a *g) | |||
215 | return 0; | 216 | return 0; |
216 | } | 217 | } |
217 | 218 | ||
218 | static int nvgpu_sim_esc_readl(struct gk20a *g, | 219 | static void nvgpu_sim_esc_readl(struct gk20a *g, |
219 | char *path, u32 index, u32 *data) | 220 | char *path, u32 index, u32 *data) |
220 | { | 221 | { |
221 | int err; | 222 | int err; |
@@ -232,9 +233,12 @@ static int nvgpu_sim_esc_readl(struct gk20a *g, | |||
232 | 233 | ||
233 | err = issue_rpc_and_wait(g); | 234 | err = issue_rpc_and_wait(g); |
234 | 235 | ||
235 | if (!err) | 236 | if (err == 0) { |
236 | memcpy(data, sim_msg_param(g, data_offset), sizeof(u32)); | 237 | memcpy(data, sim_msg_param(g, data_offset), sizeof(u32)); |
237 | return err; | 238 | } else { |
239 | *data = 0xffffffff; | ||
240 | WARN(1, "issue_rpc_and_wait failed err=%d", err); | ||
241 | } | ||
238 | } | 242 | } |
239 | 243 | ||
240 | static void nvgpu_sim_init_late(struct gk20a *g) | 244 | static void nvgpu_sim_init_late(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c index edf2a401..5f2344b4 100644 --- a/drivers/gpu/nvgpu/common/sim_pci.c +++ b/drivers/gpu/nvgpu/common/sim_pci.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/sim.h> | 27 | #include <nvgpu/sim.h> |
28 | #include <nvgpu/io.h> | 28 | #include <nvgpu/io.h> |
29 | #include <nvgpu/utils.h> | 29 | #include <nvgpu/utils.h> |
30 | #include <nvgpu/bug.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
32 | 33 | ||
@@ -183,7 +184,7 @@ static int issue_rpc_and_wait(struct gk20a *g) | |||
183 | return 0; | 184 | return 0; |
184 | } | 185 | } |
185 | 186 | ||
186 | static int nvgpu_sim_esc_readl(struct gk20a *g, | 187 | static void nvgpu_sim_esc_readl(struct gk20a *g, |
187 | char *path, u32 index, u32 *data) | 188 | char *path, u32 index, u32 *data) |
188 | { | 189 | { |
189 | int err; | 190 | int err; |
@@ -200,9 +201,12 @@ static int nvgpu_sim_esc_readl(struct gk20a *g, | |||
200 | 201 | ||
201 | err = issue_rpc_and_wait(g); | 202 | err = issue_rpc_and_wait(g); |
202 | 203 | ||
203 | if (!err) | 204 | if (err == 0) { |
204 | memcpy(data, sim_msg_param(g, data_offset + 0xc), sizeof(u32)); | 205 | memcpy(data, sim_msg_param(g, data_offset + 0xc), sizeof(u32)); |
205 | return err; | 206 | } else { |
207 | *data = 0xffffffff; | ||
208 | WARN(1, "issue_rpc_and_wait failed err=%d", err); | ||
209 | } | ||
206 | } | 210 | } |
207 | 211 | ||
208 | static void nvgpu_sim_init_late(struct gk20a *g) | 212 | static void nvgpu_sim_init_late(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sim.h b/drivers/gpu/nvgpu/include/nvgpu/sim.h index fe8e8ac6..41cee8d0 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/sim.h +++ b/drivers/gpu/nvgpu/include/nvgpu/sim.h | |||
@@ -36,7 +36,7 @@ struct sim_nvgpu { | |||
36 | struct nvgpu_mem msg_bfr; | 36 | struct nvgpu_mem msg_bfr; |
37 | void (*sim_init_late)(struct gk20a *); | 37 | void (*sim_init_late)(struct gk20a *); |
38 | void (*remove_support)(struct gk20a *); | 38 | void (*remove_support)(struct gk20a *); |
39 | int (*esc_readl)( | 39 | void (*esc_readl)( |
40 | struct gk20a *g, char *path, u32 index, u32 *data); | 40 | struct gk20a *g, char *path, u32 index, u32 *data); |
41 | }; | 41 | }; |
42 | #ifdef __KERNEL__ | 42 | #ifdef __KERNEL__ |