From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 583C6A046B for ; Fri, 23 Aug 2019 11:44:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4E5611BFA1; Fri, 23 Aug 2019 11:44:46 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DCD281BF4C for ; Fri, 23 Aug 2019 11:44:44 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FA4D18C4277; Fri, 23 Aug 2019 09:44:44 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 541F35C226; Fri, 23 Aug 2019 09:44:43 +0000 (UTC) From: Kevin Traynor To: Ali Alnubani Cc: Ferruh Yigit , dpdk stable Date: Fri, 23 Aug 2019 10:43:10 +0100 Message-Id: <20190823094336.12078-20-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Fri, 23 Aug 2019 09:44:44 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix 32-bit build' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/19. 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/a9028545828a6fcfbfe322825159b925dd006d0f Thanks. Kevin Traynor --- >From a9028545828a6fcfbfe322825159b925dd006d0f Mon Sep 17 00:00:00 2001 From: Ali Alnubani Date: Thu, 27 Jun 2019 18:10:07 +0300 Subject: [PATCH] net/mlx5: fix 32-bit build [ upstream commit 843e720557105750d5152f3a414655ab87fb856c ] This is to fix the error: ``` drivers/net/mlx5/mlx5_defs.h:14:26: error: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'off_t {aka long long int}' [-Werror=format=] drivers/net/mlx5/mlx5_txq.c:569:48: note: format string is defined here DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%lx" ~~^ %llx ``` Which reproduces with gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0. Fixes: 6bf10ab69be0 ("net/mlx5: support 32-bit systems") Signed-off-by: Ali Alnubani Reviewed-by: Ferruh Yigit --- drivers/net/mlx5/mlx5_txq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 2971f9aa2..a3c6fdd18 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -11,4 +11,5 @@ #include #include +#include /* Verbs header. */ @@ -524,5 +525,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) if (qp.comp_mask & MLX5DV_QP_MASK_UAR_MMAP_OFFSET) { txq_ctrl->uar_mmap_offset = qp.uar_mmap_offset; - DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%lx", + DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%"PRIx64, dev->data->port_id, txq_ctrl->uar_mmap_offset); } else { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:21.776129240 +0100 +++ 0020-net-mlx5-fix-32-bit-build.patch 2019-08-22 19:38:20.440026808 +0100 @@ -1 +1 @@ -From 843e720557105750d5152f3a414655ab87fb856c Mon Sep 17 00:00:00 2001 +From a9028545828a6fcfbfe322825159b925dd006d0f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 843e720557105750d5152f3a414655ab87fb856c ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index ebb42cbff..77410955f 100644 +index 2971f9aa2..a3c6fdd18 100644 @@ -37 +38 @@ -@@ -567,5 +568,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) +@@ -524,5 +525,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)