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 17225454E9 for ; Tue, 25 Jun 2024 02:02:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1286842670; Tue, 25 Jun 2024 02:02:18 +0200 (CEST) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by mails.dpdk.org (Postfix) with ESMTP id C0EDB40EDD for ; Tue, 25 Jun 2024 02:02:16 +0200 (CEST) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2ebe6495aedso51575371fa.0 for ; Mon, 24 Jun 2024 17:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273736; x=1719878536; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vqlTij+/ugV6xvmM3IJko7X7eDZLwAuhkBD43NjzgaI=; b=EoAO2TNQ1t9kCX+trFaT2tpFmysAcNQ4UB+E2iRaLlG+rcmtK7PrgBmyVDDK8rcG11 crSlaN3zPeCSty5WIXbfaRS6u4VSaqz7jB+WS4U++L973/xXMt29jZpeO55nzdzc29ia 6H8LLFmtsZShSUvbH8q7KOKCZ8dQHHSHIQFjkCqYxNxVJ0tekk+boRieOse0t8xTMe3F 1xBrXMHWRsAVkvlStuBqW4hhvX75bNnZLfDSrmuP5ZkrOltCuhWEzNVFQrx8qwzFPHVv /GMMF/wTIPm677ghljv9532H9vU7yMinoRHyYifAEXFS1YVQ0bYA8mpDih/ruk6L19Re oiDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273736; x=1719878536; 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=vqlTij+/ugV6xvmM3IJko7X7eDZLwAuhkBD43NjzgaI=; b=vGPHKF10ToJTSE0pFzdRPSF5hTXJVFWrUD31ah28sd5BLcbNP+4mHyCvGDop+PvvKQ 8xvpIWYBoCXYs9Aost62Q6lob13GsQGb0bhJEOtW0CBbZbS0vUNpoWilx3U8mDAhQIea e7UG0KLIMmTNoL/+kQC9lXSBQU89K2+5sz6IABt8QtsiBUVB5MyoJDqQXMF+mFWxoVHg 7tZsyxfmojj/6LPAUDUz06BQpv52mOMeVaK7WyYZCBOS/R3rdUQOClaf6YvttTZyawNL C9alAi5OcmZWeRfYDr3VYNfpzQWl9aCUELULZNCDUT3wwFJsuuAC7UzW+5/oUy8wj3sD 5TrQ== X-Forwarded-Encrypted: i=1; AJvYcCXkn7I9kPqwF2x8cV9EZd6Iax+ANcXdWuwt+7b0Oj1Z20tmWPtvFcLOjI1V/6z/h0SQsd4ovgDXnJCMmPOusko= X-Gm-Message-State: AOJu0YzeKNGYUn5qyacHHrI6CxiQSPAz8/pnBtuEUu3D1YM9rZgz/T++ iK/g9uA1Lw/brDkYAJxs/o82UNnwWnlvvd13FNR1Cv0X2o6jEmvra6nIqlDe X-Google-Smtp-Source: AGHT+IHjwRiEhoHijtwl2vZeYEVlKSlhIL9eaH5Y88K47OC/KuVpgcLKcZbMvN3okNKNoZuyxng61w== X-Received: by 2002:a2e:b046:0:b0:2ec:4d98:c9d6 with SMTP id 38308e7fff4ca-2ec5b2b1d23mr31854361fa.29.1719273736132; Mon, 24 Jun 2024 17:02:16 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d208e13sm188125285e9.36.2024.06.24.17.02.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:02:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Piotr Skajewski Cc: Radoslaw Tyl , Slawomir Mrozowicz , Alice Michael , dpdk stable Subject: patch 'net/ixgbe/base: fix 5G link speed reported on VF' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:42 +0100 Message-Id: <20240624235907.885628-56-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 22.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 06/27/24. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7b94a8b53e76bc9cdc14b5d423e3643318090e6a Thanks. Luca Boccassi --- >From 7b94a8b53e76bc9cdc14b5d423e3643318090e6a Mon Sep 17 00:00:00 2001 From: Piotr Skajewski Date: Thu, 30 May 2024 12:13:35 +0100 Subject: [PATCH] net/ixgbe/base: fix 5G link speed reported on VF [ upstream commit 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 ] When 5000 Base-T was set on PF the VF reported 100 Base-T. This patch changes ixgbe_check_mac_link_vf function where there was an incorrect conditional which checks using PF mac types, now it is correctly using VF mac types. Fixes: 12e20906905c ("net/ixgbe/base: include new speeds in VFLINK interpretation") Signed-off-by: Piotr Skajewski Reviewed-by: Radoslaw Tyl Reviewed-by: Slawomir Mrozowicz Reviewed-by: Alice Michael --- .mailmap | 1 + drivers/net/ixgbe/base/ixgbe_vf.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 4cdd9f04d9..e8953af6f0 100644 --- a/.mailmap +++ b/.mailmap @@ -1112,6 +1112,7 @@ Quentin Armitage Qun Wan Radha Mohan Chintakuntla Radoslaw Biernacki +Radoslaw Tyl Radu Bulie Radu Nicolau Rafael Ávila de Espíndola diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c index 5e3ae1b519..11dbbe2a86 100644 --- a/drivers/net/ixgbe/base/ixgbe_vf.c +++ b/drivers/net/ixgbe/base/ixgbe_vf.c @@ -585,7 +585,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, switch (links_reg & IXGBE_LINKS_SPEED_82599) { case IXGBE_LINKS_SPEED_10G_82599: *speed = IXGBE_LINK_SPEED_10GB_FULL; - if (hw->mac.type >= ixgbe_mac_X550) { + if (hw->mac.type >= ixgbe_mac_X550_vf) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_2_5GB_FULL; } @@ -595,7 +595,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, break; case IXGBE_LINKS_SPEED_100_82599: *speed = IXGBE_LINK_SPEED_100_FULL; - if (hw->mac.type == ixgbe_mac_X550) { + if (hw->mac.type == ixgbe_mac_X550_vf) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_5GB_FULL; } @@ -603,7 +603,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, case IXGBE_LINKS_SPEED_10_X550EM_A: *speed = IXGBE_LINK_SPEED_UNKNOWN; /* Since Reserved in older MAC's */ - if (hw->mac.type >= ixgbe_mac_X550) + if (hw->mac.type >= ixgbe_mac_X550_vf) *speed = IXGBE_LINK_SPEED_10_FULL; break; default: -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.698596890 +0100 +++ 0056-net-ixgbe-base-fix-5G-link-speed-reported-on-VF.patch 2024-06-25 00:22:13.205186057 +0100 @@ -1 +1 @@ -From 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 Mon Sep 17 00:00:00 2001 +From 7b94a8b53e76bc9cdc14b5d423e3643318090e6a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 508d4eba24..be16cabd07 100644 +index 4cdd9f04d9..e8953af6f0 100644 @@ -27 +28 @@ -@@ -1173,6 +1173,7 @@ Quentin Armitage +@@ -1112,6 +1112,7 @@ Quentin Armitage