From 68593e2b106853854a8f221696760deb69595a4c Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Fri, 6 Jan 2006 13:13:32 -0800 Subject: [PATCH] --- yaml --- r: 17071 b: refs/heads/master c: 0f8e8f9607d77ffc1f9820446dfcf781e96fdfd4 h: refs/heads/master i: 17069: c6828fdc0bb51ef2386610bf30fbcf0951319364 17067: d7206756d7eab0cd08ce46fc5f848d64f4cb70b5 17063: 3128a5653380792f766e11d84d4843071e0725e7 17055: 4e606d00a5ea13cceba7e4bd2f370b615c85943c v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_cq.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4df68ecb21bd..f75c09ddd9b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ceb74557c71465cf8f6fda050aac00e53f9ad3d +refs/heads/master: 0f8e8f9607d77ffc1f9820446dfcf781e96fdfd4 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_cq.c b/trunk/drivers/infiniband/hw/mthca/mthca_cq.c index fcef8dc2c121..96f1a86bf049 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_cq.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_cq.c @@ -128,12 +128,12 @@ struct mthca_err_cqe { __be32 my_qpn; u32 reserved1[3]; u8 syndrome; - u8 reserved2; + u8 vendor_err; __be16 db_cnt; - u32 reserved3; + u32 reserved2; __be32 wqe; u8 opcode; - u8 reserved4[2]; + u8 reserved3[2]; u8 owner; }; @@ -342,8 +342,8 @@ static int handle_error_cqe(struct mthca_dev *dev, struct mthca_cq *cq, } /* - * For completions in error, only work request ID, status (and - * freed resource count for RD) have to be set. + * For completions in error, only work request ID, status, vendor error + * (and freed resource count for RD) have to be set. */ switch (cqe->syndrome) { case SYNDROME_LOCAL_LENGTH_ERR: @@ -405,6 +405,8 @@ static int handle_error_cqe(struct mthca_dev *dev, struct mthca_cq *cq, break; } + entry->vendor_err = cqe->vendor_err; + /* * Mem-free HCAs always generate one CQE per WQE, even in the * error case, so we don't have to check the doorbell count, etc.