DPDK should support more than just 9-level or 5-level topologies, so remove the checks for those particular settings.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com> --- drivers/net/ice/base/ice_ddp.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/drivers/net/ice/base/ice_ddp.c b/drivers/net/ice/base/ice_ddp.c index e6c42c5274..744f015fe5 100644 --- a/drivers/net/ice/base/ice_ddp.c +++ b/drivers/net/ice/base/ice_ddp.c @@ -2373,38 +2373,6 @@ int ice_cfg_tx_topo(struct ice_hw *hw, u8 *buf, u32 len) return status; } - /* Is default topology already applied ? */ - if (!(flags & ICE_AQC_TX_TOPO_FLAGS_LOAD_NEW) && - hw->num_tx_sched_layers == 9) { - ice_debug(hw, ICE_DBG_INIT, "Loaded default topology\n"); - /* Already default topology is loaded */ - return ICE_ERR_ALREADY_EXISTS; - } - - /* Is new topology already applied ? */ - if ((flags & ICE_AQC_TX_TOPO_FLAGS_LOAD_NEW) && - hw->num_tx_sched_layers == 5) { - ice_debug(hw, ICE_DBG_INIT, "Loaded new topology\n"); - /* Already new topology is loaded */ - return ICE_ERR_ALREADY_EXISTS; - } - - /* Is set topology issued already ? */ - if (flags & ICE_AQC_TX_TOPO_FLAGS_ISSUED) { - ice_debug(hw, ICE_DBG_INIT, "Update tx topology was done by another PF\n"); - /* add a small delay before exiting */ - for (i = 0; i < 20; i++) - ice_msec_delay(100, true); - return ICE_ERR_ALREADY_EXISTS; - } - - /* Change the topology from new to default (5 to 9) */ - if (!(flags & ICE_AQC_TX_TOPO_FLAGS_LOAD_NEW) && - hw->num_tx_sched_layers == 5) { - ice_debug(hw, ICE_DBG_INIT, "Change topology from 5 to 9 layers\n"); - goto update_topo; - } - pkg_hdr = (struct ice_pkg_hdr *)buf; state = ice_verify_pkg(pkg_hdr, len); if (state) { @@ -2451,7 +2419,6 @@ int ice_cfg_tx_topo(struct ice_hw *hw, u8 *buf, u32 len) /* Get the new topology buffer */ new_topo = ((u8 *)section) + offset; -update_topo: /* acquire global lock to make sure that set topology issued * by one PF */ -- 2.43.0