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

Commit 41107685 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: pci: Check number of CQEs for CQE version 2 



Check number of CQEs for CQE version 2 reported by QUERY_AQ_CAP command.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8404f6f2

drivers/net/ethernet/mellanox/mlxsw/cmd.h

+6 −1
Original line number Diff line number Diff line
@@ -424,10 +424,15 @@ MLXSW_ITEM32(cmd_mbox, query_aq_cap, log_max_rdq_sz, 0x04, 24, 8); 
MLXSW_ITEM32(cmd_mbox, query_aq_cap, max_num_rdqs, 0x04, 0, 8);



/* cmd_mbox_query_aq_cap_log_max_cq_sz

 * Log (base 2) of max CQEs allowed on CQ.

 * Log (base 2) of the Maximum CQEs allowed in a CQ for CQEv0 and CQEv1.

 */

MLXSW_ITEM32(cmd_mbox, query_aq_cap, log_max_cq_sz, 0x08, 24, 8);



/* cmd_mbox_query_aq_cap_log_max_cqv2_sz

 * Log (base 2) of the Maximum CQEs allowed in a CQ for CQEv2.

 */

MLXSW_ITEM32(cmd_mbox, query_aq_cap, log_max_cqv2_sz, 0x08, 16, 8);



/* cmd_mbox_query_aq_cap_max_num_cqs

 * Maximum number of CQs.

 */

drivers/net/ethernet/mellanox/mlxsw/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ static int mlxsw_pci_aqs_init(struct mlxsw_pci *mlxsw_pci, char *mbox) 
	u8 rdq_log2sz;

	u8 num_cqs;

	u8 cq_log2sz;

	u8 cqv2_log2sz;

	u8 num_eqs;

	u8 eq_log2sz;

	int err;
@@ -974,6 +975,7 @@ static int mlxsw_pci_aqs_init(struct mlxsw_pci *mlxsw_pci, char *mbox) 
	rdq_log2sz = mlxsw_cmd_mbox_query_aq_cap_log_max_rdq_sz_get(mbox);

	num_cqs = mlxsw_cmd_mbox_query_aq_cap_max_num_cqs_get(mbox);

	cq_log2sz = mlxsw_cmd_mbox_query_aq_cap_log_max_cq_sz_get(mbox);

	cqv2_log2sz = mlxsw_cmd_mbox_query_aq_cap_log_max_cqv2_sz_get(mbox);

	num_eqs = mlxsw_cmd_mbox_query_aq_cap_max_num_eqs_get(mbox);

	eq_log2sz = mlxsw_cmd_mbox_query_aq_cap_log_max_eq_sz_get(mbox);
@@ -986,6 +988,8 @@ static int mlxsw_pci_aqs_init(struct mlxsw_pci *mlxsw_pci, char *mbox) 
	if ((1 << sdq_log2sz != MLXSW_PCI_WQE_COUNT) ||

	    (1 << rdq_log2sz != MLXSW_PCI_WQE_COUNT) ||

	    (1 << cq_log2sz != MLXSW_PCI_CQE01_COUNT) ||

	    (mlxsw_pci->max_cqe_ver == MLXSW_PCI_CQE_V2 &&

	     (1 << cqv2_log2sz != MLXSW_PCI_CQE2_COUNT)) ||

	    (1 << eq_log2sz != MLXSW_PCI_EQE_COUNT)) {

		dev_err(&pdev->dev, "Unsupported number of async queue descriptors\n");

		return -EINVAL;