Commit a778616e authored by Dan Nowlin's avatar Dan Nowlin Committed by Tony Nguyen
Browse files

ice: fix DDP package download for packages without signature segment 



Commit 3cbdb034 ("ice: Add support for E830 DDP package segment")
incorrectly removed support for package download for packages without a
signature segment. These packages include the signature buffer inline
in the configurations buffers, and not in a signature segment.

Fix package download by providing download support for both packages
with (ice_download_pkg_with_sig_seg()) and without signature segment
(ice_download_pkg_without_sig_seg()).

Fixes: 3cbdb034 ("ice: Add support for E830 DDP package segment")
Reported-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Closes: https://lore.kernel.org/netdev/ZUT50a94kk2pMGKb@boxer/


Tested-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDan Nowlin <dan.nowlin@intel.com>
Signed-off-by: default avatarPaul Greenwalt <paul.greenwalt@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Arpana Arland <arpanax.arland@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 6db5f2cd

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

+100 −3
Original line number Diff line number Diff line
@@ -1479,14 +1479,14 @@ ice_post_dwnld_pkg_actions(struct ice_hw *hw) 
}



/**

 * ice_download_pkg

 * ice_download_pkg_with_sig_seg

 * @hw: pointer to the hardware structure

 * @pkg_hdr: pointer to package header

 *

 * Handles the download of a complete package.

 */

static enum ice_ddp_state

ice_download_pkg(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr)

ice_download_pkg_with_sig_seg(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr)

{

	enum ice_aq_err aq_err = hw->adminq.sq_last_status;

	enum ice_ddp_state state = ICE_DDP_PKG_ERR;
@@ -1519,6 +1519,103 @@ ice_download_pkg(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr) 
		state = ice_post_dwnld_pkg_actions(hw);



	ice_release_global_cfg_lock(hw);



	return state;

}



/**

 * ice_dwnld_cfg_bufs

 * @hw: pointer to the hardware structure

 * @bufs: pointer to an array of buffers

 * @count: the number of buffers in the array

 *

 * Obtains global config lock and downloads the package configuration buffers

 * to the firmware.

 */

static enum ice_ddp_state

ice_dwnld_cfg_bufs(struct ice_hw *hw, struct ice_buf *bufs, u32 count)

{

	enum ice_ddp_state state;

	struct ice_buf_hdr *bh;

	int status;



	if (!bufs || !count)

		return ICE_DDP_PKG_ERR;



	/* If the first buffer's first section has its metadata bit set

	 * then there are no buffers to be downloaded, and the operation is

	 * considered a success.

	 */

	bh = (struct ice_buf_hdr *)bufs;

	if (le32_to_cpu(bh->section_entry[0].type) & ICE_METADATA_BUF)

		return ICE_DDP_PKG_SUCCESS;



	status = ice_acquire_global_cfg_lock(hw, ICE_RES_WRITE);

	if (status) {

		if (status == -EALREADY)

			return ICE_DDP_PKG_ALREADY_LOADED;

		return ice_map_aq_err_to_ddp_state(hw->adminq.sq_last_status);

	}



	state = ice_dwnld_cfg_bufs_no_lock(hw, bufs, 0, count, true);

	if (!state)

		state = ice_post_dwnld_pkg_actions(hw);



	ice_release_global_cfg_lock(hw);



	return state;

}



/**

 * ice_download_pkg_without_sig_seg

 * @hw: pointer to the hardware structure

 * @ice_seg: pointer to the segment of the package to be downloaded

 *

 * Handles the download of a complete package without signature segment.

 */

static enum ice_ddp_state

ice_download_pkg_without_sig_seg(struct ice_hw *hw, struct ice_seg *ice_seg)

{

	struct ice_buf_table *ice_buf_tbl;



	ice_debug(hw, ICE_DBG_PKG, "Segment format version: %d.%d.%d.%d\n",

		  ice_seg->hdr.seg_format_ver.major,

		  ice_seg->hdr.seg_format_ver.minor,

		  ice_seg->hdr.seg_format_ver.update,

		  ice_seg->hdr.seg_format_ver.draft);



	ice_debug(hw, ICE_DBG_PKG, "Seg: type 0x%X, size %d, name %s\n",

		  le32_to_cpu(ice_seg->hdr.seg_type),

		  le32_to_cpu(ice_seg->hdr.seg_size), ice_seg->hdr.seg_id);



	ice_buf_tbl = ice_find_buf_table(ice_seg);



	ice_debug(hw, ICE_DBG_PKG, "Seg buf count: %d\n",

		  le32_to_cpu(ice_buf_tbl->buf_count));



	return ice_dwnld_cfg_bufs(hw, ice_buf_tbl->buf_array,

				  le32_to_cpu(ice_buf_tbl->buf_count));

}



/**

 * ice_download_pkg

 * @hw: pointer to the hardware structure

 * @pkg_hdr: pointer to package header

 * @ice_seg: pointer to the segment of the package to be downloaded

 *

 * Handles the download of a complete package.

 */

static enum ice_ddp_state

ice_download_pkg(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr,

		 struct ice_seg *ice_seg)

{

	enum ice_ddp_state state;



	if (hw->pkg_has_signing_seg)

		state = ice_download_pkg_with_sig_seg(hw, pkg_hdr);

	else

		state = ice_download_pkg_without_sig_seg(hw, ice_seg);



	ice_post_pkg_dwnld_vlan_mode_cfg(hw);



	return state;
@@ -2083,7 +2180,7 @@ enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len) 


	/* initialize package hints and then download package */

	ice_init_pkg_hints(hw, seg);

	state = ice_download_pkg(hw, pkg);

	state = ice_download_pkg(hw, pkg, seg);

	if (state == ICE_DDP_PKG_ALREADY_LOADED) {

		ice_debug(hw, ICE_DBG_INIT,

			  "package previously loaded - no work.\n");