From 30e07416cf48801f127019c1dfece8039f1da8e2 Mon Sep 17 00:00:00 2001 From: Don Hiatt Date: Fri, 4 Aug 2017 13:54:04 -0700 Subject: IB/hfi1: Add support to send 16B bypass packets We introduce struct hfi1_opa_header as a union of ib (9B) and 16B headers. Reviewed-by: Dennis Dalessandro Signed-off-by: Dasaratharaman Chandramouli Signed-off-by: Don Hiatt Signed-off-by: Dennis Dalessandro Signed-off-by: Doug Ledford --- drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'drivers/infiniband/hw/hfi1/trace_ibhdrs.h') diff --git a/drivers/infiniband/hw/hfi1/trace_ibhdrs.h b/drivers/infiniband/hw/hfi1/trace_ibhdrs.h index 0f2d2da057ec..73240255ffc5 100644 --- a/drivers/infiniband/hw/hfi1/trace_ibhdrs.h +++ b/drivers/infiniband/hw/hfi1/trace_ibhdrs.h @@ -213,9 +213,9 @@ DEFINE_EVENT(hfi1_input_ibhdr_template, input_ibhdr, DECLARE_EVENT_CLASS(hfi1_output_ibhdr_template, TP_PROTO(struct hfi1_devdata *dd, - struct ib_header *hdr, + struct hfi1_opa_header *opah, bool sc5), - TP_ARGS(dd, hdr, sc5), + TP_ARGS(dd, opah, sc5), TP_STRUCT__entry( DD_DEV_ENTRY(dd) __field(u8, lnh) @@ -238,10 +238,11 @@ DECLARE_EVENT_CLASS(hfi1_output_ibhdr_template, __field(u32, psn) /* extended headers */ __dynamic_array(u8, ehdrs, - hfi1_trace_ib_hdr_len(hdr)) + hfi1_trace_ib_hdr_len(&opah->ibh)) ), TP_fast_assign( struct ib_other_headers *ohdr; + struct ib_header *hdr = &opah->ibh; DD_DEV_ASSIGN(dd); @@ -294,18 +295,18 @@ DECLARE_EVENT_CLASS(hfi1_output_ibhdr_template, DEFINE_EVENT(hfi1_output_ibhdr_template, pio_output_ibhdr, TP_PROTO(struct hfi1_devdata *dd, - struct ib_header *hdr, bool sc5), - TP_ARGS(dd, hdr, sc5)); + struct hfi1_opa_header *opah, bool sc5), + TP_ARGS(dd, opah, sc5)); DEFINE_EVENT(hfi1_output_ibhdr_template, ack_output_ibhdr, TP_PROTO(struct hfi1_devdata *dd, - struct ib_header *hdr, bool sc5), - TP_ARGS(dd, hdr, sc5)); + struct hfi1_opa_header *opah, bool sc5), + TP_ARGS(dd, opah, sc5)); DEFINE_EVENT(hfi1_output_ibhdr_template, sdma_output_ibhdr, TP_PROTO(struct hfi1_devdata *dd, - struct ib_header *hdr, bool sc5), - TP_ARGS(dd, hdr, sc5)); + struct hfi1_opa_header *opah, bool sc5), + TP_ARGS(dd, opah, sc5)); #endif /* __HFI1_TRACE_IBHDRS_H */ -- cgit v1.2.3-59-g8ed1b