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

Commit 66cf188e authored by Hariprasad S's avatar Hariprasad S Committed by Doug Ledford
Browse files

cxgb4: Support for user mode bar2 mappings with T4 



Enhance cxgb4_t4_bar2_sge_qregs() and cxgb4_bar2_sge_qregs() to support T4
user mode mappings.  Update all the current users as well.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 0699ee7a

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+1 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ enum t4_bar2_qtype { T4_BAR2_QTYPE_EGRESS, T4_BAR2_QTYPE_INGRESS }; 
int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,

		      unsigned int qid,

		      enum t4_bar2_qtype qtype,

		      int user,

		      u64 *pbar2_qoffset,

		      unsigned int *pbar2_qid);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+3 −1
Original line number Diff line number Diff line
@@ -2145,6 +2145,7 @@ EXPORT_SYMBOL(cxgb4_read_sge_timestamp); 
int cxgb4_bar2_sge_qregs(struct net_device *dev,

			 unsigned int qid,

			 enum cxgb4_bar2_qtype qtype,

			 int user,

			 u64 *pbar2_qoffset,

			 unsigned int *pbar2_qid)

{
@@ -2153,6 +2154,7 @@ int cxgb4_bar2_sge_qregs(struct net_device *dev, 
				 (qtype == CXGB4_BAR2_QTYPE_EGRESS

				  ? T4_BAR2_QTYPE_EGRESS

				  : T4_BAR2_QTYPE_INGRESS),

				 user,

				 pbar2_qoffset,

				 pbar2_qid);

}
@@ -2351,7 +2353,7 @@ static void process_db_drop(struct work_struct *work) 
		int ret;



		ret = cxgb4_t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS,

					&bar2_qoffset, &bar2_qid);

					      0, &bar2_qoffset, &bar2_qid);

		if (ret)

			dev_err(adap->pdev_dev, "doorbell drop recovery: "

				"qid=%d, pidx_inc=%d\n", qid, pidx_inc);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ enum cxgb4_bar2_qtype { CXGB4_BAR2_QTYPE_EGRESS, CXGB4_BAR2_QTYPE_INGRESS }; 
int cxgb4_bar2_sge_qregs(struct net_device *dev,

			 unsigned int qid,

			 enum cxgb4_bar2_qtype qtype,

			 int user,

			 u64 *pbar2_qoffset,

			 unsigned int *pbar2_qid);

drivers/net/ethernet/chelsio/cxgb4/sge.c

+2 −2
Original line number Diff line number Diff line
@@ -2429,7 +2429,7 @@ static void __iomem *bar2_address(struct adapter *adapter, 
	u64 bar2_qoffset;

	int ret;



	ret = cxgb4_t4_bar2_sge_qregs(adapter, qid, qtype,

	ret = cxgb4_t4_bar2_sge_qregs(adapter, qid, qtype, 0,

				      &bar2_qoffset, pbar2_qid);

	if (ret)

		return NULL;

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+4 −3
Original line number Diff line number Diff line
@@ -5102,6 +5102,7 @@ int t4_prep_adapter(struct adapter *adapter) 
 *	@adapter: the adapter

 *	@qid: the Queue ID

 *	@qtype: the Ingress or Egress type for @qid

 *	@user: true if this request is for a user mode queue

 *	@pbar2_qoffset: BAR2 Queue Offset

 *	@pbar2_qid: BAR2 Queue ID or 0 for Queue ID inferred SGE Queues

 *
@@ -5125,6 +5126,7 @@ int t4_prep_adapter(struct adapter *adapter) 
int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,

		      unsigned int qid,

		      enum t4_bar2_qtype qtype,

		      int user,

		      u64 *pbar2_qoffset,

		      unsigned int *pbar2_qid)

{
@@ -5132,9 +5134,8 @@ int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter, 
	u64 bar2_page_offset, bar2_qoffset;

	unsigned int bar2_qid, bar2_qid_offset, bar2_qinferred;



	/* T4 doesn't support BAR2 SGE Queue registers.

	 */

	if (is_t4(adapter->params.chip))

	/* T4 doesn't support BAR2 SGE Queue registers for kernel mode queues */

	if (!user && is_t4(adapter->params.chip))

		return -EINVAL;



	/* Get our SGE Page Size parameters.