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 08136A04A3 for ; Fri, 5 Jun 2020 20:27:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F3D2A1D510; Fri, 5 Jun 2020 20:27:21 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id BF1BE1D510 for ; Fri, 5 Jun 2020 20:27:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381639; 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=OYa/rVMkzG5myG12LtVy/VIMhAXq+26nUFeqJ2LNzas=; b=BAW5UPLWYr3H22zGb3K3SAD/8gVAwEddXy6+fTYxg+D4ztcgplBRIOazcCt3IONsvZoL6Y jacU8oZPBCc6xwB0DLYYYoEl7mF5a7PEh4eKLABgTNq1CS5H7DIkcp/OQWPusqBOSHHzYR DFQ3Ind2gEsOWkbQCwXhMIaJR3ai0bk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-169-OWPGfuNOOPyUeXKQQ4IZpA-1; Fri, 05 Jun 2020 14:27:16 -0400 X-MC-Unique: OWPGfuNOOPyUeXKQQ4IZpA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 16618100CCC1; Fri, 5 Jun 2020 18:27:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3410360C47; Fri, 5 Jun 2020 18:27:14 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Gagandeep Singh , dpdk stable Date: Fri, 5 Jun 2020 19:24:49 +0100 Message-Id: <20200605182525.22483-52-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' has been queued to LTS release 18.11.9 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.9 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/10/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/8e297725dcdfc086dd7704040369429238514eb3 Thanks. Kevin. --- >From 8e297725dcdfc086dd7704040369429238514eb3 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 14 May 2020 19:00:07 +0800 Subject: [PATCH] crypto/caam_jr: fix IRQ functions return type [ upstream commit c40b4fcd98933749a41f7b8e9b66368f920038f6 ] The caam_jr_enable_irqs() and caam_jr_disable_irqs() methods maybe return a negative error. So use int instead of uint32_t int the functions. Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations") Signed-off-by: Yunjian Wang Acked-by: Gagandeep Singh --- drivers/crypto/caam_jr/caam_jr_pvt.h | 4 ++-- drivers/crypto/caam_jr/caam_jr_uio.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/caam_jr/caam_jr_pvt.h b/drivers/crypto/caam_jr/caam_jr_pvt.h index 7997a1d45c..579aacbb38 100644 --- a/drivers/crypto/caam_jr/caam_jr_pvt.h +++ b/drivers/crypto/caam_jr/caam_jr_pvt.h @@ -275,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr) * @retval -1 value for error */ -uint32_t caam_jr_enable_irqs(int uio_fd); +int caam_jr_enable_irqs(int uio_fd); /** @brief Request to SEC kernel driver to disable interrupts for descriptor @@ -288,5 +288,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd); * */ -uint32_t caam_jr_disable_irqs(int uio_fd); +int caam_jr_disable_irqs(int uio_fd); #endif diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c index 8eaa8ae467..913f5f10a1 100644 --- a/drivers/crypto/caam_jr/caam_jr_uio.c +++ b/drivers/crypto/caam_jr/caam_jr_uio.c @@ -207,5 +207,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command) * @retval -1 value for error */ -uint32_t +int caam_jr_enable_irqs(int uio_fd) { @@ -238,5 +238,5 @@ caam_jr_enable_irqs(int uio_fd) * */ -uint32_t +int caam_jr_disable_irqs(int uio_fd) { -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.675942036 +0100 +++ 0052-crypto-caam_jr-fix-IRQ-functions-return-type.patch 2020-06-05 19:20:50.859039700 +0100 @@ -1 +1 @@ -From c40b4fcd98933749a41f7b8e9b66368f920038f6 Mon Sep 17 00:00:00 2001 +From 8e297725dcdfc086dd7704040369429238514eb3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c40b4fcd98933749a41f7b8e9b66368f920038f6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d6b3dafaa6..552d6b9b1b 100644 +index 7997a1d45c..579aacbb38 100644 @@ -23 +24 @@ -@@ -281,5 +281,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr) +@@ -275,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr) @@ -30 +31 @@ -@@ -294,5 +294,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd); +@@ -288,5 +288,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd); @@ -38 +39 @@ -index 30837c1164..e4ee102344 100644 +index 8eaa8ae467..913f5f10a1 100644 @@ -41 +42 @@ -@@ -202,5 +202,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command) +@@ -207,5 +207,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command) @@ -48 +49 @@ -@@ -233,5 +233,5 @@ caam_jr_enable_irqs(int uio_fd) +@@ -238,5 +238,5 @@ caam_jr_enable_irqs(int uio_fd)