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 84597A0527 for ; Mon, 9 Nov 2020 19:44:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DEB46883; Mon, 9 Nov 2020 19:44:17 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id E91486883 for ; Mon, 9 Nov 2020 19:44:14 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 10so462730wml.2 for ; Mon, 09 Nov 2020 10:44:14 -0800 (PST) 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=hQRPvf8qyjj2L5gq88/Z//WaY3IQgNGnl4ANKAr78hg=; b=QSup9CX7ro5DvQQ2vea/XVimDuwGQymt1ksFDnnjbkMcCAsnm6bVVrrqRNfA995N4D kjUs3edSPd1EiFgB7LdZIUKvIcOp8o0pnS4G+MqcqT49UZm6BJGzzKrBIPKJCLmrHgWu Gn2Fx8Kv4P1VJlntASlcowM+rmPyZflT61oi0FU/W08jdIkun/y6kNMvaPyJsM8k/8oy QkqptEXbdXxOgBn+IHb2OT7dcFKo4YBdEeg5Oro4MqPNy0XMtSth/138BfaEFuwxzfVN YmiiOgXgc8LBVXl7cQUYD/Vusskk9jzfQEhHvcdx/p/dektTVAPB4E7AsYw9gxGJCGos CjUw== 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=hQRPvf8qyjj2L5gq88/Z//WaY3IQgNGnl4ANKAr78hg=; b=TKi0xeEYYQESvpo4B2T3wFxHrNK3Zz/0tiwt3DULeX7/ABEjrgUo4Sk/7v/jqZhxEk GVJrJPIfPpxTtHqeKWxB9LVP/3hibfcjsL2103n8olKQGhy+p822rfLqG6uVU3UlG4J6 O2iKFQNH2Vpj59UGdu0bTXxMSHln2QI43F5XaHUQssk9hnTmw5Y4ETXvkMstRTPLlK5P 4/XtNzlK6lOibOMG67tGXrPvAWTU+ZVu97uD7pRRrlH9+mWtSiOcVidpMF9bWhawpk7u WwhCZwchYIjTySvzVtRZ7wOr+X5NzTr9N/F4z9mBKISHDG/DQ6dkn4Y8B6QtHTan5Z7s cL0g== X-Gm-Message-State: AOAM532oi50J/QC31qEzDDpVL0rnSVsRlhnsOo5aGATvcDVaaPcoGeri fOZH4d3Jprvqui8/KLEM0PA= X-Google-Smtp-Source: ABdhPJz8M10hHodPoOnWbzaZy/79Y+eix4/dryGzwg+0gg1Sobs8UklvUpWAzW0j+H2CWyNOmZdCow== X-Received: by 2002:a7b:c3d5:: with SMTP id t21mr524252wmj.37.1604947453732; Mon, 09 Nov 2020 10:44:13 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:7a8e:ed70:5c52:ea3]) by smtp.gmail.com with ESMTPSA id t13sm14853739wru.67.2020.11.09.10.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:13 -0800 (PST) From: luca.boccassi@gmail.com To: Wei Huang Cc: Tianfei Zhang , Rosen Xu , dpdk stable Date: Mon, 9 Nov 2020 18:40:39 +0000 Message-Id: <20201109184111.3463090-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'raw/ifpga/base: fix return of IRQ unregister' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0911adf9dbab697f834efcdb0794b6cbe5919095 Thanks. Luca Boccassi --- >From 0911adf9dbab697f834efcdb0794b6cbe5919095 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 23 Oct 2020 04:59:57 -0400 Subject: [PATCH] raw/ifpga/base: fix return of IRQ unregister [ upstream commit 93824cadd8f430d14c91e48146a99f90e8d31f28 ] Since 'rte_intr_callback_unregister()' can return positive value as success, but 'ifpga_rawdev_destroy()' handle it as an error. Instead, only negative return is treated as failure. Fixes: e0a1aafe2af9 ("raw/ifpga: introduce IRQ functions") Signed-off-by: Wei Huang Signed-off-by: Tianfei Zhang Acked-by: Rosen Xu --- drivers/raw/ifpga/ifpga_rawdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index fee24a98e1..7bfdde650d 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1563,7 +1563,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) return -ENODEV; if (ifpga_unregister_msix_irq(IFPGA_FME_IRQ, 0, - fme_interrupt_handler, mgr)) + fme_interrupt_handler, mgr) < 0) return -EINVAL; opae_adapter_data_free(adapter->data); -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.174904648 +0000 +++ 0051-raw-ifpga-base-fix-return-of-IRQ-unregister.patch 2020-11-09 18:40:11.179312029 +0000 @@ -1 +1 @@ -From 93824cadd8f430d14c91e48146a99f90e8d31f28 Mon Sep 17 00:00:00 2001 +From 0911adf9dbab697f834efcdb0794b6cbe5919095 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 93824cadd8f430d14c91e48146a99f90e8d31f28 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 6319988066..fdeb713ff6 100644 +index fee24a98e1..7bfdde650d 100644 @@ -26 +27 @@ -@@ -1559,7 +1559,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) +@@ -1563,7 +1563,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)