diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-05-22 13:39:52 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-30 14:04:05 -0400 |
commit | c3192b5acc03bf4e65aa1cbefb3a9ea88d87d9bd (patch) | |
tree | 8b28808f3b90ea54981153d42e640133f0ce0e1b /include | |
parent | e8f4e52efe6bfd019c8be5de6ebf07f56463d562 (diff) |
gpu: nvgpu: use mmu_fault_info struct for legacy gpu chips
Removed fifo_mmu_fault_info_gk20a struct to use
new mmu_fault_info struct
JIRA GPUT19X-7
JIRA GPUT19X-12
Change-Id: I1987ff1b07e7dbdbee58d7e5f585faacf4846e54
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1487240
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/trace/events/gk20a.h | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/include/trace/events/gk20a.h b/include/trace/events/gk20a.h index ae5255a4..3a8c8d23 100644 --- a/include/trace/events/gk20a.h +++ b/include/trace/events/gk20a.h | |||
@@ -463,39 +463,44 @@ TRACE_EVENT(gk20a_as_ioctl_get_va_regions, | |||
463 | ); | 463 | ); |
464 | 464 | ||
465 | TRACE_EVENT(gk20a_mmu_fault, | 465 | TRACE_EVENT(gk20a_mmu_fault, |
466 | TP_PROTO(u32 fault_hi, u32 fault_lo, | 466 | TP_PROTO(u64 fault_addr, |
467 | u32 fault_info, | 467 | u32 fault_type, |
468 | u64 instance, | 468 | u32 access_type, |
469 | u64 inst_ptr, | ||
469 | u32 engine_id, | 470 | u32 engine_id, |
470 | const char *engine, | 471 | const char *client_type_desc, |
471 | const char *client, | 472 | const char *client_id_desc, |
472 | const char *fault_type), | 473 | const char *fault_type_desc), |
473 | TP_ARGS(fault_hi, fault_lo, fault_info, | 474 | TP_ARGS(fault_addr, fault_type, access_type, |
474 | instance, engine_id, engine, client, fault_type), | 475 | inst_ptr, engine_id, client_type_desc, |
476 | client_id_desc, fault_type_desc), | ||
475 | TP_STRUCT__entry( | 477 | TP_STRUCT__entry( |
476 | __field(u32, fault_hi) | 478 | __field(u64, fault_addr) |
477 | __field(u32, fault_lo) | 479 | __field(u32, fault_type) |
478 | __field(u32, fault_info) | 480 | __field(u32, access_type) |
479 | __field(u64, instance) | 481 | __field(u64, inst_ptr) |
480 | __field(u32, engine_id) | 482 | __field(u32, engine_id) |
481 | __field(const char *, engine) | 483 | __field(const char *, client_type_desc) |
482 | __field(const char *, client) | 484 | __field(const char *, client_id_desc) |
483 | __field(const char *, fault_type) | 485 | __field(const char *, fault_type_desc) |
484 | ), | 486 | ), |
485 | TP_fast_assign( | 487 | TP_fast_assign( |
486 | __entry->fault_hi = fault_hi; | 488 | __entry->fault_addr = fault_addr; |
487 | __entry->fault_lo = fault_lo; | ||
488 | __entry->fault_info = fault_info; | ||
489 | __entry->instance = instance; | ||
490 | __entry->engine_id = engine_id; | ||
491 | __entry->engine = engine; | ||
492 | __entry->client = client; | ||
493 | __entry->fault_type = fault_type; | 489 | __entry->fault_type = fault_type; |
490 | __entry->access_type = access_type; | ||
491 | __entry->inst_ptr = inst_ptr; | ||
492 | __entry->engine_id = engine_id; | ||
493 | __entry->client_type_desc = client_type_desc; | ||
494 | __entry->client_id_desc = client_id_desc; | ||
495 | __entry->fault_type_desc = fault_type_desc; | ||
494 | ), | 496 | ), |
495 | TP_printk("fault=0x%x,%08x info=0x%x instance=0x%llx engine_id=%d engine=%s client=%s type=%s", | 497 | TP_printk("fault addr=0x%llx type=0x%x access_type=0x%x " |
496 | __entry->fault_hi, __entry->fault_lo, | 498 | "instance=0x%llx engine_id=%d client_type=%s " |
497 | __entry->fault_info, __entry->instance, __entry->engine_id, | 499 | "client_id=%s fault type=%s", |
498 | __entry->engine, __entry->client, __entry->fault_type) | 500 | __entry->fault_addr, __entry->fault_type, |
501 | __entry->access_type, __entry->inst_ptr, | ||
502 | __entry->engine_id, __entry->client_type_desc, | ||
503 | __entry->client_id_desc, __entry->fault_type_desc) | ||
499 | ); | 504 | ); |
500 | 505 | ||
501 | TRACE_EVENT(gk20a_ltc_cbc_ctrl_start, | 506 | TRACE_EVENT(gk20a_ltc_cbc_ctrl_start, |