From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id BD39FA04DB
for <public@inbox.dpdk.org>; Tue, 17 Nov 2020 12:15:34 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id B6BC3F3E;
Tue, 17 Nov 2020 12:15:33 +0100 (CET)
Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com
[209.85.221.51]) by dpdk.org (Postfix) with ESMTP id F2343F3E
for <stable@dpdk.org>; Tue, 17 Nov 2020 12:15:30 +0100 (CET)
Received: by mail-wr1-f51.google.com with SMTP id 23so22735607wrc.8
for <stable@dpdk.org>; Tue, 17 Nov 2020 03:15:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=uIdl1iM9CnA8bFceohb3KRznQmlkgW5Mjd9/xY3lt5I=;
b=UyZWjifNCQzyV2bCPd2NRsaZwjE2qpIRI7e40MuN1NjQ+PZBeRLAFtgDH9bl0ZMjeQ
VF/ViLsafDOcWmqiY5j1sNx2IqX0DajGINaypjM7ovvCTIDB1DMWkN1OPCAmg9mpRhD/
Gh0SlPgsFVVbTos1Ak86rwKN1EPC/r5E1JBUdLICOacIcOv311mKBO2akXtk7eVlJx02
5mrPXUPiO4Rk7/vCVk/6VWz5jnrcVlVW0/bXe7teMOXCyN+JSHqjBNwBb5dAmXT1+ztU
3dbxM7q29UctdspdezWc7WPDZq8FWR9OUQL9oNLWTfTHKmXOCPxNg/uYgojYJHPKru8g
zBoQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=uIdl1iM9CnA8bFceohb3KRznQmlkgW5Mjd9/xY3lt5I=;
b=pTu38HVEsAjfB5pCVAJH1S/En3odsvslzJ2i8RWQAylqweT+BscEUbRmJWpuXcUBnt
wQG6bG4cu7OFNXihj1n6NZdMFbRTGaBBFfHfierw9EPfSPyPXx7jpHJLvmzJgn96AvRZ
h0gFsmMjNG3vlYcnCo/qLNvoMZd/3imvekQ+aBxAmjGL3Ea4Prdn8hYXu1Lnf6Du8Erf
ynco1y0kYNWlUS7HFBZCUrmIdGYk6y/RxEqu2hY+1vJ33BRjY2ubXMS7BGcLDlJs6FYP
xU8sji1HZ0qx3BbAyrJgqTcLLwAY+qJepbAgn3II8249EwS+CI4Zz1tJrXDTMHe8MCYk
CWMw==
X-Gm-Message-State: AOAM530L7Oo+OHib0t4DzMmiK1yJZEAdD+B7/Kdp19mcuAWj8xSbKG4A
gD5ntWD3A7pcMGt3O4uNeqg=
X-Google-Smtp-Source: ABdhPJy7rzozwaop9x+SNr/mk4e0dTug4PTT0cY1Y8POMkUVA5tr1RWYVuebAtem/1KnOqVgMN/O4g==
X-Received: by 2002:adf:ffc9:: with SMTP id x9mr16117221wrs.148.1605611730705;
Tue, 17 Nov 2020 03:15:30 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id l16sm25983741wrx.5.2020.11.17.03.15.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Nov 2020 03:15:29 -0800 (PST)
From: luca.boccassi@gmail.com
To: Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Luca Boccassi <bluca@debian.org>,
dpdk stable <stable@dpdk.org>
Date: Tue, 17 Nov 2020 11:13:55 +0000
Message-Id: <20201117111416.1961049-21-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com>
References: <20201109185030.3478760-2-luca.boccassi@gmail.com>
<20201117111416.1961049-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/i40e: fix build for log format specifier'
has been queued to stable release 19.11.6
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8e6f80d1ce8c31a6d4fbb584f3edf9419fcc81e8
Thanks.
Luca Boccassi
---
>From 8e6f80d1ce8c31a6d4fbb584f3edf9419fcc81e8 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 10 Nov 2020 17:54:57 +0000
Subject: [PATCH] net/i40e: fix build for log format specifier
[ upstream commit c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 ]
Build error:
i40e_common.c: In function "i40e_parse_discover_capabilities":
../drivers/net/i40e/base/../i40e_logs.h:43:50:
error: format "%llX" expects argument of type "long long unsigned
int", but argument 7 has type "u64" {aka "long unsigned int"
[-Werror=format=]
43 | rte_log(RTE_LOG_ ## level, i40e_logtype_driver, "%s(): " fmt, \
| ^~~~~~~~
.../i40e_osdep.h:87:3: note: in expansion of macro "PMD_DRV_LOG_RAW"
87 | PMD_DRV_LOG_RAW(DEBUG, "i40e %02x.%x " s, \
| ^~~~~~~~~~~~~~~
.../base/i40e_common.c:4100:4: note: in expansion of macro "i40e_debug"
4100 | i40e_debug(hw, I40E_DEBUG_INIT,
| ^~~~~~~~~~
There are multiple build error because of same reason, all fixed.
Using 'PRIX64' to fix the build error.
Fixes: 889bc9f0cd3a ("i40e/base: unify the capability function")
Fixes: 9b1041574cd4 ("i40e/base: enhance polling of NVM semaphore")
Fixes: 8db9e2a1b232 ("i40e: base driver")
Fixes: 3b7271f3958a ("i40e/base: catch NVM write semaphore timeout and retry")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
drivers/net/i40e/base/i40e_common.c | 4 +++-
drivers/net/i40e/base/i40e_nvm.c | 8 +++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index f179306e2e..50812eb80e 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -2,6 +2,8 @@
* Copyright(c) 2001-2020 Intel Corporation
*/
+#include <inttypes.h>
+
#include "i40e_type.h"
#include "i40e_adminq.h"
#include "i40e_prototype.h"
@@ -3990,7 +3992,7 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
p->wr_csr_prot = (u64)number;
p->wr_csr_prot |= (u64)logical_id << 32;
i40e_debug(hw, I40E_DEBUG_INIT,
- "HW Capability: wr_csr_prot = 0x%llX\n\n",
+ "HW Capability: wr_csr_prot = 0x%" PRIX64 "\n\n",
(p->wr_csr_prot & 0xffff));
break;
case I40E_AQ_CAP_ID_NVM_MGMT:
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index d87a6e56ff..16aebd077f 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -2,6 +2,8 @@
* Copyright(c) 2001-2020 Intel Corporation
*/
+#include <inttypes.h>
+
#include "i40e_prototype.h"
/**
@@ -77,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=%llu ret=%d aq_err=%d\n",
+ "NVM acquire type %d failed time_left=%" PRIu64 " ret=%d aq_err=%d\n",
access, time_left, ret_code, hw->aq.asq_last_status);
if (ret_code && time_left) {
@@ -99,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 %llu ms before trying again. status=%d aq_err=%d\n",
+ "NVM acquire timed out, wait %" PRIu64 " ms before trying again. status=%d aq_err=%d\n",
time_left, ret_code, hw->aq.asq_last_status);
}
}
@@ -1203,7 +1205,7 @@ retry:
gtime = rd32(hw, I40E_GLVFGEN_TIMER);
if (gtime >= hw->nvm.hw_semaphore_timeout) {
i40e_debug(hw, I40E_DEBUG_ALL,
- "NVMUPD: write semaphore expired (%d >= %lld), retrying\n",
+ "NVMUPD: write semaphore expired (%d >= %" PRIu64 "), retrying\n",
gtime, hw->nvm.hw_semaphore_timeout);
i40e_release_nvm(hw);
status = i40e_acquire_nvm(hw, I40E_RESOURCE_WRITE);
--
2.27.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-17 11:13:13.862959933 +0000
+++ 0021-net-i40e-fix-build-for-log-format-specifier.patch 2020-11-17 11:13:12.913116448 +0000
@@ -1 +1 @@
-From c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 Mon Sep 17 00:00:00 2001
+From 8e6f80d1ce8c31a6d4fbb584f3edf9419fcc81e8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 ]
+
@@ -29 +30,0 @@
-Cc: stable@dpdk.org
@@ -39 +40 @@
-index 8e3db0756c..e20bb9ac35 100644
+index f179306e2e..50812eb80e 100644
@@ -51 +52 @@
-@@ -4098,7 +4100,7 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
+@@ -3990,7 +3992,7 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
@@ -59 +60 @@
- case I40E_AQ_CAP_ID_DIS_UNUSED_PORTS:
+ case I40E_AQ_CAP_ID_NVM_MGMT:
@@ -61 +62 @@
-index 6466d86486..561ed21136 100644
+index d87a6e56ff..16aebd077f 100644
@@ -91 +92 @@
-@@ -1300,7 +1302,7 @@ retry:
+@@ -1203,7 +1205,7 @@ retry: