Commit 5b246e53 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: split probe into smaller functions 



Part of code from probe can be reused in reload flow. Move this code to
separate function. Create unroll functions for each part of
initialization, like: ice_init_dev() and ice_deinit_dev(). It
simplifies unrolling and can be used in remove flow.

Avoid freeing port info as it could be reused in reload path.
Will be freed in remove path since is allocated via devm_kzalloc().

Also clean the remove path to reflect the init steps.

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent a696d615

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

+2 −0
Original line number Diff line number Diff line
@@ -931,6 +931,8 @@ int ice_open(struct net_device *netdev); 
int ice_open_internal(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

void ice_service_task_schedule(struct ice_pf *pf);

int ice_load(struct ice_pf *pf);

void ice_unload(struct ice_pf *pf);



/**

 * ice_set_rdma_cap - enable RDMA support

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

+4 −7
Original line number Diff line number Diff line
@@ -1088,8 +1088,10 @@ int ice_init_hw(struct ice_hw *hw) 
	if (status)

		goto err_unroll_cqinit;



	if (!hw->port_info)

		hw->port_info = devm_kzalloc(ice_hw_to_dev(hw),

				     sizeof(*hw->port_info), GFP_KERNEL);

					     sizeof(*hw->port_info),

					     GFP_KERNEL);

	if (!hw->port_info) {

		status = -ENOMEM;

		goto err_unroll_cqinit;
@@ -1217,11 +1219,6 @@ void ice_deinit_hw(struct ice_hw *hw) 
	ice_free_hw_tbls(hw);

	mutex_destroy(&hw->tnl_lock);



	if (hw->port_info) {

		devm_kfree(ice_hw_to_dev(hw), hw->port_info);

		hw->port_info = NULL;

	}



	/* Attempt to disable FW logging before shutting down control queues */

	ice_cfg_fw_log(hw, false);

	ice_destroy_all_ctrlq(hw);

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

+553 −381

File changed.

Preview size limit exceeded, changes collapsed.