[PATCH] net/i40e/base: fix the debug print format

[PATCH] net/i40e/base: fix the debug print format

[Zhichao Zeng]

This patch modifies format specifier in debug prints to match to the
change of time variables from 64 bit to 32 bit.

Fixes: d980a401b137 ("net/i40e/base: add NVM acquire with custom timeout")
Fixes: ba90329a5eb3 ("net/i40e/base: fix invalid log format characters")
Cc: stable@dpdk.org

Signed-off-by: Jaroslaw Ilgiewicz <jaroslaw.ilgiewicz@intel.com>
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
---
 drivers/net/i40e/base/i40e_nvm.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 3e16a0d997..5ece2ebf55 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -79,7 +79,7 @@ enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw,
 
 	if (ret_code)
 		i40e_debug(hw, I40E_DEBUG_NVM,
-			   "NVM acquire type %d failed time_left=%" PRIu32 " ret=%d aq_err=%d\n",
+			   "NVM acquire type %d failed time_left=%u ret=%d aq_err=%d\n",
 			   access, time_left, ret_code, hw->aq.asq_last_status);
 
 	if (ret_code && time_left) {
@@ -101,7 +101,7 @@ enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw,
 		if (ret_code != I40E_SUCCESS) {
 			hw->nvm.hw_semaphore_timeout = 0;
 			i40e_debug(hw, I40E_DEBUG_NVM,
-				   "NVM acquire timed out, wait %" PRIu32 " ms before trying again. status=%d aq_err=%d\n",
+				   "NVM acquire timed out, wait %u ms before trying again. status=%d aq_err=%d\n",
 				   time_left, ret_code, hw->aq.asq_last_status);
 		}
 	}
@@ -145,9 +145,8 @@ enum i40e_status_code i40e_acquire_nvm_ex(struct i40e_hw *hw,
 
 	if (ret_code)
 		i40e_debug(hw, I40E_DEBUG_NVM,
-			   "NVM acquire type %d failed time_left=%llu ret=%d aq_err=%d\n",
-			   access, (unsigned long long)time_left, ret_code,
-			   hw->aq.asq_last_status);
+			   "NVM acquire type %d failed time_left=%u ret=%d aq_err=%d\n",
+			   access, time_left, ret_code, hw->aq.asq_last_status);
 
 	if (ret_code && time_left) {
 		/* Poll until the current NVM owner timeouts */
@@ -168,9 +167,8 @@ enum i40e_status_code i40e_acquire_nvm_ex(struct i40e_hw *hw,
 		if (ret_code != I40E_SUCCESS) {
 			hw->nvm.hw_semaphore_timeout = 0;
 			i40e_debug(hw, I40E_DEBUG_NVM,
-				   "NVM acquire timed out, wait %llu ms before trying again. status=%d aq_err=%d\n",
-				   (unsigned long long)time_left, ret_code,
-				   hw->aq.asq_last_status);
+				   "NVM acquire timed out, wait %u ms before trying again. status=%d aq_err=%d\n",
+				   time_left, ret_code, hw->aq.asq_last_status);
 		}
 	}
 
-- 
2.34.1

Re: [PATCH] net/i40e/base: fix the debug print format

[David Marchand]

On Tue, Jan 14, 2025 at 10:44 AM Zhichao Zeng <zhichaox.zeng@intel.com> wrote:
>
> This patch modifies format specifier in debug prints to match to the
> change of time variables from 64 bit to 32 bit.

I am missing something... this is reverting a valid change.

If anything needs to be changed.. PRIu32 should be used in the four
hunks this patch touches.

>
> Fixes: d980a401b137 ("net/i40e/base: add NVM acquire with custom timeout")
> Fixes: ba90329a5eb3 ("net/i40e/base: fix invalid log format characters")

And in this case, I think you want to point at:
Fixes: cb593a832630 ("net/i40e/base: reduce size of time variables")

> Cc: stable@dpdk.org
>
> Signed-off-by: Jaroslaw Ilgiewicz <jaroslaw.ilgiewicz@intel.com>
> Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>


-- 
David Marchand

RE: [PATCH] net/i40e/base: fix the debug print format

[Zeng, ZhichaoX]

Hi David

