tree 7c29f6013d76eb7226bdc648b35524f532342452
parent 5ea0ab9dcdbd8fc35149779aff3af1d1e4e4eec4
author Michael S. Tsirkin <[EMAIL PROTECTED]> Tue Apr 12 08:26:51 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:51 2005
[PATCH] IB/mthca: fill in opcode field for send completions
Fill in missing fields in send completions.
Signed-off-by: Itamar Rabenstein <[EMAIL PROTECTED]>
Signed-off-by: Michael S. Tsirkin <[EMAIL PROTECTED]>
Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
mthca_cq.c | 36 +++++++++++++++++++++++++++++++++++-
mthca_dev.h | 13 +++++++++++++
mthca_qp.c | 13 -------------
3 files changed, 48 insertions(+), 14 deletions(-)
Index: drivers/infiniband/hw/mthca/mthca_cq.c
===================================================================
---
a491f9b095ed340d0e284fab5ee2575c8db667df/drivers/infiniband/hw/mthca/mthca_cq.c
(mode:100644 sha1:25e3cf1bc43ae955efc0aa336c9264e8fdd4bf51)
+++
7c29f6013d76eb7226bdc648b35524f532342452/drivers/infiniband/hw/mthca/mthca_cq.c
(mode:100644 sha1:ffe0507595247498d368cf471e6cec1b3882173e)
@@ -473,7 +473,41 @@
}
if (is_send) {
- entry->opcode = IB_WC_SEND; /* XXX */
+ entry->wc_flags = 0;
+ switch (cqe->opcode) {
+ case MTHCA_OPCODE_RDMA_WRITE:
+ entry->opcode = IB_WC_RDMA_WRITE;
+ break;
+ case MTHCA_OPCODE_RDMA_WRITE_IMM:
+ entry->opcode = IB_WC_RDMA_WRITE;
+ entry->wc_flags |= IB_WC_WITH_IMM;
+ break;
+ case MTHCA_OPCODE_SEND:
+ entry->opcode = IB_WC_SEND;
+ break;
+ case MTHCA_OPCODE_SEND_IMM:
+ entry->opcode = IB_WC_SEND;
+ entry->wc_flags |= IB_WC_WITH_IMM;
+ break;
+ case MTHCA_OPCODE_RDMA_READ:
+ entry->opcode = IB_WC_RDMA_READ;
+ entry->byte_len = be32_to_cpu(cqe->byte_cnt);
+ break;
+ case MTHCA_OPCODE_ATOMIC_CS:
+ entry->opcode = IB_WC_COMP_SWAP;
+ entry->byte_len = be32_to_cpu(cqe->byte_cnt);
+ break;
+ case MTHCA_OPCODE_ATOMIC_FA:
+ entry->opcode = IB_WC_FETCH_ADD;
+ entry->byte_len = be32_to_cpu(cqe->byte_cnt);
+ break;
+ case MTHCA_OPCODE_BIND_MW:
+ entry->opcode = IB_WC_BIND_MW;
+ break;
+ default:
+ entry->opcode = MTHCA_OPCODE_INVALID;
+ break;
+ }
} else {
entry->byte_len = be32_to_cpu(cqe->byte_cnt);
switch (cqe->opcode & 0x1f) {
Index: drivers/infiniband/hw/mthca/mthca_dev.h
===================================================================
---
a491f9b095ed340d0e284fab5ee2575c8db667df/drivers/infiniband/hw/mthca/mthca_dev.h
(mode:100644 sha1:695ec26a156cbc81cb7eb5c2f229922b9e9a35f3)
+++
7c29f6013d76eb7226bdc648b35524f532342452/drivers/infiniband/hw/mthca/mthca_dev.h
(mode:100644 sha1:b57189632c9ced8311110350fdb3d56be80b1c25)
@@ -88,6 +88,19 @@
MTHCA_NUM_EQ
};
+enum {
+ MTHCA_OPCODE_NOP = 0x00,
+ MTHCA_OPCODE_RDMA_WRITE = 0x08,
+ MTHCA_OPCODE_RDMA_WRITE_IMM = 0x09,
+ MTHCA_OPCODE_SEND = 0x0a,
+ MTHCA_OPCODE_SEND_IMM = 0x0b,
+ MTHCA_OPCODE_RDMA_READ = 0x10,
+ MTHCA_OPCODE_ATOMIC_CS = 0x11,
+ MTHCA_OPCODE_ATOMIC_FA = 0x12,
+ MTHCA_OPCODE_BIND_MW = 0x18,
+ MTHCA_OPCODE_INVALID = 0xff
+};
+
struct mthca_cmd {
int use_events;
struct semaphore hcr_sem;
Index: drivers/infiniband/hw/mthca/mthca_qp.c
===================================================================
---
a491f9b095ed340d0e284fab5ee2575c8db667df/drivers/infiniband/hw/mthca/mthca_qp.c
(mode:100644 sha1:f1f0838c9fb39a73ab9e8cfe94fc956b278d62ca)
+++
7c29f6013d76eb7226bdc648b35524f532342452/drivers/infiniband/hw/mthca/mthca_qp.c
(mode:100644 sha1:b0675185f50e5523bd3d218df809e5411d81701e)
@@ -171,19 +171,6 @@
};
enum {
- MTHCA_OPCODE_NOP = 0x00,
- MTHCA_OPCODE_RDMA_WRITE = 0x08,
- MTHCA_OPCODE_RDMA_WRITE_IMM = 0x09,
- MTHCA_OPCODE_SEND = 0x0a,
- MTHCA_OPCODE_SEND_IMM = 0x0b,
- MTHCA_OPCODE_RDMA_READ = 0x10,
- MTHCA_OPCODE_ATOMIC_CS = 0x11,
- MTHCA_OPCODE_ATOMIC_FA = 0x12,
- MTHCA_OPCODE_BIND_MW = 0x18,
- MTHCA_OPCODE_INVALID = 0xff
-};
-
-enum {
MTHCA_NEXT_DBD = 1 << 7,
MTHCA_NEXT_FENCE = 1 << 6,
MTHCA_NEXT_CQ_UPDATE = 1 << 3,
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
