From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CB030A0555 for ; Thu, 9 Jun 2022 13:38:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5C3040689; Thu, 9 Jun 2022 13:38:52 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8A1914280B for ; Thu, 9 Jun 2022 13:38:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q+vlqQ9WyqsXQrDlY7bBu6aeU5qfEln1twsGkJXLJeA=; b=GPmnpAdU7Osz7ofwfQYSsk2uhJreC79f177gwI16ZOEhmsRBaAYjGpmK+nWs7W2Ee2EXRJ rIt5MWyZbKjWblN0CY1LQcXrxftlCWQqJRqy5+Mmxne7WcsTz9K9+ZMrd6DWLOIlvTJXs2 JhjqIai6RMTliT1csuwHDvJzkITeC2g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-5yWapOwZN1iHnDDkgn_sQw-1; Thu, 09 Jun 2022 07:38:48 -0400 X-MC-Unique: 5yWapOwZN1iHnDDkgn_sQw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 034A3101E985; Thu, 9 Jun 2022 11:38:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E81718EA3; Thu, 9 Jun 2022 11:38:47 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'dma/hisilicon: fix index returned when no DMA completed' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:59 +0100 Message-Id: <20220609113701.386938-72-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2f31401e715f387050af1b1d09da26a949ad3396 Thanks. Kevin --- >From 2f31401e715f387050af1b1d09da26a949ad3396 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 27 May 2022 11:40:52 +0800 Subject: [PATCH] dma/hisilicon: fix index returned when no DMA completed [ upstream commit 2301dee9709fe07f79f92a032bf510a206397cc4 ] If no DMA request is completed, the ring_idx of the last completed operation need returned by last_idx parameter. This patch fixes it. Fixes: 2db4f0b82360 ("dma/hisilicon: add data path") Signed-off-by: Chengwen Feng --- drivers/dma/hisilicon/hisi_dmadev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/hisilicon/hisi_dmadev.c b/drivers/dma/hisilicon/hisi_dmadev.c index ff80622ec0..ef4c7b18f7 100644 --- a/drivers/dma/hisilicon/hisi_dmadev.c +++ b/drivers/dma/hisilicon/hisi_dmadev.c @@ -650,10 +650,10 @@ hisi_dma_completed(void *dev_private, sq_head = (sq_head + 1) & hw->sq_depth_mask; } + *last_idx = hw->cridx + i - 1; if (i > 0) { hw->cridx += i; - *last_idx = hw->cridx - 1; hw->sq_head = sq_head; + hw->completed += i; } - hw->completed += i; return i; @@ -709,10 +709,10 @@ hisi_dma_completed_status(void *dev_private, sq_head = (sq_head + 1) & hw->sq_depth_mask; } + *last_idx = hw->cridx + cpl_num - 1; if (likely(cpl_num > 0)) { hw->cridx += cpl_num; - *last_idx = hw->cridx - 1; hw->sq_head = sq_head; + hw->completed += cpl_num; } - hw->completed += cpl_num; return cpl_num; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.398158019 +0100 +++ 0072-dma-hisilicon-fix-index-returned-when-no-DMA-complet.patch 2022-06-09 12:34:29.813980756 +0100 @@ -1 +1 @@ -From 2301dee9709fe07f79f92a032bf510a206397cc4 Mon Sep 17 00:00:00 2001 +From 2f31401e715f387050af1b1d09da26a949ad3396 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2301dee9709fe07f79f92a032bf510a206397cc4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 9cef2cbfbe..f5c3cd914d 100644 +index ff80622ec0..ef4c7b18f7 100644 @@ -21 +22 @@ -@@ -703,10 +703,10 @@ hisi_dma_completed(void *dev_private, +@@ -650,10 +650,10 @@ hisi_dma_completed(void *dev_private, @@ -34 +35 @@ -@@ -762,10 +762,10 @@ hisi_dma_completed_status(void *dev_private, +@@ -709,10 +709,10 @@ hisi_dma_completed_status(void *dev_private,