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

Commit 1a850bfc authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller
Browse files

qed: VFs to try utilizing the doorbell bar 



VFs are currently not mapping their doorbell bar, instead relying
on the small doorbell window they have in their limited regview bar.

In order to increase the number of possible Tx connections [queues]
employeed by VF past 16, we need to start using the doorbell bar if
one such is exposed - VF would communicate this fact to PF which would
return the size-bar internally configured into chip, according to
which the VF would decide whether to actually utilize the doorbell
bar.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08bc8f15

drivers/net/ethernet/qlogic/qed/qed.h

+5 −0
Original line number Diff line number Diff line
@@ -412,6 +412,11 @@ struct qed_fw_data { 
	u32			init_ops_size;

};



enum BAR_ID {

	BAR_ID_0,		/* used for GRC */

	BAR_ID_1		/* Used for doorbells */

};



#define DRV_MODULE_VERSION		      \

	__stringify(QED_MAJOR_VERSION) "."    \

	__stringify(QED_MINOR_VERSION) "."    \

drivers/net/ethernet/qlogic/qed/qed_dev.c

+1 −7
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ static DEFINE_SPINLOCK(qm_lock); 
#define QED_MIN_DPIS            (4)

#define QED_MIN_PWM_REGION      (QED_WID_SIZE * QED_MIN_DPIS)



/* API common to all protocols */

enum BAR_ID {

	BAR_ID_0,       /* used for GRC */

	BAR_ID_1        /* Used for doorbells */

};



static u32 qed_hw_bar_size(struct qed_hwfn *p_hwfn,

			   struct qed_ptt *p_ptt, enum BAR_ID bar_id)

