From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id BCAEB4575B;
	Wed,  7 Aug 2024 11:48:30 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id 9E94242D66;
	Wed,  7 Aug 2024 11:47:31 +0200 (CEST)
Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14])
 by mails.dpdk.org (Postfix) with ESMTP id 3EE37427B9
 for <dev@dpdk.org>; Wed,  7 Aug 2024 11:47:24 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
 t=1723024045; x=1754560045;
 h=from:to:cc:subject:date:message-id:in-reply-to:
 references:mime-version:content-transfer-encoding;
 bh=qOxFlFAxWuyEOUSQHTprnZIWb3sQBavBp1ESUG5WutQ=;
 b=V8UtWTnCrQKwawU1x0QRiyXEPEpZVdYnAJut1tVoPm+rPYs/k0qKVVo0
 B3c+kmrgHPRdRgm1WO71Azz5wdLcUi8KfKBMntq7FU9gfZxEC9hPVGk1C
 Q+RjEY/UMVm00/cgH4qTkYIkRexd3d0qpq7G29jmGvLw83eGey9ErgPFu
 IgMvh+Pm15wl6GRdFZ1v6VxvHhhtMWksqkK5yTa9Pc1SyrEB5a4k3GFxo
 plYhmZyQ715k8nIhNpbQEpkXYnfIhVk6wl/rUAp7239jsbl4gcx2frtZn
 RKV/yB1cCPwKVeOfAHIxwXLS6xXBU2kFmSf5r4hdYChwyelDUjty2LFF4 Q==;
X-CSE-ConnectionGUID: b79ukhHeShmXwdqpZspyZA==
X-CSE-MsgGUID: QqFWxflMQ2i64cZQ9QYj5w==
X-IronPort-AV: E=McAfee;i="6700,10204,11156"; a="21257949"
X-IronPort-AV: E=Sophos;i="6.09,269,1716274800"; d="scan'208";a="21257949"
Received: from orviesa002.jf.intel.com ([10.64.159.142])
 by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
 07 Aug 2024 02:47:24 -0700
X-CSE-ConnectionGUID: I4QjcZg1SbScl68PEBVW2w==
X-CSE-MsgGUID: E5Xkdwi6Q8a1pBmIlVDUvQ==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.09,269,1716274800"; d="scan'208";a="87467400"
Received: from silpixa00400562.ir.intel.com (HELO
 silpixa00401385.ir.intel.com) ([10.237.214.39])
 by orviesa002.jf.intel.com with ESMTP; 07 Aug 2024 02:47:23 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH v2 12/15] net/ice/base: remove flag checks before topology
 upload
Date: Wed,  7 Aug 2024 10:47:03 +0100
Message-ID: <20240807094706.459822-13-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240807094706.459822-1-bruce.richardson@intel.com>
References: <20240807093407.452784-1-bruce.richardson@intel.com>
 <20240807094706.459822-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=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 <bruce.richardson@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