IB/hfi1: Remove reference to RHF.VCRCErr

The bit VCRCErr in the receive header flag is actually a
reserved field. Remove bit operations on this field.

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: John Fleck <john.fleck@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hfi1/common.h b/drivers/infiniband/hw/hfi1/common.h
index 7310a5dba420f2b28ea7f13c7b65d74f5e8485be..d47da7b0438f49bc4c89493b08c5d249142f3f77 100644 (file)
--- a/drivers/infiniband/hw/hfi1/common.h
+++ b/drivers/infiniband/hw/hfi1/common.h
@@ -286,7 +286,7 @@ struct diag_pkt {
 #define RHF_TID_ERR            (0x1ull << 59)
 #define RHF_LEN_ERR            (0x1ull << 60)
 #define RHF_ECC_ERR            (0x1ull << 61)
-#define RHF_VCRC_ERR           (0x1ull << 62)
+#define RHF_RESERVED           (0x1ull << 62)
 #define RHF_ICRC_ERR           (0x1ull << 63)
 
 #define RHF_ERROR_SMASK 0xffe0000000000000ull          /* bits 63:53 */

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index 129e48ec9ee0fbded8f126e29b016d412c2dea37..01aa1f132f55e960dbffbdd79bcbbb8ade0ef8fe 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -262,7 +262,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd,
            hfi1_dbg_fault_suppress_err(verbs_dev))
                return;
 
-       if (packet->rhf & (RHF_VCRC_ERR | RHF_ICRC_ERR))
+       if (packet->rhf & RHF_ICRC_ERR)
                return;
 
        if (packet->etype == RHF_RCV_TYPE_BYPASS) {
@@ -1581,7 +1581,7 @@ static void show_eflags_errs(struct hfi1_packet *packet)
        u32 rte = rhf_rcv_type_err(packet->rhf);
 
        dd_dev_err(rcd->dd,
-                  "receive context %d: rhf 0x%016llx, errs [ %s%s%s%s%s%s%s%s] rte 0x%x\n",
+                  "receive context %d: rhf 0x%016llx, errs [ %s%s%s%s%s%s%s] rte 0x%x\n",
                   rcd->ctxt, packet->rhf,
                   packet->rhf & RHF_K_HDR_LEN_ERR ? "k_hdr_len " : "",
                   packet->rhf & RHF_DC_UNC_ERR ? "dc_unc " : "",
@@ -1589,7 +1589,6 @@ static void show_eflags_errs(struct hfi1_packet *packet)
                   packet->rhf & RHF_TID_ERR ? "tid " : "",
                   packet->rhf & RHF_LEN_ERR ? "len " : "",
                   packet->rhf & RHF_ECC_ERR ? "ecc " : "",
-                  packet->rhf & RHF_VCRC_ERR ? "vcrc " : "",
                   packet->rhf & RHF_ICRC_ERR ? "icrc " : "",
                   rte);
 }

diff --git a/drivers/infiniband/hw/hfi1/tid_rdma.c b/drivers/infiniband/hw/hfi1/tid_rdma.c
index eae6f05ca2fa1e018acde5c82a36e9d60458a034..cf72bf39ff1ef5c762cce05ae44e25d4150aa4ca 100644 (file)
--- a/drivers/infiniband/hw/hfi1/tid_rdma.c
+++ b/drivers/infiniband/hw/hfi1/tid_rdma.c
@@ -2920,7 +2920,7 @@ bool hfi1_handle_kdeth_eflags(struct hfi1_ctxtdata *rcd,
 
        trace_hfi1_msg_handle_kdeth_eflags(NULL, "Kdeth error: rhf ",
                                           packet->rhf);
-       if (packet->rhf & (RHF_VCRC_ERR | RHF_ICRC_ERR))
+       if (packet->rhf & RHF_ICRC_ERR)
                return ret;
 
        packet->ohdr = &hdr->u.oth;