Thanks for your comments, will submit v2 patch.

Regards
Zhichao

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Tuesday, January 14, 2025 9:15 PM
> To: Zeng, ZhichaoX <zhichaox.zeng@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org; Ilgiewicz, Jaroslaw
> <jaroslaw.ilgiewicz@intel.com>; Stokes, Ian <ian.stokes@intel.com>;
> Richardson, Bruce <bruce.richardson@intel.com>; Midde Ajijur Rehaman
> <ajijurx.rehaman.midde@intel.com>; Burakov, Anatoly
> <anatoly.burakov@intel.com>
> Subject: Re: [PATCH] net/i40e/base: fix the debug print format
> 
> On Tue, Jan 14, 2025 at 10:44 AM Zhichao Zeng <zhichaox.zeng@intel.com>
> wrote:
> >
> > This patch modifies format specifier in debug prints to match to the
> > change of time variables from 64 bit to 32 bit.
> 
> I am missing something... this is reverting a valid change.
> 
> If anything needs to be changed.. PRIu32 should be used in the four hunks
> this patch touches.
> 
> >
> > Fixes: d980a401b137 ("net/i40e/base: add NVM acquire with custom
> > timeout")
> > Fixes: ba90329a5eb3 ("net/i40e/base: fix invalid log format
> > characters")
> 
> And in this case, I think you want to point at:
> Fixes: cb593a832630 ("net/i40e/base: reduce size of time variables")
> 
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Jaroslaw Ilgiewicz <jaroslaw.ilgiewicz@intel.com>
> > Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
> 
> 
> --
> David Marchand

[PATCH v2] net/i40e/base: fix the debug print format

[Jaroslaw Ilgiewicz]

This patch modifies format specifier in debug prints to match to the
change of time variables from 64 bit to 32 bit.

Fixes: d980a401b137 ("net/i40e/base: add NVM acquire with custom timeout")
Cc: stable@dpdk.org

Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
Signed-off-by: Jaroslaw Ilgiewicz <jaroslaw.ilgiewicz@intel.com>
---
 drivers/net/i40e/base/README     |  2 +-
 drivers/net/i40e/base/i40e_nvm.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/base/README b/drivers/net/i40e/base/README
index c5305ffae0..188633dde3 100644
--- a/drivers/net/i40e/base/README
+++ b/drivers/net/i40e/base/README
@@ -6,7 +6,7 @@ Intel® I40E driver
 ==================
 
 This directory contains source code of i40e base driver generated on
-2024-08-30 released by the team which develops
+2025-01-15 released by the team which develops
 basic drivers for any i40e NIC. The directory of base/ contains the
 original source package.
 This driver is valid for the product(s) listed below
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 3e16a0d997..890c1dfc8a 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -145,9 +145,8 @@ enum i40e_status_code i40e_acquire_nvm_ex(struct i40e_hw *hw,
 
 	if (ret_code)
 		i40e_debug(hw, I40E_DEBUG_NVM,
-			   "NVM acquire type %d failed time_left=%llu ret=%d aq_err=%d\n",
-			   access, (unsigned long long)time_left, ret_code,
-			   hw->aq.asq_last_status);
+			   "NVM acquire type %d failed time_left=%" PRIu32 " ret=%d aq_err=%d\n",
+			   access, time_left, ret_code, hw->aq.asq_last_status);
 
 	if (ret_code && time_left) {
 		/* Poll until the current NVM owner timeouts */
@@ -168,9 +167,8 @@ enum i40e_status_code i40e_acquire_nvm_ex(struct i40e_hw *hw,
 		if (ret_code != I40E_SUCCESS) {
 			hw->nvm.hw_semaphore_timeout = 0;
 			i40e_debug(hw, I40E_DEBUG_NVM,
-				   "NVM acquire timed out, wait %llu ms before trying again. status=%d aq_err=%d\n",
-				   (unsigned long long)time_left, ret_code,
-				   hw->aq.asq_last_status);
+				   "NVM acquire timed out, wait %" PRIu32 " ms before trying again. status=%d aq_err=%d\n",
+				   time_left, ret_code, hw->aq.asq_last_status);
 		}
 	}
 
-- 
2.34.1

---------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN.
Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach handlowych.

Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.