Commit 3e0d3cb3 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice, irdma: move interrupts code to irdma 



Move responsibility of MSI-X requesting for RDMA feature from ice driver
to irdma driver. It is done to allow simple fallback when there is not
enough MSI-X available.

Change amount of MSI-X used for control from 4 to 1, as it isn't needed
to have more than one MSI-X for this purpose.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent ad61cd9c

drivers/infiniband/hw/irdma/hw.c

+0 −2
Original line number Diff line number Diff line
@@ -498,8 +498,6 @@ static int irdma_save_msix_info(struct irdma_pci_f *rf) 
	iw_qvlist->num_vectors = rf->msix_count;

	if (rf->msix_count <= num_online_cpus())

		rf->msix_shared = true;

	else if (rf->msix_count > num_online_cpus() + 1)

		rf->msix_count = num_online_cpus() + 1;



	pmsix = rf->msix_entries;

	for (i = 0, ceq_idx = 0; i < rf->msix_count; i++, iw_qvinfo++) {

drivers/infiniband/hw/irdma/main.c

+44 −2
Original line number Diff line number Diff line
@@ -206,6 +206,43 @@ static void irdma_lan_unregister_qset(struct irdma_sc_vsi *vsi, 
		ibdev_dbg(&iwdev->ibdev, "WS: LAN free_res for rdma qset failed.\n");

}



static int irdma_init_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf)

{

	int i;



	rf->msix_count = num_online_cpus() + IRDMA_NUM_AEQ_MSIX;

	rf->msix_entries = kcalloc(rf->msix_count, sizeof(*rf->msix_entries),

				   GFP_KERNEL);

	if (!rf->msix_entries)

		return -ENOMEM;



	for (i = 0; i < rf->msix_count; i++)

		if (ice_alloc_rdma_qvector(pf, &rf->msix_entries[i]))

			break;



	if (i < IRDMA_MIN_MSIX) {

		for (; i > 0; i--)

			ice_free_rdma_qvector(pf, &rf->msix_entries[i]);



		kfree(rf->msix_entries);

		return -ENOMEM;

	}



	rf->msix_count = i;



	return 0;

}



static void irdma_deinit_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf)

{

	int i;



	for (i = 0; i < rf->msix_count; i++)

		ice_free_rdma_qvector(pf, &rf->msix_entries[i]);



	kfree(rf->msix_entries);

}



static void irdma_remove(struct auxiliary_device *aux_dev)

{

	struct iidc_auxiliary_dev *iidc_adev = container_of(aux_dev,
@@ -216,6 +253,7 @@ static void irdma_remove(struct auxiliary_device *aux_dev) 


	irdma_ib_unregister_device(iwdev);

	ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, false);

	irdma_deinit_interrupts(iwdev->rf, pf);



	pr_debug("INIT: Gen2 PF[%d] device remove success\n", PCI_FUNC(pf->pdev->devfn));

}
@@ -230,9 +268,7 @@ static void irdma_fill_device_info(struct irdma_device *iwdev, struct ice_pf *pf 
	rf->gen_ops.unregister_qset = irdma_lan_unregister_qset;

	rf->hw.hw_addr = pf->hw.hw_addr;

	rf->pcidev = pf->pdev;

	rf->msix_count =  pf->num_rdma_msix;

	rf->pf_id = pf->hw.pf_id;

	rf->msix_entries = &pf->msix_entries[pf->rdma_base_vector];

	rf->default_vsi.vsi_idx = vsi->vsi_num;

	rf->protocol_used = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2 ?

			    IRDMA_ROCE_PROTOCOL_ONLY : IRDMA_IWARP_PROTOCOL_ONLY;
@@ -281,6 +317,10 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_ 
	irdma_fill_device_info(iwdev, pf, vsi);

	rf = iwdev->rf;



	err = irdma_init_interrupts(rf, pf);

	if (err)

		goto err_init_interrupts;



	err = irdma_ctrl_init_hw(rf);

	if (err)

		goto err_ctrl_init;
@@ -311,6 +351,8 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_ 
err_rt_init:

	irdma_ctrl_deinit_hw(rf);

err_ctrl_init:

	irdma_deinit_interrupts(rf, pf);

err_init_interrupts:

	kfree(iwdev->rf);

	ib_dealloc_device(&iwdev->ibdev);

drivers/infiniband/hw/irdma/main.h

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ extern struct auxiliary_driver i40iw_auxiliary_drv; 


#define IRDMA_IRQ_NAME_STR_LEN (64)



#define IRDMA_NUM_AEQ_MSIX	1

#define IRDMA_MIN_MSIX		2



enum init_completion_state {

	INVALID_STATE = 0,

	INITIAL_STATE,

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ 
#define ICE_MIN_LAN_OICR_MSIX	1

#define ICE_MIN_MSIX		(ICE_MIN_LAN_TXRX_MSIX + ICE_MIN_LAN_OICR_MSIX)

#define ICE_FDIR_MSIX		2

#define ICE_RDMA_NUM_AEQ_MSIX	4

#define ICE_NO_VSI		0xffff

#define ICE_VSI_MAP_CONTIG	0

#define ICE_VSI_MAP_SCATTER	1

drivers/net/ethernet/intel/ice/ice_idc.c

+14 −50
Original line number Diff line number Diff line
@@ -228,61 +228,34 @@ void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos) 
}

