diff mbox series

[v1,24/30] net/i40e/base: make semaphore timeout 32-bit

Message ID	2dceaa2fbd8eee934a7ff28ee2837fefe196422e.1725270827.git.anatoly.burakov@intel.com (mailing list archive)
State	Accepted
Delegated to:	Bruce Richardson
Headers	From: Anatoly Burakov <anatoly.burakov@intel.com> To: dev@dpdk.org Cc: bruce.richardson@intel.com Subject: [PATCH v1 24/30] net/i40e/base: make semaphore timeout 32-bit Date: Mon, 2 Sep 2024 10:54:36 +0100 Message-ID: <2dceaa2fbd8eee934a7ff28ee2837fefe196422e.1725270827.git.anatoly.burakov@intel.com> In-Reply-To: <cover.1725270827.git.anatoly.burakov@intel.com> References: <cover.1725270827.git.anatoly.burakov@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	Update net/i40e base driver \| [v1,00/30] Update net/i40e base driver [v1,01/30] net/i40e/base: adjust whitespace [v1,02/30] net/i40e/base: strip all tags from code [v1,03/30] net/i40e/base: remove non-inclusive language [v1,04/30] net/i40e/base: remove unused variables [v1,05/30] net/i40e/base: don't set flags in i40e_init_shared_code [v1,06/30] net/i40e/base: fix misleading debug logs and comments [v1,07/30] net/i40e/base: add missing define to X710TL device check [v1,08/30] net/i40e/base: add new device ID to 25G device list [v1,09/30] net/i40e/base: fix setting MAC type for X722 [v1,10/30] net/i40e/base: add definitions for rx_err1 [v1,11/30] net/i40e/base: fix not blinking X722 with x557 PHY [v1,12/30] net/i40e/base: add VLAN field for input set [v1,13/30] net/i40e/base: allow reading LED blink setting [v1,14/30] net/i40e/base: do not load DDP packages with reserved track ID [v1,15/30] net/i40e/base: add DDP package type defines [v1,16/30] net/i40e/base: add X722 defines for input set mask [v1,17/30] net/i40e/base: improve typecasting [v1,18/30] net/i40e/base: add named and raw structs to rx desc [v1,19/30] net/i40e/base: align registers to the specification [v1,20/30] net/i40e/base: add PHY debug register dump [v1,21/30] net/i40e/base: make register dump read-only [v1,22/30] net/i40e/base: fix unchecked return value [v1,23/30] net/i40e/base: check loop bounds [v1,24/30] net/i40e/base: make semaphore timeout 32-bit [v1,25/30] net/i40e/base: add register definitions for FLU [v1,26/30] net/i40e/base: add NVM acquire with custom timeout [v1,27/30] net/i40e/base: change time variables from 64 bit to 32 bit [v1,28/30] net/i40e/base: add trace buffer reading dependencies [v1,29/30] net/i40e/base: add Shadow RAM pointer definition [v1,30/30] net/i40e: update base driver README

Checks

Context	Check	Description
ci/checkpatch	warning	coding style issues

Commit Message

Burakov, Anatoly Sept. 2, 2024, 9:54 a.m. UTC

From: Aleksandr Loktionov <aleksandr.loktionov@intel.com>

Decrease hw_semaphore_timeout size down to 32bits, because FW
I40E_GLVFGEN_TIMER register is 32bits only anyway, and having both
variables as same 32-bit size simplifies code. Also, fix FW write semaphore
expiration condition, taking into account that I40E_GLVFGEN_TIMER wraps,
by checking the sign of substraction of two 32 bit vaues.

Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/net/i40e/base/i40e_nvm.c  | 8 ++++----
 drivers/net/i40e/base/i40e_type.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 05816a4b79..c0f40691f3 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -61,7 +61,7 @@  enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw,
 				       enum i40e_aq_resource_access_type access)
 {
 	enum i40e_status_code ret_code = I40E_SUCCESS;
-	u64 gtime, timeout;
+	u32 gtime, timeout;
 	u64 time_left = 0;
 
 	DEBUGFUNC("i40e_acquire_nvm");
@@ -85,7 +85,7 @@  enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw,
 	if (ret_code && time_left) {
 		/* Poll until the current NVM owner timeouts */
 		timeout = I40E_MS_TO_GTIME(I40E_MAX_NVM_TIMEOUT) + gtime;
-		while ((gtime < timeout) && time_left) {
+		while ((s32)(gtime - timeout) < 0 && time_left) {
 			i40e_msec_delay(10);
 			gtime = rd32(hw, I40E_GLVFGEN_TIMER);
 			ret_code = i40e_aq_request_resource(hw,
@@ -1301,9 +1301,9 @@  STATIC enum i40e_status_code i40e_nvmupd_state_writing(struct i40e_hw *hw,
 		u32 gtime;
 
 		gtime = rd32(hw, I40E_GLVFGEN_TIMER);
-		if (gtime >= hw->nvm.hw_semaphore_timeout) {
+		if ((s32)(gtime - hw->nvm.hw_semaphore_timeout) >= 0) {
 			i40e_debug(hw, I40E_DEBUG_ALL,
-				   "NVMUPD: write semaphore expired (%d >= %" PRIu64 "), retrying\n",
+				   "NVMUPD: write semaphore expired (%d >= %" PRIu32 "), retrying\n",
 				   gtime, hw->nvm.hw_semaphore_timeout);
 			i40e_release_nvm(hw);
 			status = i40e_acquire_nvm(hw, I40E_RESOURCE_WRITE);
diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h
index 83cf701fb4..2d5afb99dd 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -443,7 +443,7 @@  enum i40e_aq_resource_access_type {
 };
 
 struct i40e_nvm_info {
-	u64 hw_semaphore_timeout; /* usec global time (GTIME resolution) */
+	u32 hw_semaphore_timeout; /* usec global time (GTIME resolution) */
 	u32 timeout;              /* [ms] */
 	u16 sr_size;              /* Shadow RAM size in words */
 	bool blank_nvm_mode;      /* is NVM empty (no FW present)*/