{
@@ -83,7 +77,7 @@ static u32 qed_hw_bar_size(struct qed_hwfn *p_hwfn, 
	u32 val;



	if (IS_VF(p_hwfn->cdev))

		return 1 << 17;

		return qed_vf_hw_bar_size(p_hwfn, bar_id);



	val = qed_rd(p_hwfn, p_ptt, bar_reg);

	if (val)

drivers/net/ethernet/qlogic/qed/qed_main.c

+16 −8
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void qed_free_pci(struct qed_dev *cdev) 
{

	struct pci_dev *pdev = cdev->pdev;



	if (cdev->doorbells)

	if (cdev->doorbells && cdev->db_size)

		iounmap(cdev->doorbells);

	if (cdev->regview)

		iounmap(cdev->regview);
@@ -206,15 +206,23 @@ static int qed_init_pci(struct qed_dev *cdev, struct pci_dev *pdev) 
		goto err2;

	}



	if (IS_PF(cdev)) {

	cdev->db_phys_addr = pci_resource_start(cdev->pdev, 2);

	cdev->db_size = pci_resource_len(cdev->pdev, 2);

	if (!cdev->db_size) {

		if (IS_PF(cdev)) {

			DP_NOTICE(cdev, "No Doorbell bar available\n");

			return -EINVAL;

		} else {

			return 0;

		}

	}



	cdev->doorbells = ioremap_wc(cdev->db_phys_addr, cdev->db_size);



	if (!cdev->doorbells) {

		DP_NOTICE(cdev, "Cannot map doorbell space\n");

		return -ENOMEM;

	}

	}



	return 0;

drivers/net/ethernet/qlogic/qed/qed_reg_addr.h

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ 
	0x2aae60UL

#define PGLUE_B_REG_PF_BAR1_SIZE \

	0x2aae64UL

#define PGLUE_B_REG_VF_BAR1_SIZE 0x2aae68UL

#define PRS_REG_ENCAPSULATION_TYPE_EN	0x1f0730UL

#define PRS_REG_GRE_PROTOCOL		0x1f0734UL

#define PRS_REG_VXLAN_PORT		0x1f0738UL

drivers/net/ethernet/qlogic/qed/qed_sriov.c

+58 −3
Original line number Diff line number Diff line
@@ -1384,6 +1384,60 @@ static void qed_iov_vf_cleanup(struct qed_hwfn *p_hwfn, 
	qed_iov_clean_vf(p_hwfn, p_vf->relative_vf_id);

}



/* Returns either 0, or log(size) */

static u32 qed_iov_vf_db_bar_size(struct qed_hwfn *p_hwfn,

				  struct qed_ptt *p_ptt)

{

	u32 val = qed_rd(p_hwfn, p_ptt, PGLUE_B_REG_VF_BAR1_SIZE);



	if (val)

		return val + 11;

	return 0;

}



static void

qed_iov_vf_mbx_acquire_resc_cids(struct qed_hwfn *p_hwfn,

				 struct qed_ptt *p_ptt,

				 struct qed_vf_info *p_vf,

				 struct vf_pf_resc_request *p_req,

				 struct pf_vf_resc *p_resp)

{

	u8 num_vf_cons = p_hwfn->pf_params.eth_pf_params.num_vf_cons;

	u8 db_size = qed_db_addr_vf(1, DQ_DEMS_LEGACY) -

		     qed_db_addr_vf(0, DQ_DEMS_LEGACY);

	u32 bar_size;



	p_resp->num_cids = min_t(u8, p_req->num_cids, num_vf_cons);



	/* If VF didn't bother asking for QIDs than don't bother limiting

	 * number of CIDs. The VF doesn't care about the number, and this

	 * has the likely result of causing an additional acquisition.

	 */

	if (!(p_vf->acquire.vfdev_info.capabilities &

	      VFPF_ACQUIRE_CAP_QUEUE_QIDS))

		return;



	/* If doorbell bar was mapped by VF, limit the VF CIDs to an amount

	 * that would make sure doorbells for all CIDs fall within the bar.

	 * If it doesn't, make sure regview window is sufficient.

	 */

	if (p_vf->acquire.vfdev_info.capabilities &

	    VFPF_ACQUIRE_CAP_PHYSICAL_BAR) {

		bar_size = qed_iov_vf_db_bar_size(p_hwfn, p_ptt);

		if (bar_size)

			bar_size = 1 << bar_size;



		if (p_hwfn->cdev->num_hwfns > 1)

			bar_size /= 2;

	} else {

		bar_size = PXP_VF_BAR0_DQ_LENGTH;

	}



	if (bar_size / db_size < 256)

		p_resp->num_cids = min_t(u8, p_resp->num_cids,

					 (u8)(bar_size / db_size));

}



static u8 qed_iov_vf_mbx_acquire_resc(struct qed_hwfn *p_hwfn,

				      struct qed_ptt *p_ptt,

				      struct qed_vf_info *p_vf,
@@ -1417,9 +1471,7 @@ static u8 qed_iov_vf_mbx_acquire_resc(struct qed_hwfn *p_hwfn, 
	p_resp->num_vlan_filters = min_t(u8, p_vf->num_vlan_filters,

					 p_req->num_vlan_filters);



	p_resp->num_cids =

	    min_t(u8, p_req->num_cids,

		  p_hwfn->pf_params.eth_pf_params.num_vf_cons);

	qed_iov_vf_mbx_acquire_resc_cids(p_hwfn, p_ptt, p_vf, p_req, p_resp);



	/* This isn't really needed/enforced, but some legacy VFs might depend

	 * on the correct filling of this field.
@@ -1572,6 +1624,9 @@ static void qed_iov_vf_mbx_acquire(struct qed_hwfn *p_hwfn, 
	if (req->vfdev_info.capabilities & VFPF_ACQUIRE_CAP_QUEUE_QIDS)

		pfdev_info->capabilities |= PFVF_ACQUIRE_CAP_QUEUE_QIDS;



	/* Share the sizes of the bars with VF */

	resp->pfdev_info.bar_size = qed_iov_vf_db_bar_size(p_hwfn, p_ptt);



	qed_iov_vf_mbx_acquire_stats(p_hwfn, &pfdev_info->stats_info);



	memcpy(pfdev_info->port_mac, p_hwfn->hw_info.hw_mac_addr, ETH_ALEN);