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

Commit 7707133c authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: refactor be_setup() to consolidate queue creation routines 



1) Move be_cmd_if_create() above queue create routines to allow
   TXQ creation (that requires if_handle) to be clubbed with TX-CQ creation.
2) Consolidate all queue create routines into be_setup_queues()

Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bea50988

drivers/net/ethernet/emulex/benet/be_cmds.c

+5 −18
Original line number Diff line number Diff line
@@ -1182,25 +1182,16 @@ int be_cmd_mccq_create(struct be_adapter *adapter, 


int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo)

{

	struct be_mcc_wrb *wrb;

	struct be_mcc_wrb wrb = {0};

	struct be_cmd_req_eth_tx_create *req;

	struct be_queue_info *txq = &txo->q;

	struct be_queue_info *cq = &txo->cq;

	struct be_dma_mem *q_mem = &txq->dma_mem;

	int status, ver = 0;



	spin_lock_bh(&adapter->mcc_lock);



	wrb = wrb_from_mccq(adapter);

	if (!wrb) {

		status = -EBUSY;

		goto err;

	}



	req = embedded_payload(wrb);



	req = embedded_payload(&wrb);

	be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,

		OPCODE_ETH_TX_CREATE, sizeof(*req), wrb, NULL);

				OPCODE_ETH_TX_CREATE, sizeof(*req), &wrb, NULL);



	if (lancer_chip(adapter)) {

		req->hdr.version = 1;
@@ -1218,12 +1209,11 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) 
	req->cq_id = cpu_to_le16(cq->id);

	req->queue_size = be_encoded_q_len(txq->len);

	be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);



	ver = req->hdr.version;



	status = be_mcc_notify_wait(adapter);

	status = be_cmd_notify_wait(adapter, &wrb);

	if (!status) {

		struct be_cmd_resp_eth_tx_create *resp = embedded_payload(wrb);

		struct be_cmd_resp_eth_tx_create *resp = embedded_payload(&wrb);

		txq->id = le16_to_cpu(resp->cid);

		if (ver == 2)

			txo->db_offset = le32_to_cpu(resp->db_offset);
@@ -1232,9 +1222,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) 
		txq->created = true;

	}



err:

	spin_unlock_bh(&adapter->mcc_lock);



	return status;

}

drivers/net/ethernet/emulex/benet/be_main.c

+45 −40
Original line number Diff line number Diff line
@@ -2014,7 +2014,7 @@ static void be_tx_queues_destroy(struct be_adapter *adapter) 
	}

}



static int be_tx_cqs_create(struct be_adapter *adapter)

static int be_tx_qs_create(struct be_adapter *adapter)

{

	struct be_queue_info *cq, *eq;

	struct be_tx_obj *txo;
@@ -2042,16 +2042,7 @@ static int be_tx_cqs_create(struct be_adapter *adapter) 
		status = be_cmd_cq_create(adapter, cq, eq, false, 3);

		if (status)

			return status;

	}

	return 0;

}



static int be_tx_qs_create(struct be_adapter *adapter)

{

	struct be_tx_obj *txo;

	int i, status;



	for_all_tx_queues(adapter, txo, i) {

		status = be_queue_alloc(adapter, &txo->q, TX_Q_LEN,

					sizeof(struct be_eth_wrb));

		if (status)
@@ -2772,6 +2763,14 @@ done: 
	adapter->num_vfs = 0;

}



static void be_clear_queues(struct be_adapter *adapter)

{

	be_mcc_queues_destroy(adapter);

	be_rx_cqs_destroy(adapter);

	be_tx_queues_destroy(adapter);

	be_evt_queues_destroy(adapter);

}



static int be_clear(struct be_adapter *adapter)

{

	int i;
@@ -2792,10 +2791,7 @@ static int be_clear(struct be_adapter *adapter) 


	be_cmd_if_destroy(adapter, adapter->if_handle,  0);



	be_mcc_queues_destroy(adapter);

	be_rx_cqs_destroy(adapter);

	be_tx_queues_destroy(adapter);

	be_evt_queues_destroy(adapter);

	be_clear_queues(adapter);



	kfree(adapter->pmac_id);

	adapter->pmac_id = NULL;
@@ -3112,49 +3108,51 @@ static int be_mac_setup(struct be_adapter *adapter) 
	return 0;

}



static int be_setup(struct be_adapter *adapter)

static int be_setup_queues(struct be_adapter *adapter)

{

	struct device *dev = &adapter->pdev->dev;

	u32 en_flags;

	u32 tx_fc, rx_fc;

	int status;



	be_setup_init(adapter);



	if (!lancer_chip(adapter))

		be_cmd_req_native_mode(adapter);



	status = be_get_config(adapter);

	status = be_evt_queues_create(adapter);

	if (status)

		goto err;



	status = be_msix_enable(adapter);

	status = be_tx_qs_create(adapter);

	if (status)

		goto err;



	status = be_evt_queues_create(adapter);

	status = be_rx_cqs_create(adapter);

	if (status)

		goto err;



	status = be_tx_cqs_create(adapter);

	status = be_mcc_queues_create(adapter);

	if (status)

		goto err;



	status = be_rx_cqs_create(adapter);

	return 0;

err:

	dev_err(&adapter->pdev->dev, "queue_setup failed\n");

	return status;

}



static int be_setup(struct be_adapter *adapter)

{

	struct device *dev = &adapter->pdev->dev;

	u32 tx_fc, rx_fc, en_flags;

	int status;



	be_setup_init(adapter);



	if (!lancer_chip(adapter))

		be_cmd_req_native_mode(adapter);



	status = be_get_config(adapter);

	if (status)

		goto err;



	status = be_mcc_queues_create(adapter);

	status = be_msix_enable(adapter);

	if (status)

		goto err;



	be_cmd_get_fn_privileges(adapter, &adapter->cmd_privileges, 0);

	/* In UMC mode FW does not return right privileges.

	 * Override with correct privilege equivalent to PF.

	 */

	if (be_is_mc(adapter))

		adapter->cmd_privileges = MAX_PRIVILEGES;



	en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |

		   BE_IF_FLAGS_MULTICAST | BE_IF_FLAGS_PASS_L3L4_ERRORS;

	if (adapter->function_caps & BE_FUNCTION_CAPS_RSS)
@@ -3162,14 +3160,21 @@ static int be_setup(struct be_adapter *adapter) 
	en_flags = en_flags & be_if_cap_flags(adapter);

	status = be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,

				  &adapter->if_handle, 0);

	if (status != 0)

	if (status)

		goto err;



	status = be_mac_setup(adapter);

	status = be_setup_queues(adapter);

	if (status)

		goto err;



	status = be_tx_qs_create(adapter);

	be_cmd_get_fn_privileges(adapter, &adapter->cmd_privileges, 0);

	/* In UMC mode FW does not return right privileges.

	 * Override with correct privilege equivalent to PF.

	 */

	if (be_is_mc(adapter))

		adapter->cmd_privileges = MAX_PRIVILEGES;



	status = be_mac_setup(adapter);

	if (status)

		goto err;