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

Commit 4513f925 authored by Ariel Elior's avatar Ariel Elior Committed by David S. Miller
Browse files

bnx2x: Add to VF <-> PF channel the release request 



VF driver uses this request when removed. The PF driver
reclaims all resources allocated for that VF at this
time.

Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be1f1ffa

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+1 −0
Original line number Diff line number Diff line
@@ -2220,6 +2220,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, 
int bnx2x_get_vf_id(struct bnx2x *bp, u32 *vf_id);

int bnx2x_send_msg2pf(struct bnx2x *bp, u8 *done, dma_addr_t msg_mapping);

int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count);

int bnx2x_vfpf_release(struct bnx2x *bp);

/* Congestion management fairness mode */

#define CMNG_FNS_NONE		0

#define CMNG_FNS_MINMAX		1

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+43 −0
Original line number Diff line number Diff line
@@ -12363,6 +12363,9 @@ static void bnx2x_remove_one(struct pci_dev *pdev) 


	/* Make sure RESET task is not scheduled before continuing */

	cancel_delayed_work_sync(&bp->sp_rtnl_task);

	/* send message via vfpf channel to release the resources of this vf */

	if (IS_VF(bp))

		bnx2x_vfpf_release(bp);



	if (bp->regview)

		iounmap(bp->regview);
@@ -13343,3 +13346,43 @@ int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count) 


	return 0;

}



int bnx2x_vfpf_release(struct bnx2x *bp)

{

	struct vfpf_release_tlv *req = &bp->vf2pf_mbox->req.release;

	struct pfvf_general_resp_tlv *resp = &bp->vf2pf_mbox->resp.general_resp;

	u32 rc = 0, vf_id;



	/* clear mailbox and prep first tlv */

	bnx2x_vfpf_prep(bp, &req->first_tlv, CHANNEL_TLV_RELEASE, sizeof(*req));



	if (bnx2x_get_vf_id(bp, &vf_id))

		return -EAGAIN;



	req->vf_id = vf_id;



	/* add list termination tlv */

	bnx2x_add_tlv(bp, req, req->first_tlv.tl.length, CHANNEL_TLV_LIST_END,

		      sizeof(struct channel_list_end_tlv));



	/* output tlvs list */

	bnx2x_dp_tlv_list(bp, req);



	/* send release request */

	rc = bnx2x_send_msg2pf(bp, &resp->hdr.status, bp->vf2pf_mbox_mapping);



	if (rc)

		/* PF timeout */

		return rc;

	if (resp->hdr.status == PFVF_STATUS_SUCCESS) {

		/* PF released us */

		DP(BNX2X_MSG_SP, "vf released\n");

	} else {

		/* PF reports error */

		BNX2X_ERR("PF failed our release request - are we out of sync? response status: %d\n",

			  resp->hdr.status);

		return -EAGAIN;

	}



	return 0;

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h

+15 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ struct pfvf_tlv { 
	u8 padding[3];

};



/* response tlv used for most tlvs */

struct pfvf_general_resp_tlv {

	struct pfvf_tlv hdr;

};



/* used to terminate and pad a tlv list */

struct channel_list_end_tlv {

	struct channel_tlv tl;
@@ -125,6 +130,13 @@ struct pfvf_acquire_resp_tlv { 
	} resc;

};



/* release the VF's acquired resources */

struct vfpf_release_tlv {

	struct vfpf_first_tlv	first_tlv;

	u16			vf_id;

	u8 padding[2];

};



struct tlv_buffer_size {

	u8 tlv_buffer[TLV_BUFFER_SIZE];

};
@@ -132,11 +144,13 @@ struct tlv_buffer_size { 
union vfpf_tlvs {

	struct vfpf_first_tlv		first_tlv;

	struct vfpf_acquire_tlv		acquire;

	struct vfpf_release_tlv         release;

	struct channel_list_end_tlv     list_end;

	struct tlv_buffer_size		tlv_buf_size;

};



union pfvf_tlvs {

	struct pfvf_general_resp_tlv    general_resp;

	struct pfvf_acquire_resp_tlv	acquire_resp;

	struct channel_list_end_tlv	list_end;

	struct tlv_buffer_size		tlv_buf_size;
@@ -147,6 +161,7 @@ union pfvf_tlvs { 
enum channel_tlvs {

	CHANNEL_TLV_NONE,

	CHANNEL_TLV_ACQUIRE,

	CHANNEL_TLV_RELEASE,

	CHANNEL_TLV_LIST_END,

	CHANNEL_TLV_MAX

};