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

Commit ed468ebe authored by Michal Kalderon's avatar Michal Kalderon Committed by David S. Miller
Browse files

qed: Add ll2 ability of opening a secondary queue 



When more than one ll2 queue is opened ( that is not an OOO queue )
ll2 code does not have enough information to determine whether
the queue is the main one or not, so a new field is added to the
acquire input data to expose the control of determining whether
the queue is the main queue or a secondary queue.

Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5823fe6

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

+6 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static int qed_sp_ll2_rx_queue_start(struct qed_hwfn *p_hwfn, 
	p_ramrod->drop_ttl0_flg = p_ll2_conn->input.rx_drop_ttl0_flg;

	p_ramrod->inner_vlan_removal_en = p_ll2_conn->input.rx_vlan_removal_en;

	p_ramrod->queue_id = p_ll2_conn->queue_id;

	p_ramrod->main_func_queue = (conn_type == QED_LL2_TYPE_OOO) ? 0 : 1;

	p_ramrod->main_func_queue = p_ll2_conn->main_func_queue ? 1 : 0;



	if ((IS_MF_DEFAULT(p_hwfn) || IS_MF_SI(p_hwfn)) &&

	    p_ramrod->main_func_queue && (conn_type != QED_LL2_TYPE_ROCE) &&
@@ -1265,6 +1265,11 @@ int qed_ll2_acquire_connection(void *cxt, struct qed_ll2_acquire_data *data) 


	p_ll2_info->tx_dest = (data->input.tx_dest == QED_LL2_TX_DEST_NW) ?

			      CORE_TX_DEST_NW : CORE_TX_DEST_LB;

	if (data->input.conn_type == QED_LL2_TYPE_OOO ||

	    data->input.secondary_queue)

		p_ll2_info->main_func_queue = false;

	else

		p_ll2_info->main_func_queue = true;



	/* Correct maximum number of Tx BDs */

	p_tx_max = &p_ll2_info->input.tx_max_bds_per_packet;

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

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct qed_ll2_info { 
	bool b_active;

	enum core_tx_dest tx_dest;

	u8 tx_stats_en;

	bool main_func_queue;

	struct qed_ll2_rx_queue rx_queue;

	struct qed_ll2_tx_queue tx_queue;

	struct qed_ll2_cbs cbs;

include/linux/qed/qed_ll2_if.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ struct qed_ll2_acquire_data_inputs { 
	enum qed_ll2_tx_dest tx_dest;

	enum qed_ll2_error_handle ai_err_packet_too_big;

	enum qed_ll2_error_handle ai_err_no_buf;

	bool secondary_queue;

	u8 gsi_enable;

};