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

Commit 69f9c60e authored by Intiyaz Basha's avatar Intiyaz Basha Committed by David S. Miller
Browse files

liquidio: moved octeon_setup_droq to lio_core.c 



Moving common octeon_setup_droq to lio_core.c

Signed-off-by: default avatarIntiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25d43f18

drivers/net/ethernet/cavium/liquidio/lio_core.c

+35 −0
Original line number Diff line number Diff line
@@ -397,3 +397,38 @@ void lio_update_txq_status(struct octeon_device *oct, int iq_num) 
		netif_wake_queue(netdev);

	}

}



/**

 * \brief Setup output queue

 * @param oct octeon device

 * @param q_no which queue

 * @param num_descs how many descriptors

 * @param desc_size size of each descriptor

 * @param app_ctx application context

 */

int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs,

		      int desc_size, void *app_ctx)

{

	int ret_val;



	dev_dbg(&oct->pci_dev->dev, "Creating Droq: %d\n", q_no);

	/* droq creation and local register settings. */

	ret_val = octeon_create_droq(oct, q_no, num_descs, desc_size, app_ctx);

	if (ret_val < 0)

		return ret_val;



	if (ret_val == 1) {

		dev_dbg(&oct->pci_dev->dev, "Using default droq %d\n", q_no);

		return 0;

	}



	/* Enable the droq queues */

	octeon_set_droq_pkt_op(oct, q_no, 1);



	/* Send Credit for Octeon Output queues. Credits are always

	 * sent after the output queue is enabled.

	 */

	writel(oct->droq[q_no]->max_count, oct->droq[q_no]->pkts_credit_reg);



	return ret_val;

}

drivers/net/ethernet/cavium/liquidio/lio_main.c

+0 −37
Original line number Diff line number Diff line
@@ -2198,43 +2198,6 @@ static int load_firmware(struct octeon_device *oct) 
	return ret;

}



/**

 * \brief Setup output queue

 * @param oct octeon device

 * @param q_no which queue

 * @param num_descs how many descriptors

 * @param desc_size size of each descriptor

 * @param app_ctx application context

 */

static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs,

			     int desc_size, void *app_ctx)

{

	int ret_val = 0;



	dev_dbg(&oct->pci_dev->dev, "Creating Droq: %d\n", q_no);

	/* droq creation and local register settings. */

	ret_val = octeon_create_droq(oct, q_no, num_descs, desc_size, app_ctx);

	if (ret_val < 0)

		return ret_val;



	if (ret_val == 1) {

		dev_dbg(&oct->pci_dev->dev, "Using default droq %d\n", q_no);

		return 0;

	}

	/* tasklet creation for the droq */



	/* Enable the droq queues */

	octeon_set_droq_pkt_op(oct, q_no, 1);



	/* Send Credit for Octeon Output queues. Credits are always

	 * sent after the output queue is enabled.

	 */

	writel(oct->droq[q_no]->max_count,

	       oct->droq[q_no]->pkts_credit_reg);



	return ret_val;

}



/**

 * \brief Callback for getting interface configuration

 * @param status status of request

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+0 −35
Original line number Diff line number Diff line
@@ -1344,41 +1344,6 @@ static void free_netsgbuf_with_resp(void *buf) 
	check_txq_state(lio, skb);

}



/**

 * \brief Setup output queue

 * @param oct octeon device

 * @param q_no which queue

 * @param num_descs how many descriptors

 * @param desc_size size of each descriptor

 * @param app_ctx application context

 */

static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs,

			     int desc_size, void *app_ctx)

{

	int ret_val;



	dev_dbg(&oct->pci_dev->dev, "Creating Droq: %d\n", q_no);

	/* droq creation and local register settings. */

	ret_val = octeon_create_droq(oct, q_no, num_descs, desc_size, app_ctx);

	if (ret_val < 0)

		return ret_val;



	if (ret_val == 1) {

		dev_dbg(&oct->pci_dev->dev, "Using default droq %d\n", q_no);

		return 0;

	}



	/* Enable the droq queues */

	octeon_set_droq_pkt_op(oct, q_no, 1);



	/* Send Credit for Octeon Output queues. Credits are always

	 * sent after the output queue is enabled.

	 */

	writel(oct->droq[q_no]->max_count, oct->droq[q_no]->pkts_credit_reg);



	return ret_val;

}



/**

 * \brief Callback for getting interface configuration

 * @param status status of request

drivers/net/ethernet/cavium/liquidio/octeon_network.h

+2 −0
Original line number Diff line number Diff line
@@ -475,4 +475,6 @@ static inline int wait_for_pending_requests(struct octeon_device *oct) 
}



void lio_update_txq_status(struct octeon_device *oct, int iq_num);

int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs,

		      int desc_size, void *app_ctx);

#endif