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 659C4A04DD for ; Wed, 28 Oct 2020 11:51:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5AD4F2C2A; Wed, 28 Oct 2020 11:51:57 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 1029DC9F0 for ; Wed, 28 Oct 2020 11:51:55 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id s9so5156597wro.8 for ; Wed, 28 Oct 2020 03:51:55 -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=cOeRuqJ6pJjBzK7XY7MPd8JgpMyHDZ+Lfhxv8TdW2eU=; b=s0xKHsXa4CzRxnUSkn853XKb2K9+qpSqNa+P7zVvqFm5umR8TV7k6eNjhVwSVKA2ej FZdyitYuJAbNjBW6vl55IueTLQHPPojaYf7/ukdp6jyD5G49w3g4hWiVyvMRB3U+XxQU bhaKySPppNLjA0c9j8P1t5ED01lyBLjTvDMxx9SaqMceOf+WzCL0Jz2MXCw/OqaAQtv2 9tm68ATWr2G6xMUrp9aUD0lvhRCMPQZxA4KpJ9rwBP1XnVsb937pBSPYgl/7Q0fRkOEq IvPFzyM81PirxozRoIKyBgOvcuoJFDeLuj+y5oXK0/iQtTMFsa/D3UW1qiH5jkWpQdxH GFLQ== 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=cOeRuqJ6pJjBzK7XY7MPd8JgpMyHDZ+Lfhxv8TdW2eU=; b=HOv9Q748HKg5eIfTodVghxuRgSLCV/8aLjtVMHJBARcS02ubVq8wfueyWP6Zx/aA4H ZanaOersTy8hpjXTrAh8K/jaUSch+9nf3iMci/BmaB0KGl9yRXq5K47zIk+lskuseP1W moPKlAUWUIhA856sgGnjZN8Syv2qb8mOpIgAM7Lk8rlZaEbZvviCOdWhn5B1JYYlXvRx xhZicBYfKME2LWgoM7TP7D8wGWZUYiuxEN/sJaEfhoGrvqUWttSI+KxA5oqy7LMFgTYR /zRR+5FAENLY9SYoWInKA33CUfqmGjCno8vtoFudKv1Dk+GbjhVqsqZjTvNWiGpenws2 KJlA== X-Gm-Message-State: AOAM530i9QBAG9awoxAZQh2wczcrJURzR24nucji+/VYWKLDfExmuo5V wHbbdSmeolrY1B6XXdowMbTbgkpA9yrTT142 X-Google-Smtp-Source: ABdhPJyypdZ14AtYP2yKBfs/IzqL+NlV0cFl3R1nGB1GfjjCjvDZddQnV1lpthZXIgoBbDpA1reoIw== X-Received: by 2002:adf:e8d0:: with SMTP id k16mr7980637wrn.362.1603882313756; Wed, 28 Oct 2020 03:51:53 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s202sm3926972wme.39.2020.10.28.03.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Youri Querry Cc: Rohit Raj , Nipun Gupta , dpdk stable Date: Wed, 28 Oct 2020 10:44:28 +0000 Message-Id: <20201028104606.3504127-109-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 atomic queues on NXP LX2 platform' 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 d1aaa24a6789cfdddd8de4bcaae7006d2b00e1c5 Mon Sep 17 00:00:00 2001 From: Youri Querry Date: Thu, 24 Sep 2020 09:32:04 +0530 Subject: [PATCH] bus/fslmc: fix atomic queues on NXP LX2 platform [ upstream commit 8bd11d45d53d66da5e2adb7faf2ea64b36120f60 ] Traffic was stalling after few packet while running l2fwd-event in atomic mode on LX2 platform. It was due to wrong dca setting while enqueuing packets to EQCR. This patch fixes the issue by writing correct dca setting. Fixes: 1b49352f41be ("bus/fslmc: rename portal pi index to consumer index") Signed-off-by: Youri Querry Signed-off-by: Rohit Raj Acked-by: Nipun Gupta --- drivers/bus/fslmc/qbman/qbman_portal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c index d4223bdc8b..54bea97820 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -999,6 +999,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask)); memcpy(&p[1], &cl[1], 28); memcpy(&p[8], &fd[i], sizeof(*fd)); + p[0] = cl[0] | s->eqcr.pi_vb; + if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) { struct qbman_eq_desc *d = (struct qbman_eq_desc *)p; @@ -1006,7 +1008,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, ((flags[i]) & QBMAN_EQCR_DCA_IDXMASK); } eqcr_pi++; - p[0] = cl[0] | s->eqcr.pi_vb; if (!(eqcr_pi & half_mask)) s->eqcr.pi_vb ^= QB_VALID_BIT; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.151316939 +0000 +++ 0109-bus-fslmc-fix-atomic-queues-on-NXP-LX2-platform.patch 2020-10-28 10:35:11.664832379 +0000 @@ -1,15 +1,16 @@ -From 8bd11d45d53d66da5e2adb7faf2ea64b36120f60 Mon Sep 17 00:00:00 2001 +From d1aaa24a6789cfdddd8de4bcaae7006d2b00e1c5 Mon Sep 17 00:00:00 2001 From: Youri Querry Date: Thu, 24 Sep 2020 09:32:04 +0530 Subject: [PATCH] bus/fslmc: fix atomic queues on NXP LX2 platform +[ upstream commit 8bd11d45d53d66da5e2adb7faf2ea64b36120f60 ] + Traffic was stalling after few packet while running l2fwd-event in atomic mode on LX2 platform. It was due to wrong dca setting while enqueuing packets to EQCR. This patch fixes the issue by writing correct dca setting. Fixes: 1b49352f41be ("bus/fslmc: rename portal pi index to consumer index") -Cc: stable@dpdk.org Signed-off-by: Youri Querry Signed-off-by: Rohit Raj @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c -index 0a2af7be4c..77c9d508c4 100644 +index d4223bdc8b..54bea97820 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c -@@ -1201,6 +1201,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, +@@ -999,6 +999,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask)); memcpy(&p[1], &cl[1], 28); memcpy(&p[8], &fd[i], sizeof(*fd)); @@ -31,7 +32,7 @@ if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) { struct qbman_eq_desc *d = (struct qbman_eq_desc *)p; -@@ -1208,7 +1210,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, +@@ -1006,7 +1008,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, ((flags[i]) & QBMAN_EQCR_DCA_IDXMASK); } eqcr_pi++;