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 99C21A046B for ; Tue, 23 Jul 2019 03:02:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8145A1BF95; Tue, 23 Jul 2019 03:02:56 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 4305F1BEF8 for ; Tue, 23 Jul 2019 03:02:55 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:02:50 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hfa026580; Tue, 23 Jul 2019 04:02:49 +0300 From: Yongseok Koh To: Shreyansh Jain Cc: dpdk stable Date: Mon, 22 Jul 2019 18:00:17 -0700 Message-Id: <20190723010115.6446-50-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/dpaa: fix Rx discard register mask' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From 680cb4c98389055ca331513ae8bd64976630e502 Mon Sep 17 00:00:00 2001 From: Shreyansh Jain Date: Fri, 22 Feb 2019 10:09:44 +0000 Subject: [PATCH] bus/dpaa: fix Rx discard register mask [ upstream commit 6880caed6b33ef0a4e06ec4b3c41ab40a2b5c12a ] Current value of 'fmbm_rfsdm' register (0x010CE3F0) doesn't include the bit to drop colored (red) packets. New value (0x010EE3F0) fixes this. Check with 'fmbm_rffc' register of fm_port_bmi_regs. Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations") Signed-off-by: Shreyansh Jain --- drivers/bus/dpaa/base/fman/fman_hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index d66efa12a6..509e43f2b8 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -584,9 +584,9 @@ fman_if_discard_rx_errors(struct fman_if *fm_if) out_be32(fmbm_rfsem, 0); /* Configure the discard mask to discard the error packets which have - * DMA errors, Frame size error, Header error etc. The mask 0x010CE3F0 + * DMA errors, Frame size error, Header error etc. The mask 0x010EE3F0 * is to configured discard all the errors which come in the FD[STATUS] */ fmbm_rfsdm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rfsdm; - out_be32(fmbm_rfsdm, 0x010CE3F0); + out_be32(fmbm_rfsdm, 0x010EE3F0); } -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:09.210867562 -0700 +++ 0050-bus-dpaa-fix-Rx-discard-register-mask.patch 2019-07-22 17:55:06.114470000 -0700 @@ -1,15 +1,16 @@ -From 6880caed6b33ef0a4e06ec4b3c41ab40a2b5c12a Mon Sep 17 00:00:00 2001 +From 680cb4c98389055ca331513ae8bd64976630e502 Mon Sep 17 00:00:00 2001 From: Shreyansh Jain Date: Fri, 22 Feb 2019 10:09:44 +0000 Subject: [PATCH] bus/dpaa: fix Rx discard register mask +[ upstream commit 6880caed6b33ef0a4e06ec4b3c41ab40a2b5c12a ] + Current value of 'fmbm_rfsdm' register (0x010CE3F0) doesn't include the bit to drop colored (red) packets. New value (0x010EE3F0) fixes this. Check with 'fmbm_rffc' register of fm_port_bmi_regs. Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations") -Cc: stable@dpdk.org Signed-off-by: Shreyansh Jain --- @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c -index 4ebbc3d340..9ab8e835dc 100644 +index d66efa12a6..509e43f2b8 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c -@@ -603,9 +603,9 @@ fman_if_discard_rx_errors(struct fman_if *fm_if) +@@ -584,9 +584,9 @@ fman_if_discard_rx_errors(struct fman_if *fm_if) out_be32(fmbm_rfsem, 0); /* Configure the discard mask to discard the error packets which have