Commit 97b5631a authored by Dave Ertman's avatar Dave Ertman Committed by Tony Nguyen
Browse files

iidc/ice/irdma: Rename to iidc_* convention 



In preparation of supporting more than a single core PCI driver
for RDMA, homogenize naming to iidc_rdma_* and IIDC_RDMA_*
form.

Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Signed-off-by: default avatarTatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 468d8b46

drivers/infiniband/hw/irdma/main.c

+22 −19
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void irdma_log_invalid_mtu(u16 mtu, struct irdma_sc_dev *dev) 
}



static void irdma_fill_qos_info(struct irdma_l2params *l2params,

				struct iidc_qos_params *qos_info)

				struct iidc_rdma_qos_params *qos_info)

{

	int i;
@@ -85,12 +85,12 @@ static void irdma_fill_qos_info(struct irdma_l2params *l2params, 
	}

}



static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event)

static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_rdma_event *event)

{

	struct irdma_device *iwdev = dev_get_drvdata(&pf->adev->dev);

	struct irdma_l2params l2params = {};



	if (*event->type & BIT(IIDC_EVENT_AFTER_MTU_CHANGE)) {

	if (*event->type & BIT(IIDC_RDMA_EVENT_AFTER_MTU_CHANGE)) {

		ibdev_dbg(&iwdev->ibdev, "CLNT: new MTU = %d\n", iwdev->netdev->mtu);

		if (iwdev->vsi.mtu != iwdev->netdev->mtu) {

			l2params.mtu = iwdev->netdev->mtu;
@@ -98,13 +98,13 @@ static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event 
			irdma_log_invalid_mtu(l2params.mtu, &iwdev->rf->sc_dev);

			irdma_change_l2params(&iwdev->vsi, &l2params);

		}

	} else if (*event->type & BIT(IIDC_EVENT_BEFORE_TC_CHANGE)) {

	} else if (*event->type & BIT(IIDC_RDMA_EVENT_BEFORE_TC_CHANGE)) {

		if (iwdev->vsi.tc_change_pending)

			return;



		irdma_prep_tc_change(iwdev);

	} else if (*event->type & BIT(IIDC_EVENT_AFTER_TC_CHANGE)) {

		struct iidc_qos_params qos_info = {};

	} else if (*event->type & BIT(IIDC_RDMA_EVENT_AFTER_TC_CHANGE)) {

		struct iidc_rdma_qos_params qos_info = {};



		if (!iwdev->vsi.tc_change_pending)

			return;
@@ -116,7 +116,7 @@ static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event 
		if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)

			iwdev->dcb_vlan_mode = qos_info.num_tc > 1 && !l2params.dscp_mode;

		irdma_change_l2params(&iwdev->vsi, &l2params);

	} else if (*event->type & BIT(IIDC_EVENT_CRIT_ERR)) {

	} else if (*event->type & BIT(IIDC_RDMA_EVENT_CRIT_ERR)) {

		ibdev_warn(&iwdev->ibdev, "ICE OICR event notification: oicr = 0x%08x\n",

			   event->reg);

		if (event->reg & IRDMAPFINT_OICR_PE_CRITERR_M) {
@@ -245,11 +245,12 @@ static void irdma_deinit_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf) 


static void irdma_remove(struct auxiliary_device *aux_dev)

{

	struct iidc_auxiliary_dev *iidc_adev = container_of(aux_dev,

							    struct iidc_auxiliary_dev,

							    adev);

	struct ice_pf *pf = iidc_adev->pf;

	struct irdma_device *iwdev = auxiliary_get_drvdata(aux_dev);

	struct iidc_rdma_core_auxiliary_dev *iidc_adev;

	struct ice_pf *pf;



	iidc_adev = container_of(aux_dev, struct iidc_rdma_core_auxiliary_dev, adev);

	pf = iidc_adev->pf;



	irdma_ib_unregister_device(iwdev);

	ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, false);
@@ -292,17 +293,19 @@ static void irdma_fill_device_info(struct irdma_device *iwdev, struct ice_pf *pf 


static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_device_id *id)

{

	struct iidc_auxiliary_dev *iidc_adev = container_of(aux_dev,

							    struct iidc_auxiliary_dev,

							    adev);

	struct ice_pf *pf = iidc_adev->pf;

	struct ice_vsi *vsi = ice_get_main_vsi(pf);

	struct iidc_qos_params qos_info = {};

	struct iidc_rdma_core_auxiliary_dev *iidc_adev;

	struct iidc_rdma_qos_params qos_info = {};

	struct irdma_l2params l2params = {};

	struct irdma_device *iwdev;

	struct irdma_pci_f *rf;

	struct irdma_l2params l2params = {};

	struct ice_vsi *vsi;

	struct ice_pf *pf;

	int err;



	iidc_adev = container_of(aux_dev, struct iidc_rdma_core_auxiliary_dev, adev);

	pf = iidc_adev->pf;

	vsi = ice_get_main_vsi(pf);



	if (!vsi)

		return -EIO;

	iwdev = ib_alloc_device(irdma_device, ibdev);
@@ -367,7 +370,7 @@ static const struct auxiliary_device_id irdma_auxiliary_id_table[] = { 


MODULE_DEVICE_TABLE(auxiliary, irdma_auxiliary_id_table);



static struct iidc_auxiliary_drv irdma_auxiliary_drv = {

static struct iidc_rdma_core_auxiliary_drv irdma_auxiliary_drv = {

	.adrv = {

	    .id_table = irdma_auxiliary_id_table,

	    .probe = irdma_probe,

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

+4 −4
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 
	struct ice_aqc_port_ets_elem buf = { 0 };

	struct ice_dcbx_cfg *old_cfg, *curr_cfg;

	struct device *dev = ice_pf_to_dev(pf);

	struct iidc_rdma_event *event;

	int ret = ICE_DCB_NO_HW_CHG;

	struct iidc_event *event;

	struct ice_vsi *pf_vsi;



	curr_cfg = &pf->hw.port_info->qos_cfg.local_dcbx_cfg;
@@ -405,7 +405,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 
		goto free_cfg;

	}



	set_bit(IIDC_EVENT_BEFORE_TC_CHANGE, event->type);

	set_bit(IIDC_RDMA_EVENT_BEFORE_TC_CHANGE, event->type);

	ice_send_event_to_aux(pf, event);

	kfree(event);
@@ -740,7 +740,7 @@ static int ice_dcb_noncontig_cfg(struct ice_pf *pf) 
void ice_pf_dcb_recfg(struct ice_pf *pf, bool locked)

{

	struct ice_dcbx_cfg *dcbcfg = &pf->hw.port_info->qos_cfg.local_dcbx_cfg;

	struct iidc_event *event;

	struct iidc_rdma_event *event;

	u8 tc_map = 0;

	int v, ret;
@@ -789,7 +789,7 @@ void ice_pf_dcb_recfg(struct ice_pf *pf, bool locked) 
		if (!event)

			return;



		set_bit(IIDC_EVENT_AFTER_TC_CHANGE, event->type);

		set_bit(IIDC_RDMA_EVENT_AFTER_TC_CHANGE, event->type);

		ice_send_event_to_aux(pf, event);

		kfree(event);

	}

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

+13 −10
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ static DEFINE_XARRAY_ALLOC1(ice_aux_id); 
 * This function has to be called with a device_lock on the

 * pf->adev.dev to avoid race conditions.

 */

static struct iidc_auxiliary_drv *ice_get_auxiliary_drv(struct ice_pf *pf)

static

struct iidc_rdma_core_auxiliary_drv *ice_get_auxiliary_drv(struct ice_pf *pf)

{

	struct auxiliary_device *adev;
@@ -23,8 +24,8 @@ static struct iidc_auxiliary_drv *ice_get_auxiliary_drv(struct ice_pf *pf) 
	if (!adev || !adev->dev.driver)

		return NULL;



	return container_of(adev->dev.driver, struct iidc_auxiliary_drv,

			    adrv.driver);

	return container_of(adev->dev.driver,

			    struct iidc_rdma_core_auxiliary_drv, adrv.driver);

}



/**
@@ -32,9 +33,9 @@ static struct iidc_auxiliary_drv *ice_get_auxiliary_drv(struct ice_pf *pf) 
 * @pf: pointer to PF struct

 * @event: event struct

 */

void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_event *event)

void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_rdma_event *event)

{

	struct iidc_auxiliary_drv *iadrv;

	struct iidc_rdma_core_auxiliary_drv *iadrv;



	if (WARN_ON_ONCE(!in_task()))

		return;
@@ -141,7 +142,8 @@ EXPORT_SYMBOL_GPL(ice_del_rdma_qset); 
 * @pf: struct for PF

 * @reset_type: type of reset

 */

int ice_rdma_request_reset(struct ice_pf *pf, enum iidc_reset_type reset_type)

int ice_rdma_request_reset(struct ice_pf *pf,

			   enum iidc_rdma_reset_type reset_type)

{

	enum ice_reset_req reset;
@@ -205,7 +207,7 @@ EXPORT_SYMBOL_GPL(ice_rdma_update_vsi_filter); 
 * @pf: pointer to PF struct

 * @qos: set of QoS values

 */

void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos)

void ice_get_qos_params(struct ice_pf *pf, struct iidc_rdma_qos_params *qos)

{

	struct ice_dcbx_cfg *dcbx_cfg;

	unsigned int i;
@@ -263,9 +265,10 @@ EXPORT_SYMBOL_GPL(ice_free_rdma_qvector); 
 */

static void ice_adev_release(struct device *dev)

{

	struct iidc_auxiliary_dev *iadev;

	struct iidc_rdma_core_auxiliary_dev *iadev;



	iadev = container_of(dev, struct iidc_auxiliary_dev, adev.dev);

	iadev = container_of(dev, struct iidc_rdma_core_auxiliary_dev,

			     adev.dev);

	kfree(iadev);

}
@@ -275,7 +278,7 @@ static void ice_adev_release(struct device *dev) 
 */

int ice_plug_aux_dev(struct ice_pf *pf)

{

	struct iidc_auxiliary_dev *iadev;

	struct iidc_rdma_core_auxiliary_dev *iadev;

	struct auxiliary_device *adev;

	int ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 


struct ice_pf;



void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_event *event);

void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_rdma_event *event);



#endif /* !_ICE_IDC_INT_H_ */

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

+4 −4
Original line number Diff line number Diff line
@@ -2401,11 +2401,11 @@ static void ice_service_task(struct work_struct *work) 
	}



	if (test_and_clear_bit(ICE_AUX_ERR_PENDING, pf->state)) {

		struct iidc_event *event;

		struct iidc_rdma_event *event;



		event = kzalloc(sizeof(*event), GFP_KERNEL);

		if (event) {

			set_bit(IIDC_EVENT_CRIT_ERR, event->type);

			set_bit(IIDC_RDMA_EVENT_CRIT_ERR, event->type);

			/* report the entire OICR value to AUX driver */

			swap(event->reg, pf->oicr_err_reg);

			ice_send_event_to_aux(pf, event);
@@ -2424,11 +2424,11 @@ static void ice_service_task(struct work_struct *work) 
		ice_plug_aux_dev(pf);



	if (test_and_clear_bit(ICE_FLAG_MTU_CHANGED, pf->flags)) {

		struct iidc_event *event;

		struct iidc_rdma_event *event;



		event = kzalloc(sizeof(*event), GFP_KERNEL);

		if (event) {

			set_bit(IIDC_EVENT_AFTER_MTU_CHANGE, event->type);

			set_bit(IIDC_RDMA_EVENT_AFTER_MTU_CHANGE, event->type);

			ice_send_event_to_aux(pf, event);

			kfree(event);

		}