diff options
author | Vinod G <vinodg@nvidia.com> | 2018-04-27 12:33:07 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-04 02:57:12 -0400 |
commit | 010439ba08891ce97c53c239b5bb8c4a2f5b5f01 (patch) | |
tree | 0f7b6fdf83176183ddb9ee24e71e652a31528314 /drivers/gpu/nvgpu/gp10b | |
parent | 76597927e4059fd763949f633ef4f8f412e45f6b (diff) |
gpu: nvgpu: add HALs to mmu fault descriptors.
mmu fault information for client and gpc differ
on various chip. Add separate table for each chip
based on that change and add hal functions to access
those descriptors.
bug 2050564
Change-Id: If15a4757762569d60d4ce1a6a47b8c9a93c11cb0
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1704105
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 56 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 3 |
3 files changed, 61 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 1436a260..66f3012f 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B fifo | 2 | * GP10B fifo |
3 | * | 3 | * |
4 | * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -317,3 +317,57 @@ void gp10b_fifo_get_mmu_fault_info(struct gk20a *g, u32 mmu_fault_id, | |||
317 | /* note: inst_ptr is a 40b phys addr. */ | 317 | /* note: inst_ptr is a 40b phys addr. */ |
318 | mmfault->inst_ptr <<= fifo_intr_mmu_fault_inst_ptr_align_shift_v(); | 318 | mmfault->inst_ptr <<= fifo_intr_mmu_fault_inst_ptr_align_shift_v(); |
319 | } | 319 | } |
320 | /* fault info/descriptions */ | ||
321 | static const char * const gp10b_fault_type_descs[] = { | ||
322 | "pde", /*fifo_intr_mmu_fault_info_type_pde_v() == 0 */ | ||
323 | "pde size", | ||
324 | "pte", | ||
325 | "va limit viol", | ||
326 | "unbound inst", | ||
327 | "priv viol", | ||
328 | "ro viol", | ||
329 | "wo viol", | ||
330 | "pitch mask", | ||
331 | "work creation", | ||
332 | "bad aperture", | ||
333 | "compression failure", | ||
334 | "bad kind", | ||
335 | "region viol", | ||
336 | "dual ptes", | ||
337 | "poisoned", | ||
338 | "atomic violation", | ||
339 | }; | ||
340 | |||
341 | static const char * const gp10b_hub_client_descs[] = { | ||
342 | "vip", "ce0", "ce1", "dniso", "fe", "fecs", "host", "host cpu", | ||
343 | "host cpu nb", "iso", "mmu", "mspdec", "msppp", "msvld", | ||
344 | "niso", "p2p", "pd", "perf", "pmu", "raster twod", "scc", | ||
345 | "scc nb", "sec", "ssync", "gr copy", "xv", "mmu nb", | ||
346 | "msenc", "d falcon", "sked", "a falcon", "n/a", | ||
347 | "hsce0", "hsce1", "hsce2", "hsce3", "hsce4", "hsce5", | ||
348 | "hsce6", "hsce7", "hsce8", "hsce9", "hshub", | ||
349 | "ptp x0", "ptp x1", "ptp x2", "ptp x3", "ptp x4", | ||
350 | "ptp x5", "ptp x6", "ptp x7", "vpr scrubber0", "vpr scrubber1", | ||
351 | }; | ||
352 | |||
353 | /* fill in mmu fault desc */ | ||
354 | void gp10b_fifo_get_mmu_fault_desc(struct mmu_fault_info *mmfault) | ||
355 | { | ||
356 | if (mmfault->fault_type >= ARRAY_SIZE(gp10b_fault_type_descs)) | ||
357 | WARN_ON(mmfault->fault_type >= | ||
358 | ARRAY_SIZE(gp10b_fault_type_descs)); | ||
359 | else | ||
360 | mmfault->fault_type_desc = | ||
361 | gp10b_fault_type_descs[mmfault->fault_type]; | ||
362 | } | ||
363 | |||
364 | /* fill in mmu fault client description */ | ||
365 | void gp10b_fifo_get_mmu_fault_client_desc(struct mmu_fault_info *mmfault) | ||
366 | { | ||
367 | if (mmfault->client_id >= ARRAY_SIZE(gp10b_hub_client_descs)) | ||
368 | WARN_ON(mmfault->client_id >= | ||
369 | ARRAY_SIZE(gp10b_hub_client_descs)); | ||
370 | else | ||
371 | mmfault->client_id_desc = | ||
372 | gp10b_hub_client_descs[mmfault->client_id]; | ||
373 | } | ||
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h index 20918483..2ab11eca 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B Fifo | 2 | * GP10B Fifo |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -42,6 +42,8 @@ void gp10b_device_info_data_parse(struct gk20a *g, u32 table_entry, | |||
42 | void gp10b_fifo_init_pbdma_intr_descs(struct fifo_gk20a *f); | 42 | void gp10b_fifo_init_pbdma_intr_descs(struct fifo_gk20a *f); |
43 | void gp10b_fifo_get_mmu_fault_info(struct gk20a *g, u32 mmu_fault_id, | 43 | void gp10b_fifo_get_mmu_fault_info(struct gk20a *g, u32 mmu_fault_id, |
44 | struct mmu_fault_info *mmfault); | 44 | struct mmu_fault_info *mmfault); |
45 | void gp10b_fifo_get_mmu_fault_desc(struct mmu_fault_info *mmfault); | ||
46 | void gp10b_fifo_get_mmu_fault_client_desc(struct mmu_fault_info *mmfault); | ||
45 | int channel_gp10b_commit_userd(struct channel_gk20a *c); | 47 | int channel_gp10b_commit_userd(struct channel_gk20a *c); |
46 | 48 | ||
47 | #endif | 49 | #endif |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 42350dbc..f0c6b410 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -451,6 +451,9 @@ static const struct gpu_ops gp10b_ops = { | |||
451 | .update_runlist = gk20a_fifo_update_runlist, | 451 | .update_runlist = gk20a_fifo_update_runlist, |
452 | .trigger_mmu_fault = gm20b_fifo_trigger_mmu_fault, | 452 | .trigger_mmu_fault = gm20b_fifo_trigger_mmu_fault, |
453 | .get_mmu_fault_info = gp10b_fifo_get_mmu_fault_info, | 453 | .get_mmu_fault_info = gp10b_fifo_get_mmu_fault_info, |
454 | .get_mmu_fault_desc = gp10b_fifo_get_mmu_fault_desc, | ||
455 | .get_mmu_fault_client_desc = gp10b_fifo_get_mmu_fault_client_desc, | ||
456 | .get_mmu_fault_gpc_desc = gm20b_fifo_get_mmu_fault_gpc_desc, | ||
454 | .wait_engine_idle = gk20a_fifo_wait_engine_idle, | 457 | .wait_engine_idle = gk20a_fifo_wait_engine_idle, |
455 | .get_num_fifos = gm20b_fifo_get_num_fifos, | 458 | .get_num_fifos = gm20b_fifo_get_num_fifos, |
456 | .get_pbdma_signature = gp10b_fifo_get_pbdma_signature, | 459 | .get_pbdma_signature = gp10b_fifo_get_pbdma_signature, |