From c3192b5acc03bf4e65aa1cbefb3a9ea88d87d9bd Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Mon, 22 May 2017 10:39:52 -0700 Subject: 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 Reviewed-on: http://git-master/r/1487240 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- include/trace/events/gk20a.h | 57 ++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 26 deletions(-) (limited to 'include/trace/events') 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, ); TRACE_EVENT(gk20a_mmu_fault, - TP_PROTO(u32 fault_hi, u32 fault_lo, - u32 fault_info, - u64 instance, + TP_PROTO(u64 fault_addr, + u32 fault_type, + u32 access_type, + u64 inst_ptr, u32 engine_id, - const char *engine, - const char *client, - const char *fault_type), - TP_ARGS(fault_hi, fault_lo, fault_info, - instance, engine_id, engine, client, fault_type), + const char *client_type_desc, + const char *client_id_desc, + const char *fault_type_desc), + TP_ARGS(fault_addr, fault_type, access_type, + inst_ptr, engine_id, client_type_desc, + client_id_desc, fault_type_desc), TP_STRUCT__entry( - __field(u32, fault_hi) - __field(u32, fault_lo) - __field(u32, fault_info) - __field(u64, instance) + __field(u64, fault_addr) + __field(u32, fault_type) + __field(u32, access_type) + __field(u64, inst_ptr) __field(u32, engine_id) - __field(const char *, engine) - __field(const char *, client) - __field(const char *, fault_type) + __field(const char *, client_type_desc) + __field(const char *, client_id_desc) + __field(const char *, fault_type_desc) ), TP_fast_assign( - __entry->fault_hi = fault_hi; - __entry->fault_lo = fault_lo; - __entry->fault_info = fault_info; - __entry->instance = instance; - __entry->engine_id = engine_id; - __entry->engine = engine; - __entry->client = client; + __entry->fault_addr = fault_addr; __entry->fault_type = fault_type; + __entry->access_type = access_type; + __entry->inst_ptr = inst_ptr; + __entry->engine_id = engine_id; + __entry->client_type_desc = client_type_desc; + __entry->client_id_desc = client_id_desc; + __entry->fault_type_desc = fault_type_desc; ), - TP_printk("fault=0x%x,%08x info=0x%x instance=0x%llx engine_id=%d engine=%s client=%s type=%s", - __entry->fault_hi, __entry->fault_lo, - __entry->fault_info, __entry->instance, __entry->engine_id, - __entry->engine, __entry->client, __entry->fault_type) + TP_printk("fault addr=0x%llx type=0x%x access_type=0x%x " + "instance=0x%llx engine_id=%d client_type=%s " + "client_id=%s fault type=%s", + __entry->fault_addr, __entry->fault_type, + __entry->access_type, __entry->inst_ptr, + __entry->engine_id, __entry->client_type_desc, + __entry->client_id_desc, __entry->fault_type_desc) ); TRACE_EVENT(gk20a_ltc_cbc_ctrl_start, -- cgit v1.2.2