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 C2312A0C41 for ; Tue, 30 Nov 2021 17:37:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD36E41148; Tue, 30 Nov 2021 17:37:51 +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 A3A40410F7 for ; Tue, 30 Nov 2021 17:37:50 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 8756B3FFF1 for ; Tue, 30 Nov 2021 16:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290270; bh=z8Y1+K5mPBKCNkokdaDpero7QH5gMwtN9Dp0ieSDqC0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eTo5dDyQTpQSD5bVL02zXy6IfpNsyQRobVNHO9OquA/KUMGzR1eXYzI0mDAGbgMyb qvI9S4SdH6s7QUSwJpJLwEyz5K2qJ/HO6qr+X6kI1xPm8vXxXWq4pSahbmrbdjp2n7 KrUe5L4x4bNL/F8XBL154dNjIg8RjNQhH1cpRsvD5d+jFSsk65j024Sct4quLn9Io8 SQ53VHt/eu9rhHjZcQ1Dl2Im9CMifL0Kk0AaHOriAv7EMfpw0zB5s8CD2PuiLb5/7U sQ6DWwumcP3xlqLTJKZhTAc8+ANNrsm+cO0C+v+fzEzkFCc8FrUkOOvH55nnc7+fcc iyJr0WmdP166A== Received: by mail-ed1-f72.google.com with SMTP id t9-20020aa7d709000000b003e83403a5cbso17486492edq.19 for ; Tue, 30 Nov 2021 08:37:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z8Y1+K5mPBKCNkokdaDpero7QH5gMwtN9Dp0ieSDqC0=; b=kUrtp8yeqbEzuKX1b6xoNJYO7iaQNG9LWwoDUApzWJs43UwTr4DhMCxVjPRw7tnDcx 3WG9PWYU28qfV9l854/OieHivLrbTgExQy63CD2ATnyCeMLPlkTQTNe3EUw9OzYvv+Me 63WTUh0Mlg6edeW4kZKZ7ZzvB0t2B+dPRwGVb+oLfFt9VNZToMo+mDvc6ZSd/kZpJFnK C718a5vBKTBEdlGOFfVSnhwNkjpxmkTLPp1DWUza7mkwxyX2MEHpvwIVATcM9+gjIiaj jYa2Qg+WMsAlsnbunn9sZ5djCNeWH1q0A6bFDX4kzRlt3DaR/MN7bVcVWOvtU86j1/H8 wmjQ== X-Gm-Message-State: AOAM532X1vJ/v+syUSQPSrvXPlATQkusfAfGXJY9GZFjQ1rqUmsfBOwc OGa9MexyGp7XkbInIYuONSd5ZpTYhu/09+0G91MvSo/v14Q8+q6TiatTPZWUDH4t/XTXN35OtKO 48MFrS76ToKFTmR+OvQPTe96g X-Received: by 2002:aa7:c915:: with SMTP id b21mr22427edt.195.1638290269876; Tue, 30 Nov 2021 08:37:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJyr9ahFJ6hmMm03us6iQEvuZzlZ1VdGeVCTBr2tikH879GDklC5KZV6ERBPrjBrDSNoabQRTw== X-Received: by 2002:aa7:c915:: with SMTP id b21mr22405edt.195.1638290269659; Tue, 30 Nov 2021 08:37:49 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11621883edq.54.2021.11.30.08.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:49 -0800 (PST) From: christian.ehrhardt@canonical.com To: Hanumanth Reddy Pothula Cc: Jerin Jacob , dpdk stable Subject: patch 'net/octeontx2: fix MTU when PTP is enabled' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:55 +0100 Message-Id: <20211130163605.2460997-31-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-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.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 December 10th 2021. 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/0b0a33dc3a32f5dbfe52cafe15e1907969910dbe Thanks. Christian Ehrhardt --- >From 0b0a33dc3a32f5dbfe52cafe15e1907969910dbe Mon Sep 17 00:00:00 2001 From: Hanumanth Reddy Pothula Date: Tue, 10 Aug 2021 12:51:00 +0530 Subject: [PATCH] net/octeontx2: fix MTU when PTP is enabled [ upstream commit 07d15d4d84e89a2f7a56bec24225c8ff326a9cf8 ] Update MTU value based on PTP enable status and reserve eight bytes in TX path to accommodate VLAN tags. If PTP is enabled maximum allowed MTU is 9200 otherwise it's 9208. Fixes: b5dc3140448e ("net/octeontx2: support base PTP") Signed-off-by: Hanumanth Reddy Pothula Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_ethdev_ops.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c index 1f8292589c..0854026706 100644 --- a/drivers/net/octeontx2/otx2_ethdev_ops.c +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c @@ -17,7 +17,8 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) struct nix_frs_cfg *req; int rc; - frame_size += NIX_TIMESYNC_RX_OFFSET * otx2_ethdev_is_ptp_en(dev); + if (dev->configured && otx2_ethdev_is_ptp_en(dev)) + frame_size += NIX_TIMESYNC_RX_OFFSET; /* Check if MTU is within the allowed range */ if (frame_size < NIX_MIN_FRS || frame_size > NIX_MAX_FRS) @@ -560,6 +561,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) devinfo->max_vfs = pci_dev->max_vfs; devinfo->max_mtu = devinfo->max_rx_pktlen - NIX_L2_OVERHEAD; devinfo->min_mtu = devinfo->min_rx_bufsize - NIX_L2_OVERHEAD; + if (dev->configured && otx2_ethdev_is_ptp_en(dev)) { + devinfo->max_mtu -= NIX_TIMESYNC_RX_OFFSET; + devinfo->min_mtu -= NIX_TIMESYNC_RX_OFFSET; + devinfo->max_rx_pktlen -= NIX_TIMESYNC_RX_OFFSET; + } devinfo->rx_offload_capa = dev->rx_offload_capa; devinfo->tx_offload_capa = dev->tx_offload_capa; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.896825828 +0100 +++ 0031-net-octeontx2-fix-MTU-when-PTP-is-enabled.patch 2021-11-30 16:50:05.614872238 +0100 @@ -1 +1 @@ -From 07d15d4d84e89a2f7a56bec24225c8ff326a9cf8 Mon Sep 17 00:00:00 2001 +From 0b0a33dc3a32f5dbfe52cafe15e1907969910dbe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 07d15d4d84e89a2f7a56bec24225c8ff326a9cf8 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5a4501208e..552e6bd43d 100644 +index 1f8292589c..0854026706 100644 @@ -34 +35 @@ -@@ -547,6 +548,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) +@@ -560,6 +561,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo)