tree ef082564fb6a3f9969278f611da96d4713d425bc
parent 44ea66879d5638cfed5b5ecf628badfd8ec26f36
author Michael S. Tsirkin <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:25 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:25 -0700
[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]>
infiniband/hw/mthca/mthca_cq.c | 36 +++++++++++++++++++++++++++++++++++-
infiniband/hw/mthca/mthca_dev.h | 13 +++++++++++++
infiniband/hw/mthca/mthca_qp.c | 13 -------------
3 files changed, 48 insertions(+), 14 deletions(-)
Index: drivers/infiniband/hw/mthca/mthca_cq.c
===================================================================
---
987bb5368a8e4a058cffc2eef4752d7cca4335e5/drivers/infiniband/hw/mthca/mthca_cq.c
(mode:100644 sha1:8b3ffd23e50527303ac4cbdad3db2c50c9a89702)
+++
ef082564fb6a3f9969278f611da96d4713d425bc/drivers/infiniband/hw/mthca/mthca_cq.c
(mode:100644 sha1:0ad954e18bd75f4399443fc930fc3b9ee03e5969)
@@ -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
===================================================================
---
987bb5368a8e4a058cffc2eef4752d7cca4335e5/drivers/infiniband/hw/mthca/mthca_dev.h
(mode:100644 sha1:f437979e8967c8ed425de62012e0cce36d63a5fb)
+++
ef082564fb6a3f9969278f611da96d4713d425bc/drivers/infiniband/hw/mthca/mthca_dev.h
(mode:100644 sha1:d4bd9aa232b18fe7ecbefcc4bf5bf426839c5594)
@@ -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
===================================================================
---
987bb5368a8e4a058cffc2eef4752d7cca4335e5/drivers/infiniband/hw/mthca/mthca_qp.c
(mode:100644 sha1:2d3b1815c04e431095af6fe05ce120f0e3785a3c)
+++
ef082564fb6a3f9969278f611da96d4713d425bc/drivers/infiniband/hw/mthca/mthca_qp.c
(mode:100644 sha1:997a34a2b2befb4f5a1c2ae750a3a13abbb11291)
@@ -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
