Commit 2ba036b9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-Bug-fixes' 



Manish Chopra says:

====================
qed*: Bug fixes.

This series contains general qed/qede fixes.
Please consider applying this to "net"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 00670cb8 42dbcd6b

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
extern const struct qed_common_ops qed_common_ops_pass;



#define QED_MAJOR_VERSION		8

#define QED_MINOR_VERSION		33

#define QED_MINOR_VERSION		37

#define QED_REVISION_VERSION		0

#define QED_ENGINEERING_VERSION		20

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

+5 −3
Original line number Diff line number Diff line
@@ -2216,7 +2216,7 @@ static int qed_fill_eth_dev_info(struct qed_dev *cdev, 
			u16 num_queues = 0;



			/* Since the feature controls only queue-zones,

			 * make sure we have the contexts [rx, tx, xdp] to

			 * make sure we have the contexts [rx, xdp, tcs] to

			 * match.

			 */

			for_each_hwfn(cdev, i) {
@@ -2226,7 +2226,8 @@ static int qed_fill_eth_dev_info(struct qed_dev *cdev, 
				u16 cids;



				cids = hwfn->pf_params.eth_pf_params.num_cons;

				num_queues += min_t(u16, l2_queues, cids / 3);

				cids /= (2 + info->num_tc);

				num_queues += min_t(u16, l2_queues, cids);

			}



			/* queues might theoretically be >256, but interrupts'
@@ -2870,7 +2871,8 @@ static int qed_get_coalesce(struct qed_dev *cdev, u16 *coal, void *handle) 
	p_hwfn = p_cid->p_owner;

	rc = qed_get_queue_coalesce(p_hwfn, coal, handle);

	if (rc)

		DP_NOTICE(p_hwfn, "Unable to read queue coalescing\n");

		DP_VERBOSE(cdev, QED_MSG_DEBUG,

			   "Unable to read queue coalescing\n");



	return rc;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ void qed_consq_setup(struct qed_hwfn *p_hwfn); 
 * @param p_hwfn

 */

void qed_consq_free(struct qed_hwfn *p_hwfn);

int qed_spq_pend_post(struct qed_hwfn *p_hwfn);



/**

 * @file

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

+3 −0
Original line number Diff line number Diff line
@@ -604,6 +604,9 @@ int qed_sp_pf_update_stag(struct qed_hwfn *p_hwfn) 


	p_ent->ramrod.pf_update.update_mf_vlan_flag = true;

	p_ent->ramrod.pf_update.mf_vlan = cpu_to_le16(p_hwfn->hw_info.ovlan);

	if (test_bit(QED_MF_UFP_SPECIFIC, &p_hwfn->cdev->mf_bits))

		p_ent->ramrod.pf_update.mf_vlan |=

			cpu_to_le16(((u16)p_hwfn->ufp_info.tc << 13));



	return qed_spq_post(p_hwfn, p_ent, NULL);

}

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

+7 −8
Original line number Diff line number Diff line
@@ -397,6 +397,11 @@ int qed_eq_completion(struct qed_hwfn *p_hwfn, void *cookie) 


	qed_eq_prod_update(p_hwfn, qed_chain_get_prod_idx(p_chain));



	/* Attempt to post pending requests */

	spin_lock_bh(&p_hwfn->p_spq->lock);

	rc = qed_spq_pend_post(p_hwfn);

	spin_unlock_bh(&p_hwfn->p_spq->lock);



	return rc;

}
@@ -767,7 +772,7 @@ static int qed_spq_post_list(struct qed_hwfn *p_hwfn, 
	return 0;

}



static int qed_spq_pend_post(struct qed_hwfn *p_hwfn)

int qed_spq_pend_post(struct qed_hwfn *p_hwfn)

{

	struct qed_spq *p_spq = p_hwfn->p_spq;

	struct qed_spq_entry *p_ent = NULL;
@@ -905,7 +910,6 @@ int qed_spq_completion(struct qed_hwfn *p_hwfn, 
	struct qed_spq_entry	*p_ent = NULL;

	struct qed_spq_entry	*tmp;

	struct qed_spq_entry	*found = NULL;

	int			rc;



	if (!p_hwfn)

		return -EINVAL;
@@ -963,12 +967,7 @@ int qed_spq_completion(struct qed_hwfn *p_hwfn, 
		 */

		qed_spq_return_entry(p_hwfn, found);



	/* Attempt to post pending requests */

	spin_lock_bh(&p_spq->lock);

	rc = qed_spq_pend_post(p_hwfn);

	spin_unlock_bh(&p_spq->lock);



	return rc;

	return 0;

}



int qed_consq_alloc(struct qed_hwfn *p_hwfn)

CRA Git | Maintained and supported by SUSTech CRA and CCSE