Commit f18b2039 authored Oct 09, 2017 by Don Hiatt Committed by Greg Kroah-Hartman Dec 20, 2017

IB/hfi1: Mask out A bit from psn trace




[ Upstream commit d0a2f454713a42447ee4007582c0e43c47bcf230 ]

The trace logic prior to the fixes below used to mask the
A bit from the psn. It now mistakenly displays the A bit,
which is already displayed separately.

Fix by adding the appropriate mask to the psn tracing.

Fixes: 228d2af1 ("IB/hfi1: Separate input/output header tracing")
Fixes: 863cf89d ("IB/hfi1: Add 16B trace support")
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 4e2836b4

drivers/infiniband/hw/hfi1/trace.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ void hfi1_trace_parse_9b_bth(struct ib_other_headers *ohdr,
		*opcode = ib_bth_get_opcode(ohdr);
		*tver = ib_bth_get_tver(ohdr);
		*pkey = ib_bth_get_pkey(ohdr);
		*psn = ib_bth_get_psn(ohdr);
		*psn = mask_psn(ib_bth_get_psn(ohdr));
		*qpn = ib_bth_get_qpn(ohdr);
		}

		@@ -169,7 +169,7 @@ void hfi1_trace_parse_16b_bth(struct ib_other_headers *ohdr,
		*pad = ib_bth_get_pad(ohdr);
		*se = ib_bth_get_se(ohdr);
		*tver = ib_bth_get_tver(ohdr);
		*psn = ib_bth_get_psn(ohdr);
		*psn = mask_psn(ib_bth_get_psn(ohdr));
		*qpn = ib_bth_get_qpn(ohdr);
		}