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 0566BA04B1 for ; Thu, 5 Nov 2020 13:41:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B0DE2C31F; Thu, 5 Nov 2020 13:41:56 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 1108EC7F2 for ; Thu, 5 Nov 2020 13:41:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580114; 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=BIeOuulcRqRe3UJU9BY50/ElkSPyL4nVWDNTjO07+mQ=; b=L1rghWHE69Ub+fGDOoRR+hjVlL2puqDow6MRCixx92v17W8KIBJMQWfzRQeD3UX/zlv5Mo EmWLodGgRehdAOitEftNB3cUKW5sP09+augJl12WfBRaU8tzTHPIb/T+CuF/4rdhIR22Vc vveZUlhA5NdQRNXqFmYrFL7kVLqF1K8= 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-246-j_NKwb0WNs6JbzscjRaFcQ-1; Thu, 05 Nov 2020 07:41:50 -0500 X-MC-Unique: j_NKwb0WNs6JbzscjRaFcQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D2D11009E26; Thu, 5 Nov 2020 12:41:49 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id A36D55C3E1; Thu, 5 Nov 2020 12:41:48 +0000 (UTC) From: Kevin Traynor To: Rohit Raj Cc: Sachin Saxena , dpdk stable Date: Thu, 5 Nov 2020 12:39:51 +0000 Message-Id: <20201105124015.306404-44-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'bus/fslmc: fix dpio close' has been queued to LTS release 18.11.11 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.11 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/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/426ccf271cd9611ef997b2da8760f8a82a3db7d0 Thanks. Kevin. --- >From 426ccf271cd9611ef997b2da8760f8a82a3db7d0 Mon Sep 17 00:00:00 2001 From: Rohit Raj Date: Tue, 28 Jul 2020 21:54:59 +0530 Subject: [PATCH] bus/fslmc: fix dpio close [ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ] The current state of the DPIO object should be checked before trying to close/disable the object. Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0") Signed-off-by: Rohit Raj Acked-by: Sachin Saxena --- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index ba2e28ce1f..ab0eee0e82 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -532,6 +532,11 @@ dpaa2_create_dpio_device(int vdev_fd, err: if (dpio_dev->dpio) { - dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); - dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); + if (dpio_dev->token) { + dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, + dpio_dev->token); + dpio_close(dpio_dev->dpio, CMD_PRI_LOW, + dpio_dev->token); + } + free(dpio_dev->dpio); } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.091360064 +0000 +++ 0044-bus-fslmc-fix-dpio-close.patch 2020-11-05 12:38:54.244896023 +0000 @@ -1 +1 @@ -From ba156cdf70f20ec5321592fe4595ab8f9ae343ec Mon Sep 17 00:00:00 2001 +From 426ccf271cd9611ef997b2da8760f8a82a3db7d0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 97be761164..b0055b1644 100644 +index ba2e28ce1f..ab0eee0e82 100644 @@ -22 +23 @@ -@@ -529,6 +529,11 @@ dpaa2_create_dpio_device(int vdev_fd, +@@ -532,6 +532,11 @@ dpaa2_create_dpio_device(int vdev_fd, @@ -34,2 +35,2 @@ - rte_free(dpio_dev->eqresp); - rte_free(dpio_dev->dpio); + free(dpio_dev->dpio); + }