Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37aab620 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

IB/hfi1: Fix trace of atomic ack 



The length is incorrect, causing the trace data to
be truncated.

Add the additional 8 bytes that should have been there.
Also trace out the atomic ack in hex to aid debugging.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent f3809209

drivers/infiniband/hw/hfi1/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ u8 ibhdr_exhdr_len(struct ib_header *hdr) 
#define AETH_PRN "aeth syn 0x%.2x %s msn 0x%.8x"

#define DETH_PRN "deth qkey 0x%.8x sqpn 0x%.6x"

#define IETH_PRN "ieth rkey 0x%.8x"

#define ATOMICACKETH_PRN "origdata %lld"

#define ATOMICETH_PRN "vaddr 0x%llx rkey 0x%.8x sdata %lld cdata %lld"

#define ATOMICACKETH_PRN "origdata %llx"

#define ATOMICETH_PRN "vaddr 0x%llx rkey 0x%.8x sdata %llx cdata %llx"



#define OP(transport, op) IB_OPCODE_## transport ## _ ## op

drivers/infiniband/hw/hfi1/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ const u8 hdr_len_by_opcode[256] = { 
	[IB_OPCODE_RC_RDMA_READ_RESPONSE_LAST]        = 12 + 8 + 4,

	[IB_OPCODE_RC_RDMA_READ_RESPONSE_ONLY]        = 12 + 8 + 4,

	[IB_OPCODE_RC_ACKNOWLEDGE]                    = 12 + 8 + 4,

	[IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE]             = 12 + 8 + 4,

	[IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE]             = 12 + 8 + 4 + 8,

	[IB_OPCODE_RC_COMPARE_SWAP]                   = 12 + 8 + 28,

	[IB_OPCODE_RC_FETCH_ADD]                      = 12 + 8 + 28,

	[IB_OPCODE_RC_SEND_LAST_WITH_INVALIDATE]      = 12 + 8 + 4,