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

Commit 9003baf0 authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio CN23XX: init VF softcommand queues 



Adds support for initializing softcommand, dispatch and
instructions queues for VF.

Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da15c78b

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

+72 −2
Original line number Diff line number Diff line
@@ -140,7 +140,40 @@ static void octeon_pci_flr(struct octeon_device *oct) 
 */

static void octeon_destroy_resources(struct octeon_device *oct)

{

	int i;



	switch (atomic_read(&oct->status)) {

	case OCT_DEV_IN_RESET:

	case OCT_DEV_DROQ_INIT_DONE:

		mdelay(100);

		for (i = 0; i < MAX_OCTEON_OUTPUT_QUEUES(oct); i++) {

			if (!(oct->io_qmask.oq & BIT_ULL(i)))

				continue;

			octeon_delete_droq(oct, i);

		}



		/* fallthrough */

	case OCT_DEV_RESP_LIST_INIT_DONE:

		octeon_delete_response_list(oct);



		/* fallthrough */

	case OCT_DEV_INSTR_QUEUE_INIT_DONE:

		for (i = 0; i < MAX_OCTEON_INSTR_QUEUES(oct); i++) {

			if (!(oct->io_qmask.iq & BIT_ULL(i)))

				continue;

			octeon_delete_instr_queue(oct, i);

		}



		/* fallthrough */

	case OCT_DEV_SC_BUFF_POOL_INIT_DONE:

		octeon_free_sc_buffer_pool(oct);



		/* fallthrough */

	case OCT_DEV_DISPATCH_INIT_DONE:

		octeon_delete_dispatch_list(oct);

		cancel_delayed_work_sync(&oct->nic_poll_work.work);



		/* fallthrough */

	case OCT_DEV_PCI_MAP_DONE:

		octeon_unmap_pci_barx(oct, 0);

		octeon_unmap_pci_barx(oct, 1);
@@ -236,6 +269,14 @@ static int octeon_device_init(struct octeon_device *oct) 


	atomic_set(&oct->status, OCT_DEV_PCI_MAP_DONE);



	/* Initialize the dispatch mechanism used to push packets arriving on

	 * Octeon Output queues.

	 */

	if (octeon_init_dispatch_list(oct))

		return 1;



	atomic_set(&oct->status, OCT_DEV_DISPATCH_INIT_DONE);



	if (octeon_set_io_queues_off(oct)) {

		dev_err(&oct->pci_dev->dev, "setting io queues off failed\n");

		return 1;
@@ -246,6 +287,35 @@ static int octeon_device_init(struct octeon_device *oct) 
		return 1;

	}



	/* Initialize soft command buffer pool */

	if (octeon_setup_sc_buffer_pool(oct)) {

		dev_err(&oct->pci_dev->dev, "sc buffer pool allocation failed\n");

		return 1;

	}

	atomic_set(&oct->status, OCT_DEV_SC_BUFF_POOL_INIT_DONE);



	/* Setup the data structures that manage this Octeon's Input queues. */

	if (octeon_setup_instr_queues(oct)) {

		dev_err(&oct->pci_dev->dev, "instruction queue initialization failed\n");

		return 1;

	}

	atomic_set(&oct->status, OCT_DEV_INSTR_QUEUE_INIT_DONE);



	/* Initialize lists to manage the requests of different types that

	 * arrive from user & kernel applications for this octeon device.

	 */

	if (octeon_setup_response_list(oct)) {

		dev_err(&oct->pci_dev->dev, "Response list allocation failed\n");

		return 1;

	}

	atomic_set(&oct->status, OCT_DEV_RESP_LIST_INIT_DONE);



	if (octeon_setup_output_queues(oct)) {

		dev_err(&oct->pci_dev->dev, "Output queue initialization failed\n");

		return 1;

	}

	atomic_set(&oct->status, OCT_DEV_DROQ_INIT_DONE);



	return 0;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -797,6 +797,8 @@ int octeon_setup_instr_queues(struct octeon_device *oct) 
			CFG_GET_NUM_DEF_TX_DESCS(CHIP_CONF(oct, cn6xxx));

	else if (OCTEON_CN23XX_PF(oct))

		num_descs = CFG_GET_NUM_DEF_TX_DESCS(CHIP_CONF(oct, cn23xx_pf));

	else if (OCTEON_CN23XX_VF(oct))

		num_descs = CFG_GET_NUM_DEF_TX_DESCS(CHIP_CONF(oct, cn23xx_vf));



	oct->num_iqs = 0;
@@ -842,6 +844,9 @@ int octeon_setup_output_queues(struct octeon_device *oct) 
	} else if (OCTEON_CN23XX_PF(oct)) {

		num_descs = CFG_GET_NUM_DEF_RX_DESCS(CHIP_CONF(oct, cn23xx_pf));

		desc_size = CFG_GET_DEF_RX_BUF_SIZE(CHIP_CONF(oct, cn23xx_pf));

	} else if (OCTEON_CN23XX_VF(oct)) {

		num_descs = CFG_GET_NUM_DEF_RX_DESCS(CHIP_CONF(oct, cn23xx_vf));

		desc_size = CFG_GET_DEF_RX_BUF_SIZE(CHIP_CONF(oct, cn23xx_vf));

	}

	oct->num_oqs = 0;

	oct->droq[0] = vmalloc_node(sizeof(*oct->droq[0]), numa_node);

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

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "octeon_network.h"

#include "cn66xx_device.h"

#include "cn23xx_pf_device.h"

#include "cn23xx_vf_device.h"



struct iq_post_status {

	int status;
@@ -68,6 +69,9 @@ int octeon_init_instr_queue(struct octeon_device *oct, 
		conf = &(CFG_GET_IQ_CFG(CHIP_CONF(oct, cn6xxx)));

	else if (OCTEON_CN23XX_PF(oct))

		conf = &(CFG_GET_IQ_CFG(CHIP_CONF(oct, cn23xx_pf)));

	else if (OCTEON_CN23XX_VF(oct))

		conf = &(CFG_GET_IQ_CFG(CHIP_CONF(oct, cn23xx_vf)));



	if (!conf) {

		dev_err(&oct->pci_dev->dev, "Unsupported Chip %x\n",

			oct->chip_id);
@@ -183,6 +187,9 @@ int octeon_delete_instr_queue(struct octeon_device *oct, u32 iq_no) 
	else if (OCTEON_CN23XX_PF(oct))

		desc_size =

		    CFG_GET_IQ_INSTR_TYPE(CHIP_CONF(oct, cn23xx_pf));

	else if (OCTEON_CN23XX_VF(oct))

		desc_size =

		    CFG_GET_IQ_INSTR_TYPE(CHIP_CONF(oct, cn23xx_vf));



	vfree(iq->request_list);