EXPORT_SYMBOL_GPL(ice_get_qos_params);



/**

 * ice_alloc_rdma_qvectors - Allocate vector resources for RDMA driver

 * @pf: board private structure to initialize

 */

static int ice_alloc_rdma_qvectors(struct ice_pf *pf)

int ice_alloc_rdma_qvector(struct ice_pf *pf, struct msix_entry *entry)

{

	if (ice_is_rdma_ena(pf)) {

		int i;

	struct msi_map map = ice_alloc_irq(pf, true);



		pf->msix_entries = kcalloc(pf->num_rdma_msix,

					   sizeof(*pf->msix_entries),

						  GFP_KERNEL);

		if (!pf->msix_entries)

			return -ENOMEM;



		/* RDMA is the only user of pf->msix_entries array */

		pf->rdma_base_vector = 0;



		for (i = 0; i < pf->num_rdma_msix; i++) {

			struct msix_entry *entry = &pf->msix_entries[i];

			struct msi_map map;



			map = ice_alloc_irq(pf, false);

	if (map.index < 0)

				break;

		return -ENOMEM;



	entry->entry = map.index;

	entry->vector = map.virq;

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(ice_alloc_rdma_qvector);



/**

 * ice_free_rdma_qvector - free vector resources reserved for RDMA driver

 * @pf: board private structure to initialize

 * @entry: MSI-X entry to be removed

 */

static void ice_free_rdma_qvector(struct ice_pf *pf)

void ice_free_rdma_qvector(struct ice_pf *pf, struct msix_entry *entry)

{

	int i;



	if (!pf->msix_entries)

		return;



	for (i = 0; i < pf->num_rdma_msix; i++) {

	struct msi_map map;



		map.index = pf->msix_entries[i].entry;

		map.virq = pf->msix_entries[i].vector;

	map.index = entry->entry;

	map.virq = entry->vector;

	ice_free_irq(pf, map);

}



	kfree(pf->msix_entries);

	pf->msix_entries = NULL;

}

EXPORT_SYMBOL_GPL(ice_free_rdma_qvector);



/**

 * ice_adev_release - function to be mapped to AUX dev's release op
@@ -382,12 +355,6 @@ int ice_init_rdma(struct ice_pf *pf) 
		return -ENOMEM;

	}



	/* Reserve vector resources */

	ret = ice_alloc_rdma_qvectors(pf);

	if (ret < 0) {

		dev_err(dev, "failed to reserve vectors for RDMA\n");

		goto err_reserve_rdma_qvector;

	}

	pf->rdma_mode |= IIDC_RDMA_PROTOCOL_ROCEV2;

	ret = ice_plug_aux_dev(pf);

	if (ret)
@@ -395,8 +362,6 @@ int ice_init_rdma(struct ice_pf *pf) 
	return 0;



err_plug_aux_dev:

	ice_free_rdma_qvector(pf);

err_reserve_rdma_qvector:

	pf->adev = NULL;

	xa_erase(&ice_aux_id, pf->aux_idx);

	return ret;
@@ -412,6 +377,5 @@ void ice_deinit_rdma(struct ice_pf *pf) 
		return;



	ice_unplug_aux_dev(pf);

	ice_free_rdma_qvector(pf);

	xa_erase(&ice_aux_id, pf->aux_idx);

}