Commit 028ba8aa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-management-interaction-and-feature-changes' 



Yuval Mintz says:

====================
qed: Management interaction & feature changes

All patches in this series either affect direct interaction with the
management firmware, or changes logic relating to some values retrieved
from it.

Patch #1 revises the basic logic for sending messages to the management
firmware and there completion, and is the most significant [at least
code-wise] of the bunch.

Patch #2 changes infrastrcure in a way that should better protect us form
mistakes leading to stack corruption such as was fixed in
bb480242 ("qed: Prevent stack corruption on MFW interaction").

Patch #3 corrects some update API endian issue [sent here as it would
create conflicts with #2, and because it's lack would create a rather
insignifcant problem].

Patch #4 removes some unnecessary logging, allowing cleaner forward
compatibility with future management firmware versions.

Patches #5, #6 slightly change the number of possible L2 queues in some
scenarios, leading to the possibility of having more queues / VFS.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4deece6c dec26533

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

+22 −16
Original line number Diff line number Diff line
@@ -1550,7 +1550,7 @@ static void qed_hw_set_feat(struct qed_hwfn *p_hwfn) 
{

	u32 *feat_num = p_hwfn->hw_info.feat_num;

	struct qed_sb_cnt_info sb_cnt_info;

	int num_features = 1;

	u32 non_l2_sbs = 0;



	if (IS_ENABLED(CONFIG_QED_RDMA) &&

	    p_hwfn->hw_info.personality == QED_PCI_ETH_ROCE) {
@@ -1558,31 +1558,37 @@ static void qed_hw_set_feat(struct qed_hwfn *p_hwfn) 
		 * the status blocks equally between L2 / RoCE but with

		 * consideration as to how many l2 queues / cnqs we have.

		 */

		num_features++;



		feat_num[QED_RDMA_CNQ] =

			min_t(u32, RESC_NUM(p_hwfn, QED_SB) / num_features,

			min_t(u32, RESC_NUM(p_hwfn, QED_SB) / 2,

			      RESC_NUM(p_hwfn, QED_RDMA_CNQ_RAM));

	}



	feat_num[QED_PF_L2_QUE] = min_t(u32, RESC_NUM(p_hwfn, QED_SB) /

						num_features,

					RESC_NUM(p_hwfn, QED_L2_QUEUE));

		non_l2_sbs = feat_num[QED_RDMA_CNQ];

	}



	if (p_hwfn->hw_info.personality == QED_PCI_ETH_ROCE ||

	    p_hwfn->hw_info.personality == QED_PCI_ETH) {

		/* Start by allocating VF queues, then PF's */

		memset(&sb_cnt_info, 0, sizeof(sb_cnt_info));

		qed_int_get_num_sbs(p_hwfn, &sb_cnt_info);

	feat_num[QED_VF_L2_QUE] =

	    min_t(u32,

		  RESC_NUM(p_hwfn, QED_L2_QUEUE) -

		  FEAT_NUM(p_hwfn, QED_PF_L2_QUE), sb_cnt_info.sb_iov_cnt);

		feat_num[QED_VF_L2_QUE] = min_t(u32,

						RESC_NUM(p_hwfn, QED_L2_QUEUE),

						sb_cnt_info.sb_iov_cnt);

		feat_num[QED_PF_L2_QUE] = min_t(u32,

						RESC_NUM(p_hwfn, QED_SB) -

						non_l2_sbs,

						RESC_NUM(p_hwfn,

							 QED_L2_QUEUE) -

						FEAT_NUM(p_hwfn,

							 QED_VF_L2_QUE));

	}



	DP_VERBOSE(p_hwfn,

		   NETIF_MSG_PROBE,

		   "#PF_L2_QUEUES=%d VF_L2_QUEUES=%d #ROCE_CNQ=%d #SBS=%d num_features=%d\n",

		   "#PF_L2_QUEUES=%d VF_L2_QUEUES=%d #ROCE_CNQ=%d #SBS=%d\n",

		   (int)FEAT_NUM(p_hwfn, QED_PF_L2_QUE),

		   (int)FEAT_NUM(p_hwfn, QED_VF_L2_QUE),

		   (int)FEAT_NUM(p_hwfn, QED_RDMA_CNQ),

		   RESC_NUM(p_hwfn, QED_SB), num_features);

		   RESC_NUM(p_hwfn, QED_SB));

}



static enum resource_id_enum qed_hw_get_mfw_res_id(enum qed_resources res_id)

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

+339 −186

File changed.

Preview size limit exceeded, changes collapsed.

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

+12 −5

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE