From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A788CA0544 for ; Fri, 11 Nov 2022 12:40:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E75A42B7E; Fri, 11 Nov 2022 12:40:45 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 53BB940141 for ; Fri, 11 Nov 2022 12:40:42 +0100 (CET) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2DBD03F0C8 for ; Fri, 11 Nov 2022 11:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166841; bh=bfbnC2n9LIqXsDvXLL6mcyNpMm6mCGCFQLdjcCRb5uI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Em+269Lf6M7di2V6pGN8gvff9GF0x9V809JtWnni50B3YrWYGt/Cf8artCY2EkKJ5 sNThSOfbjPFI5ilADuceUbVOPfFo2vZuAR/DhluqhRT5DY+bY+ifHyoMzVONO4CiSY IcPfGV3UtmVl9tEj0XILp+9tSD0vyHcyUIvCPH0zb4/3QTBTUq4l139TJwLjJDpWv5 LHvCBksRs+v+39bp7tQWdq3bbf5hVFgp1q/qqVr1ONBUHKZO7Wm/LwZwwQBSPeVeuP b2zJybF/xlBnlCXWECnlBiHwg/amcFaxUNYjJ8k8U3CqdoyOa426iZzuZcqQB/Blw9 k74fKwWsJBUYg== Received: by mail-ej1-f70.google.com with SMTP id hq18-20020a1709073f1200b007ade8dd3494so2886337ejc.2 for ; Fri, 11 Nov 2022 03:40:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bfbnC2n9LIqXsDvXLL6mcyNpMm6mCGCFQLdjcCRb5uI=; b=MZ8yUHmx484l/TTl78EgaVm58SHK41ujF4UsWMXcr0mlw0QtGNs1QTOs6RLdxuh9Wr KJn1EUX8Crjw3YbHlVPY7WXamX5F0fqJc7fel5r/DYRgbojJuFI+b7XBIVDjM7Vl0lnk xLgRTIOrwPgf7chSd32zJtl269HPawpoh3k5wORfjSMy2REHxxe9zF0JkL+Ue1FFKTtL ztX4/fU8FxnryvnMNNDGu9PC/vFdRcBmGrN1mPp+qyp6WR9t67gxKpCudpGqmZWna0xi mG5LmyRcYb6QlSjjWLACyHRxLQQsILFIC6Xz07l+q+G1Nlh5xYBbXroaU8MnOMo5o9N+ e/mA== X-Gm-Message-State: ANoB5pnQJE0fkbCzK9SaWFmgwFk3pZX4Sma+2HPalXsFlUedwIAP94jY mV+y8GkgCkO6RcKFTniJNlNhqPjFfGyW/hpINI5w0AQH7VqK2TJsvDLFjsVkSk1IJ356W81m5RL cU0Y/l63mKNvmZqlRSJlcD6LN X-Received: by 2002:a17:906:c08f:b0:7ae:70f9:114 with SMTP id f15-20020a170906c08f00b007ae70f90114mr1530200ejz.44.1668166838836; Fri, 11 Nov 2022 03:40:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf6YDJowxMOhb0mus8mHJLFwg4ZNVrIZxtvwW4Q23Ua6CG5aK0GDNWrfe0IXOuCbqpATErt1Sg== X-Received: by 2002:a17:906:c08f:b0:7ae:70f9:114 with SMTP id f15-20020a170906c08f00b007ae70f90114mr1530189ejz.44.1668166838563; Fri, 11 Nov 2022 03:40:38 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id r19-20020a170906a21300b007ad96726c42sm803553ejy.91.2022.11.11.03.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:40:38 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Subject: patch 'common/sfc_efx/base: fix maximum Tx data count' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:43 +0100 Message-Id: <20221111113904.1549618-26-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.14 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/18/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ce133425516f71194faeef70fa9b0c0feae387b0 Thanks. Christian Ehrhardt --- >From ce133425516f71194faeef70fa9b0c0feae387b0 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Fri, 12 Aug 2022 15:24:52 +0300 Subject: [PATCH] common/sfc_efx/base: fix maximum Tx data count [ upstream commit 79b0c1926137690d680dec1b96b7a03279674fb9 ] Maximum data count of a Tx descriptor is advertised to users, however, this value is mistakenly derived from the Rx define. Use the Tx one instead. The resulting value will be the same. Fixes: 1e43fe3cb41e ("net/sfc/base: separate limitations on Tx DMA descriptors") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_nic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c index 3eb4674c5e..b7eaf1d506 100644 --- a/drivers/net/sfc/base/ef10_nic.c +++ b/drivers/net/sfc/base/ef10_nic.c @@ -1935,7 +1935,7 @@ ef10_nic_board_cfg( /* Alignment for WPTR updates */ encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN; - encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_RX_KER_BYTE_CNT); + encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_TX_KER_BYTE_CNT); /* No boundary crossing limits */ encp->enc_tx_dma_desc_boundary = 0; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:05.718106624 +0100 +++ 0026-common-sfc_efx-base-fix-maximum-Tx-data-count.patch 2022-11-11 12:35:04.773192062 +0100 @@ -1 +1 @@ -From 79b0c1926137690d680dec1b96b7a03279674fb9 Mon Sep 17 00:00:00 2001 +From ce133425516f71194faeef70fa9b0c0feae387b0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 79b0c1926137690d680dec1b96b7a03279674fb9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/common/sfc_efx/base/ef10_nic.c | 2 +- + drivers/net/sfc/base/ef10_nic.c | 2 +- @@ -19,5 +20,5 @@ -diff --git a/drivers/common/sfc_efx/base/ef10_nic.c b/drivers/common/sfc_efx/base/ef10_nic.c -index b27fc64210..7bda778f8b 100644 ---- a/drivers/common/sfc_efx/base/ef10_nic.c -+++ b/drivers/common/sfc_efx/base/ef10_nic.c -@@ -2233,7 +2233,7 @@ ef10_nic_board_cfg( +diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c +index 3eb4674c5e..b7eaf1d506 100644 +--- a/drivers/net/sfc/base/ef10_nic.c ++++ b/drivers/net/sfc/base/ef10_nic.c +@@ -1935,7 +1935,7 @@ ef10_nic_board_cfg(