Commit 9a946843 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Use ice_pf_to_dev 



Use ice_pf_to_dev(pf) instead of &pf->pdev->dev
Use ice_pf_to_dev(vsi->back) instead of &vsi->back->pdev->dev
When a pointer to the pf instance is available, use ice_pf_to_dev
instead of ice_hw_to_dev

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0a6ea04e

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

+6 −6
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
			if (err)

				return err;



			dev_info(&vsi->back->pdev->dev, "Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\n",

			dev_info(ice_pf_to_dev(vsi->back), "Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\n",

				 ring->q_index);

		} else {

			ring->zca.free = NULL;
@@ -405,7 +405,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	/* Absolute queue number out of 2K needs to be passed */

	err = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);

	if (err) {

		dev_err(&vsi->back->pdev->dev,

		dev_err(ice_pf_to_dev(vsi->back),

			"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",

			pf_q, err);

		return -EIO;
@@ -428,7 +428,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	      ice_alloc_rx_bufs_slow_zc(ring, ICE_DESC_UNUSED(ring)) :

	      ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));

	if (err)

		dev_info(&vsi->back->pdev->dev,

		dev_info(ice_pf_to_dev(vsi->back),

			 "Failed allocate some buffers on %sRx ring %d (pf_q %d)\n",

			 ring->xsk_umem ? "UMEM enabled " : "",

			 ring->q_index, pf_q);
@@ -815,13 +815,13 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
	 * queues at the hardware level anyway.

	 */

	if (status == ICE_ERR_RESET_ONGOING) {

		dev_dbg(&vsi->back->pdev->dev,

		dev_dbg(ice_pf_to_dev(vsi->back),

			"Reset in progress. LAN Tx queues already disabled\n");

	} else if (status == ICE_ERR_DOES_NOT_EXIST) {

		dev_dbg(&vsi->back->pdev->dev,

		dev_dbg(ice_pf_to_dev(vsi->back),

			"LAN Tx queues do not exist, nothing to disable\n");

	} else if (status) {

		dev_err(&vsi->back->pdev->dev,

		dev_err(ice_pf_to_dev(vsi->back),

			"Failed to disable LAN Tx queues, error: %d\n", status);

		return -ENODEV;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ ice_dcbnl_vsi_del_app(struct ice_vsi *vsi, 
	sapp.protocol = app->prot_id;

	sapp.priority = app->priority;

	err = ice_dcbnl_delapp(vsi->netdev, &sapp);

	dev_dbg(&vsi->back->pdev->dev,

	dev_dbg(ice_pf_to_dev(vsi->back),

		"Deleting app for VSI idx=%d err=%d sel=%d proto=0x%x, prio=%d\n",

		vsi->idx, err, app->selector, app->prot_id, app->priority);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ ice_set_fecparam(struct net_device *netdev, struct ethtool_fecparam *fecparam) 
		fec = ICE_FEC_NONE;

		break;

	default:

		dev_warn(&vsi->back->pdev->dev, "Unsupported FEC mode: %d\n",

		dev_warn(ice_pf_to_dev(vsi->back), "Unsupported FEC mode: %d\n",

			 fecparam->fec);

		return -EINVAL;

	}

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

+7 −7
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi) 
		vsi->num_tx_desc = ICE_DFLT_NUM_TX_DESC;

		break;

	default:

		dev_dbg(&vsi->back->pdev->dev,

		dev_dbg(ice_pf_to_dev(vsi->back),

			"Not setting number of Tx/Rx descriptors for VSI type %d\n",

			vsi->type);

		break;
@@ -724,7 +724,7 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt) 
	vsi->num_txq = tx_count;



	if (vsi->type == ICE_VSI_VF && vsi->num_txq != vsi->num_rxq) {

		dev_dbg(&vsi->back->pdev->dev, "VF VSI should have same number of Tx and Rx queues. Hence making them equal\n");

		dev_dbg(ice_pf_to_dev(vsi->back), "VF VSI should have same number of Tx and Rx queues. Hence making them equal\n");

		/* since there is a chance that num_rxq could have been changed

		 * in the above for loop, make num_txq equal to num_rxq.

		 */
@@ -1453,7 +1453,7 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi) 


		err = ice_setup_rx_ctx(vsi->rx_rings[i]);

		if (err) {

			dev_err(&vsi->back->pdev->dev,

			dev_err(ice_pf_to_dev(vsi->back),

				"ice_setup_rx_ctx failed for RxQ %d, err %d\n",

				i, err);

			return err;
@@ -1623,7 +1623,7 @@ int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi) 


	status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);

	if (status) {

		dev_err(&vsi->back->pdev->dev, "update VSI for VLAN insert failed, err %d aq_err %d\n",

		dev_err(ice_pf_to_dev(vsi->back), "update VSI for VLAN insert failed, err %d aq_err %d\n",

			status, hw->adminq.sq_last_status);

		ret = -EIO;

		goto out;
@@ -1669,7 +1669,7 @@ int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena) 


	status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);

	if (status) {

		dev_err(&vsi->back->pdev->dev, "update VSI for VLAN strip failed, ena = %d err %d aq_err %d\n",

		dev_err(ice_pf_to_dev(vsi->back), "update VSI for VLAN strip failed, ena = %d err %d aq_err %d\n",

			ena, status, hw->adminq.sq_last_status);

		ret = -EIO;

		goto out;
@@ -1834,7 +1834,7 @@ ice_vsi_set_q_vectors_reg_idx(struct ice_vsi *vsi) 
		struct ice_q_vector *q_vector = vsi->q_vectors[i];



		if (!q_vector) {

			dev_err(&vsi->back->pdev->dev,

			dev_err(ice_pf_to_dev(vsi->back),

				"Failed to set reg_idx on q_vector %d VSI %d\n",

				i, vsi->vsi_num);

			goto clear_reg_idx;
@@ -2961,7 +2961,7 @@ ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set) 
		status = ice_remove_mac(&vsi->back->hw, &tmp_add_list);



cfg_mac_fltr_exit:

	ice_free_fltr_list(&vsi->back->pdev->dev, &tmp_add_list);

	ice_free_fltr_list(ice_pf_to_dev(vsi->back), &tmp_add_list);

	return status;

}

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

+8 −8
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int ice_cfg_promisc(struct ice_vsi *vsi, u8 promisc_m, bool set_promisc) 
 */

static int ice_vsi_sync_fltr(struct ice_vsi *vsi)

{

	struct device *dev = &vsi->back->pdev->dev;

	struct device *dev = ice_pf_to_dev(vsi->back);

	struct net_device *netdev = vsi->netdev;

	bool promisc_forced_on = false;

	struct ice_pf *pf = vsi->back;
@@ -1368,7 +1368,7 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up) 
	if (vsi->type != ICE_VSI_PF)

		return 0;



	dev = &vsi->back->pdev->dev;

	dev = ice_pf_to_dev(vsi->back);



	pi = vsi->port_info;
@@ -1686,7 +1686,7 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename) 
 */

static int ice_xdp_alloc_setup_rings(struct ice_vsi *vsi)

{

	struct device *dev = &vsi->back->pdev->dev;

	struct device *dev = ice_pf_to_dev(vsi->back);

	int i;



	for (i = 0; i < vsi->num_xdp_txq; i++) {
@@ -3870,14 +3870,14 @@ ice_set_features(struct net_device *netdev, netdev_features_t features) 


	/* Don't set any netdev advanced features with device in Safe Mode */

	if (ice_is_safe_mode(vsi->back)) {

		dev_err(&vsi->back->pdev->dev,

		dev_err(ice_pf_to_dev(vsi->back),

			"Device is in Safe Mode - not enabling advanced netdev features\n");

		return ret;

	}



	/* Do not change setting during reset */

	if (ice_is_reset_in_progress(pf->state)) {

		dev_err(&vsi->back->pdev->dev,

		dev_err(ice_pf_to_dev(vsi->back),

			"Device is resetting, changing advanced netdev features temporarily unavailable.\n");

		return -EBUSY;

	}
@@ -4420,7 +4420,7 @@ int ice_vsi_setup_tx_rings(struct ice_vsi *vsi) 
	int i, err = 0;



	if (!vsi->num_txq) {

		dev_err(&vsi->back->pdev->dev, "VSI %d has 0 Tx queues\n",

		dev_err(ice_pf_to_dev(vsi->back), "VSI %d has 0 Tx queues\n",

			vsi->vsi_num);

		return -EINVAL;

	}
@@ -4451,7 +4451,7 @@ int ice_vsi_setup_rx_rings(struct ice_vsi *vsi) 
	int i, err = 0;



	if (!vsi->num_rxq) {

		dev_err(&vsi->back->pdev->dev, "VSI %d has 0 Rx queues\n",

		dev_err(ice_pf_to_dev(vsi->back), "VSI %d has 0 Rx queues\n",

			vsi->vsi_num);

		return -EINVAL;

	}
@@ -4987,7 +4987,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode) 


	status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);

	if (status) {

		dev_err(&vsi->back->pdev->dev, "update VSI for bridge mode failed, bmode = %d err %d aq_err %d\n",

		dev_err(ice_pf_to_dev(vsi->back), "update VSI for bridge mode failed, bmode = %d err %d aq_err %d\n",

			bmode, status, hw->adminq.sq_last_status);

		ret = -EIO;

		goto out;