From: Kevin Traynor <ktraynor@redhat.com> To: Ferruh Yigit <ferruh.yigit@intel.com> Cc: Luca Boccassi <bluca@debian.org>, dpdk stable <stable@dpdk.org> Subject: [dpdk-stable] patch 'net/i40e: fix build for log format specifier' has been queued to LTS release 18.11.11 Date: Mon, 23 Nov 2020 17:12:04 +0000 Message-ID: <20201123171222.79398-12-ktraynor@redhat.com> (raw) In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> Hi, FYI, your patch has been queued to LTS release 18.11.11 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/27/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4d522efdc0340556319d2fc97c2b4e4493f2c80e Thanks. Kevin. --- From 4d522efdc0340556319d2fc97c2b4e4493f2c80e 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 d22184daa6..8a2a84f65d 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -3,4 +3,6 @@ */ +#include <inttypes.h> + #include "i40e_type.h" #include "i40e_adminq.h" @@ -3986,5 +3988,5 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, 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; 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 @@ -3,4 +3,6 @@ */ +#include <inttypes.h> + #include "i40e_prototype.h" @@ -78,5 +80,5 @@ 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); @@ -100,5 +102,5 @@ enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw, 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); } @@ -1204,5 +1206,5 @@ retry: 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); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.275972614 +0000 +++ 0012-net-i40e-fix-build-for-log-format-specifier.patch 2020-11-23 17:10:13.987061578 +0000 @@ -1 +1 @@ -From c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 Mon Sep 17 00:00:00 2001 +From 4d522efdc0340556319d2fc97c2b4e4493f2c80e 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 d22184daa6..8a2a84f65d 100644 @@ -49 +50 @@ -@@ -4099,5 +4101,5 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, +@@ -3986,5 +3988,5 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, @@ -57 +58 @@ -index 6466d86486..561ed21136 100644 +index d87a6e56ff..16aebd077f 100644 @@ -81 +82 @@ -@@ -1301,5 +1303,5 @@ retry: +@@ -1204,5 +1206,5 @@ retry:
next prev parent reply other threads:[~2020-11-23 17:13 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor 2020-11-23 17:12 ` Kevin Traynor [this message] 2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor 2020-11-23 18:35 ` David Marchand 2020-11-24 9:38 ` Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor 2020-11-23 18:36 ` David Marchand 2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201123171222.79398-12-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=bluca@debian.org \ --cc=ferruh.yigit@intel.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git