IB/hfi1: Remove rcvctrl from ctxtdata

It is only ever written.

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@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/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index c254f47a592236194c0a508772312fa11b5847d0..55675ab694a1cab8ff830fb9490b20cf22154bc1 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -11952,9 +11952,8 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op,
                rcvctrl |= RCV_CTXT_CTRL_DONT_DROP_EGR_FULL_SMASK;
        if (op & HFI1_RCVCTRL_NO_EGR_DROP_DIS)
                rcvctrl &= ~RCV_CTXT_CTRL_DONT_DROP_EGR_FULL_SMASK;
-       rcd->rcvctrl = rcvctrl;
        hfi1_cdbg(RCVCTRL, "ctxt %d rcvctrl 0x%llx\n", ctxt, rcvctrl);
-       write_kctxt_csr(dd, ctxt, RCV_CTXT_CTRL, rcd->rcvctrl);
+       write_kctxt_csr(dd, ctxt, RCV_CTXT_CTRL, rcvctrl);
 
        /* work around sticky RcvCtxtStatus.BlockedRHQFull */
        if (did_enable &&

diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 4a8e5930d539b3479f22193251ba05049701d42c..837f49c7cdb02d557ba63eea010c5f0daa2a547b 100644 (file)
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -193,8 +193,6 @@ struct exp_tid_set {
 
 typedef int (*rhf_rcv_function_ptr)(struct hfi1_packet *packet);
 struct hfi1_ctxtdata {
-       /* shadow the ctxt's RcvCtrl register */
-       u64 rcvctrl;
        /* rcvhdrq base, needs mmap before useful */
        void *rcvhdrq;
        /* kernel virtual address where hdrqtail is updated */