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 54315A04DD for ; Wed, 28 Oct 2020 11:51:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 431A4C9F0; Wed, 28 Oct 2020 11:51:55 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by dpdk.org (Postfix) with ESMTP id D7C404CA7 for ; Wed, 28 Oct 2020 11:51:53 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id n15so5176847wrq.2 for ; Wed, 28 Oct 2020 03:51:53 -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=4ag1+eYSYDhfoCp9rge9/ceFpSje90Rn6mDka2eCHlU=; b=SnF6xM6JbzNx3i4l0JS/PnuzJ7SALuqIiBgI+/VzlgfWPxgMuCkgXm95RJMa2eYkIA CuTbsDoT82mWZJQVztzqZ7voAZ8sOR56FG5ZWJberUq1zJ8YoxVOXQx7lxTo6micaG86 GJ4YRr3m4RwXuIOOGD/mA7Pns3jYwLD6XyCsNnhJ4YeU6jn8SjCRSvYGFtZDK3/ufsx/ HyIOtHHt2J/FnTXepPGCNRj7Q0niqcddRrreVz9PLKPsvarWqiJJCGingIFpJhg9CXG4 JcDYX8ftVHCP4EhS/7EwjW8ku/9sIThKD6GWBjwzW5BLymfj/w5tn3v90o1pJWqV6YZh Lt/w== 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=4ag1+eYSYDhfoCp9rge9/ceFpSje90Rn6mDka2eCHlU=; b=ZS0Il4M8tKXy8VVeWV28qIFThLUTp9DIQwKTvOWRYuT5poTjSOUnWfPSfEraRrSrLc bI1NtV3oBdJ3BQYAYDsJBWDjZVomAzG3TZx+dx5l/tWtzQQoSWuYvE2aMpkvqgBLrQly yD6D/Ajp7Z7ILQPfAWvXneFvfl6CQ9euGMstQR+NUzSoS1aYEg8vLCUmc3wZcZWw6OAY FcXvLhkJHVqZ17TAXJ8dZS/TSeib+GA9zRl6qLxmmlxpyS3BGdZiuK8Anok9yQQs0xpI 0SnkCp8p13uHqUDsiPviPQxFku0bdVcyfNyP8K1VptxP+uAKoBkoJvNr35niTggf71FK bCQA== X-Gm-Message-State: AOAM532AWmx+AL9o3t43O+hDQJXpqWJ9aCgLS9jDuiqBZxzhNi62yKo5 CaL60ios9TpspmSwVzMGuLc7//mK55OifTJg X-Google-Smtp-Source: ABdhPJwfGCsFEWOKoyl71MLmVDQPY8qumpvdGQCA8/r+gZ1kCDycM/fQ2R4QcFw14pePsaSdBne5nw== X-Received: by 2002:adf:f247:: with SMTP id b7mr8771323wrp.56.1603882312596; Wed, 28 Oct 2020 03:51:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x3sm5527397wmi.45.2020.10.28.03.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:52 -0700 (PDT) From: luca.boccassi@gmail.com To: Rohit Raj Cc: Sachin Saxena , dpdk stable Date: Wed, 28 Oct 2020 10:44:27 +0000 Message-Id: <20201028104606.3504127-108-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/fslmc: fix dpio close' 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 10/30/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 11222d2fd839b297673c3ef27286c393d7ef5a01 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 3ca3ae4f51..9c09c69fe9 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -546,8 +546,13 @@ 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); + } + rte_free(dpio_dev->dpio); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.122287515 +0000 +++ 0108-bus-fslmc-fix-dpio-close.patch 2020-10-28 10:35:11.664832379 +0000 @@ -1,13 +1,14 @@ -From ba156cdf70f20ec5321592fe4595ab8f9ae343ec Mon Sep 17 00:00:00 2001 +From 11222d2fd839b297673c3ef27286c393d7ef5a01 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") -Cc: stable@dpdk.org Signed-off-by: Rohit Raj Acked-by: Sachin Saxena @@ -16,10 +17,10 @@ 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 97be761164..b0055b1644 100644 +index 3ca3ae4f51..9c09c69fe9 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c -@@ -528,8 +528,13 @@ dpaa2_create_dpio_device(int vdev_fd, +@@ -546,8 +546,13 @@ dpaa2_create_dpio_device(int vdev_fd, err: if (dpio_dev->dpio) { @@ -32,9 +33,9 @@ + dpio_dev->token); + } + - rte_free(dpio_dev->eqresp); rte_free(dpio_dev->dpio); } + -- 2.20.1