From patchwork Mon Aug 12 15:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143094 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 341CB457A1; Mon, 12 Aug 2024 17:29:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A2A040E2F; Mon, 12 Aug 2024 17:28:50 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by mails.dpdk.org (Postfix) with ESMTP id 71A5E40DD2 for ; Mon, 12 Aug 2024 17:28:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723476521; x=1755012521; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qOxFlFAxWuyEOUSQHTprnZIWb3sQBavBp1ESUG5WutQ=; b=A/DYM6gHWoO84Mf6R+8bpuwUIydBlK0EaN0anA3D2ZmKGnuMZ/5t831R Dbrfm/9qtnQTalhwFS+VTxcJm9ys/DGwTO7hFks/hot6pUkXIg4KrWPt5 xqeXhl7+kXN0MhLxNfAhhlrbCU2RyGfEAKdJ/ZoWzbSTTNPpvPvgyCejb y8vLNN7zZkQvhpkgZ717Tjm4Vh7/HTFeSsZ1+EMif8A20hI0/ViCgh3pQ f2hrHPPt0okyUDZJaCyxku5HkoNI3A6HAFmPcyTG/jdHDq30ccwRilYxl GYziTB5Oj3C4aCeAIMYDiTOptwTO5o9oJl3rihnSSSBr+iq2TkD0eBft4 Q==; X-CSE-ConnectionGUID: jex0pigNRziSYtlRSmTXHQ== X-CSE-MsgGUID: /EJ3Ym79SsOcNiDdS3rY3A== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="21743055" X-IronPort-AV: E=Sophos;i="6.09,283,1716274800"; d="scan'208";a="21743055" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2024 08:28:40 -0700 X-CSE-ConnectionGUID: YnI7+CXaT1i6wYvS5AMvOg== X-CSE-MsgGUID: lMNLUR1tTfmYs+bBqiLUtQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,283,1716274800"; d="scan'208";a="63222591" Received: from silpixa00400562.ir.intel.com (HELO silpixa00401385.ir.intel.com) ([10.237.214.39]) by orviesa004.jf.intel.com with ESMTP; 12 Aug 2024 08:28:40 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v3 12/16] net/ice/base: remove flag checks before topology upload Date: Mon, 12 Aug 2024 16:28:11 +0100 Message-ID: <20240812152815.1132697-13-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812152815.1132697-1-bruce.richardson@intel.com> References: <20240807093407.452784-1-bruce.richardson@intel.com> <20240812152815.1132697-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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 */