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 34E4AA0093 for ; Fri, 22 May 2020 11:40:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D0251D973; Fri, 22 May 2020 11:40:35 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 096C91D96F for ; Fri, 22 May 2020 11:40:34 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id e16so9497003wra.7 for ; Fri, 22 May 2020 02:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MH2G/Xgl6EseUoi+xBna7TdONg8LIlDRqSq4f23XSFw=; b=boRkAEfvXCazh1uig/UtRUJj/HTNKrrrPcbETs1lFe3M6aMmkhnHL/gS+ZrYX1t0tG 5ae1rTQIfQ39gf79HHz86JQ05032z+mVGd+g8zS4P1GUmBS/ETrDRtSctoLHg4jtU+L3 SamNuPldT6R3UKeEedd/jPwL/cjY0M8TjNq49XXPMm8xRhZW1vsTbS9ZSKAUyVVV+j3g Rr9dDQgz3EKzjVTDo4SIPgNMoOWI5jTubxI7j29TLvMzn3WsabLcJcjSXSPw9or8PNbf G9zxmZci5EUn4P4TZFJ95vkKdyGF63gRZgOQ3NK/FZv+bz5m9eVHhmdr84tTcDv6269C HXOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MH2G/Xgl6EseUoi+xBna7TdONg8LIlDRqSq4f23XSFw=; b=PScdOFAioCorx6ua5kH1/lvG/5Bqxv6BGyQFOHPhHO7TUZnKm5KKt660LG6QRkEm2R Ttei90CD0EQhzcaGfeMsCKKU/s+2T3mK6iAp87w9OiHc2BJNabdGsWExp5hr7bZ+sm0n bFNVhFy2gAPzYm+P05qjQ8HPlEmL6WZd6FIRhY3UV7hS1YlLWFXXSM6mddfbKZDSqt57 PIKt44iKmv1h/HmAVz+zowK45Uh7Z7eupDOaFByyPigwIkp5S1f3hv44fBO6ck87P6V8 Ne8jmCvr8S1GDRe27lOpN2bwgQRssRwbHQfoTwWPKHs4apBzWJff0p+hdGhWCHUiI57e TLdQ== X-Gm-Message-State: AOAM530y/yZTsNi3Kw+HWFzfvMTjFVc3z68lM/TfHddRSK4eWOxCy2Jw e91vXjJR3lpmhtuRb2Fmx1k= X-Google-Smtp-Source: ABdhPJzNQfEtkY9D7laCm3DX8yhcqYqwUSROoAPRyA0rTt91HJY+0IanbLcQHqChT6z+3qio5NEb4A== X-Received: by 2002:adf:e489:: with SMTP id i9mr2593553wrm.373.1590140433770; Fri, 22 May 2020 02:40:33 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s15sm9011209wro.80.2020.05.22.02.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:40:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Gagandeep Singh , dpdk stable Date: Fri, 22 May 2020 10:39:43 +0100 Message-Id: <20200522094022.1025696-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' has been queued to stable release 19.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 stable release 19.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 05/24/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. Thanks. Luca Boccassi --- >From b02c7838a053c59c66cd42117b6b7b17f1f6c192 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 d6b3dafaa6..552d6b9b1b 100644 --- a/drivers/crypto/caam_jr/caam_jr_pvt.h +++ b/drivers/crypto/caam_jr/caam_jr_pvt.h @@ -280,7 +280,7 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr) * @retval 0 for success * @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 * finished processing @@ -293,6 +293,6 @@ uint32_t caam_jr_enable_irqs(int uio_fd); * @retval -1 value for error * */ -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 30837c1164..e4ee102344 100644 --- a/drivers/crypto/caam_jr/caam_jr_uio.c +++ b/drivers/crypto/caam_jr/caam_jr_uio.c @@ -201,7 +201,7 @@ sec_uio_send_command(int uio_fd, int32_t uio_command) * @retval 0 for success * @retval -1 value for error */ -uint32_t +int caam_jr_enable_irqs(int uio_fd) { int ret; @@ -232,7 +232,7 @@ caam_jr_enable_irqs(int uio_fd) * @retval -1 value for error * */ -uint32_t +int caam_jr_disable_irqs(int uio_fd) { int ret; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.398072839 +0100 +++ 0004-crypto-caam_jr-fix-IRQ-functions-return-type.patch 2020-05-22 10:37:39.056411424 +0100 @@ -1,13 +1,14 @@ -From c40b4fcd98933749a41f7b8e9b66368f920038f6 Mon Sep 17 00:00:00 2001 +From b02c7838a053c59c66cd42117b6b7b17f1f6c192 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") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Gagandeep Singh