Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8294f297 authored by Roland Dreier's avatar Roland Dreier
Browse files

RDMA/nes: Get rid of ring_doorbell parameter of nes_post_cqp_request() 



Every caller of nes_post_cqp_request() passed it NES_CQP_REQUEST_RING_DOORBELL,
so just remove that parameter and always ring the doorbell.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
Acked-by: default avatarFaisal Latif <flatif@neteffect.com>
parent 52c8084b

drivers/infiniband/hw/nes/nes.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ void nes_rem_ref(struct ib_qp *ibqp) 
		set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_WQE_ID_IDX, nesqp->hwqp.qp_id);

		u64temp = (u64)nesqp->nesqp_context_pbase;

		set_wqe_64bit_value(cqp_wqe->wqe_words, NES_CQP_QP_WQE_CONTEXT_LOW_IDX, u64temp);

		nes_post_cqp_request(nesdev, cqp_request, NES_CQP_REQUEST_RING_DOORBELL);

		nes_post_cqp_request(nesdev, cqp_request);

	}

}

drivers/infiniband/hw/nes/nes.h

+1 −4
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ 


#define MAX_DPC_ITERATIONS               128



#define NES_CQP_REQUEST_NO_DOORBELL_RING 0

#define NES_CQP_REQUEST_RING_DOORBELL    1



#define NES_DRV_OPT_ENABLE_MPA_VER_0     0x00000001

#define NES_DRV_OPT_DISABLE_MPA_CRC      0x00000002

#define NES_DRV_OPT_DISABLE_FIRST_WRITE  0x00000004
@@ -542,7 +539,7 @@ void nes_free_cqp_request(struct nes_device *nesdev, 
			  struct nes_cqp_request *cqp_request);

void nes_put_cqp_request(struct nes_device *nesdev,

			 struct nes_cqp_request *cqp_request);

void nes_post_cqp_request(struct nes_device *, struct nes_cqp_request *, int);

void nes_post_cqp_request(struct nes_device *, struct nes_cqp_request *);

int nes_arp_table(struct nes_device *, u32, u8 *, u32);

void nes_mh_fix(unsigned long);

void nes_clc(unsigned long);

drivers/infiniband/hw/nes/nes_hw.c

+3 −3
Original line number Diff line number Diff line
@@ -3147,7 +3147,7 @@ int nes_manage_apbvt(struct nes_vnic *nesvnic, u32 accel_local_port, 
	nes_debug(NES_DBG_QP, "Waiting for CQP completion for APBVT.\n");



	atomic_set(&cqp_request->refcount, 2);

	nes_post_cqp_request(nesdev, cqp_request, NES_CQP_REQUEST_RING_DOORBELL);

	nes_post_cqp_request(nesdev, cqp_request);



	if (add_port == NES_MANAGE_APBVT_ADD)

		ret = wait_event_timeout(cqp_request->waitq, (cqp_request->request_done != 0),
@@ -3217,7 +3217,7 @@ void nes_manage_arp_cache(struct net_device *netdev, unsigned char *mac_addr, 
			nesdev->cqp.sq_head, nesdev->cqp.sq_tail);



	atomic_set(&cqp_request->refcount, 1);

	nes_post_cqp_request(nesdev, cqp_request, NES_CQP_REQUEST_RING_DOORBELL);

	nes_post_cqp_request(nesdev, cqp_request);

}
@@ -3249,7 +3249,7 @@ void flush_wqes(struct nes_device *nesdev, struct nes_qp *nesqp, 
			cpu_to_le32(NES_CQP_FLUSH_WQES | which_wq);

	cqp_wqe->wqe_words[NES_CQP_WQE_ID_IDX] = cpu_to_le32(nesqp->hwqp.qp_id);



	nes_post_cqp_request(nesdev, cqp_request, NES_CQP_REQUEST_RING_DOORBELL);

	nes_post_cqp_request(nesdev, cqp_request);



	if (wait_completion) {

		/* Wait for CQP */

drivers/infiniband/hw/nes/nes_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ struct nes_vnic { 
	u32    mcrq_qp_id;

	struct nes_ucontext *mcrq_ucontext;

	struct nes_cqp_request* (*get_cqp_request)(struct nes_device *nesdev);

	void (*post_cqp_request)(struct nes_device*, struct nes_cqp_request *, int);

	void (*post_cqp_request)(struct nes_device*, struct nes_cqp_request *);

	int (*mcrq_mcast_filter)( struct nes_vnic* nesvnic, __u8* dmi_addr );

	struct net_device_stats netstats;

	/* used to put the netdev on the adapters logical port list */

drivers/infiniband/hw/nes/nes_utils.c

+4 −5
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ void nes_put_cqp_request(struct nes_device *nesdev, 
 * nes_post_cqp_request

 */

void nes_post_cqp_request(struct nes_device *nesdev,

		struct nes_cqp_request *cqp_request, int ring_doorbell)

			  struct nes_cqp_request *cqp_request)

{

	struct nes_hw_cqp_wqe *cqp_wqe;

	unsigned long flags;
@@ -624,10 +624,9 @@ void nes_post_cqp_request(struct nes_device *nesdev, 
				nesdev->cqp.sq_head, nesdev->cqp.sq_tail, nesdev->cqp.sq_size,

				cqp_request->waiting, atomic_read(&cqp_request->refcount));

		barrier();

		if (ring_doorbell) {



		/* Ring doorbell (1 WQEs) */

		nes_write32(nesdev->regs+NES_WQE_ALLOC, 0x01800000 | nesdev->cqp.qp_id);

		}



		barrier();

	} else {