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 D49C4A0613 for ; Wed, 28 Aug 2019 15:43:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB1DB1C236; Wed, 28 Aug 2019 15:43:14 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 40BEA1C22E for ; Wed, 28 Aug 2019 15:43:13 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B33D885545; Wed, 28 Aug 2019 13:43:12 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id A61AF194B2; Wed, 28 Aug 2019 13:43:11 +0000 (UTC) From: Kevin Traynor To: David Harton Cc: Michal Krawczyk , dpdk stable Date: Wed, 28 Aug 2019 14:41:58 +0100 Message-Id: <20190828134234.20547-22-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 28 Aug 2019 13:43:12 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ena: fix admin CQ polling for 32-bit' 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 09/04/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/6cfe6eb590158326c0f191095953d44e4b0630a0 Thanks. Kevin Traynor --- >From 6cfe6eb590158326c0f191095953d44e4b0630a0 Mon Sep 17 00:00:00 2001 From: David Harton Date: Fri, 12 Jul 2019 13:35:43 -0400 Subject: [PATCH] net/ena: fix admin CQ polling for 32-bit [ upstream commit 8190a843ef9bce3696b74ad2b057b5d86cc7b0df ] Recent modifications to admin command queue polling logic did not support 32-bit applications. Updated the driver to work for 32 or 64 bit applications Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Signed-off-by: David Harton Acked-by: Michal Krawczyk --- drivers/net/ena/base/ena_com.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index 4abf1a28a..f22d67cd4 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -527,5 +527,5 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c { unsigned long flags = 0; - unsigned long timeout; + uint64_t timeout; int ret; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:33.090988342 +0100 +++ 0023-net-ena-fix-admin-CQ-polling-for-32-bit.patch 2019-08-28 14:32:31.635957494 +0100 @@ -1 +1 @@ -From 8190a843ef9bce3696b74ad2b057b5d86cc7b0df Mon Sep 17 00:00:00 2001 +From 6cfe6eb590158326c0f191095953d44e4b0630a0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8190a843ef9bce3696b74ad2b057b5d86cc7b0df ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index b688067f7..e9b9be28d 100644 +index 4abf1a28a..f22d67cd4 100644 @@ -23 +24 @@ -@@ -548,5 +548,5 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c +@@ -527,5 +527,5 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c