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 DD0BA454E9 for ; Tue, 25 Jun 2024 02:02:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D903D410DC; Tue, 25 Jun 2024 02:02:06 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 6400840EDD for ; Tue, 25 Jun 2024 02:02:05 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4217136a74dso40640015e9.2 for ; Mon, 24 Jun 2024 17:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273725; x=1719878525; 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=eJiTioPjMFSa62yRA/FQx1OCAHgBOSElJ4Unk7TtMxQ=; b=glOJMT1KMlWR3yA763Hs7GFofdKoZ+eY2FtDwhuJEQX2A7YYfY4JcZFxuG/YHmxtrp gK4yWE/1BpJ1TZ/Yjx0EuP9us3uPhKV8nMLfEt2U/9lMmTbtnY/KoajIbhU7ZRAhEn58 LNjryaEWrB6rbbv0vXLM38praE19lPgHtbLlg+EEI/x3AgKDwr+/JM7ZZtcDjrpRmNLS ADtN9V/DmaqlDn5rAwSjfwIhAQA85q3wWjg955JF2ZWEvZ5yeLYOKooicme1ySdbOGDL EdFtIQm+6EErXWTYn50AVMsX6/3eWNwHQOPKnmZ0SwtQHOHCn0OItZTwCemi7Ka82QVD d6SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273725; x=1719878525; 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=eJiTioPjMFSa62yRA/FQx1OCAHgBOSElJ4Unk7TtMxQ=; b=NoKJCU7HyxxtAz2IUU6GGRiUr6GNN1JHNkiLhQULe02xZVJfPBpTY+ZXKUNlNWBJ9R 5CNWyuovMyhliCGKkEa5QTg+HD9wV6OCvm68Dx4kcKGQzi9vnFI2fAEKSLI5WYKDoBuA bVJ/U3G3kIBAi3+z1ZdKVFOzBLuPWjkAdIe8MO+fIKavkJFJ9/C2D+6kaYCAsHLsmYSS 1H37NsJOlkf+NfKDREKLK9St0Uyv+MKVIqvqPoBRHLxleWETQLbEI/KG4wshMrA9tiOA 8ce4Y9vClK39d78jQCCSToDdvKRzYWdTQU2uc+B6I3olrO3fBG+TDr9XR7UFZDbF3mvL 5tFg== X-Forwarded-Encrypted: i=1; AJvYcCUSmGxke7gckO6XjcQjYiygGboDR+UczTVvkLmMbW3gOzIgHte1YFCGwTqfk/FjsOsYe40E39TCeRylqF7O51I= X-Gm-Message-State: AOJu0Yxy9c2jSe+ODHymKih8NGJ2UgOym1MkehipHf4YKWaH1+1wDNW+ /lPrVCwXtEQtafJ+69IHo/gBmUhLOhYhMoaGugdOJzOLSg9PNZTyMnRb4rQq X-Google-Smtp-Source: AGHT+IH0wI0TCJyD7C0KqekC2E/rkT9tu6pjBc2Z9UQ2k+D2kT+4dcomYhcimhCyb7Hk8/2oZXNAtA== X-Received: by 2002:a05:600c:3501:b0:424:8ff8:b12e with SMTP id 5b1f17b1804b1-4248ff8b1b6mr32033225e9.11.1719273724973; Mon, 24 Jun 2024 17:02:04 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366383f6355sm11300017f8f.17.2024.06.24.17.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:02:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Piotr Pietruszewski Cc: Piotr Skajewski , Marek Mical , Jeff Kirsher , Alice Michael , dpdk stable Subject: patch 'net/ixgbe/base: revert advertising for X550 2.5G/5G' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:41 +0100 Message-Id: <20240624235907.885628-55-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/5e73514050ef0367456e035b851ef83edf86676b Thanks. Luca Boccassi --- >From 5e73514050ef0367456e035b851ef83edf86676b Mon Sep 17 00:00:00 2001 From: Piotr Pietruszewski Date: Thu, 30 May 2024 12:13:34 +0100 Subject: [PATCH] net/ixgbe/base: revert advertising for X550 2.5G/5G [ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ] The commit removing advertising 2.5G and 5G speeds from ixgbe_get_copper_speeds_supported() was supposed to disable 2.5G and 5G during the autonegotiation with default settings. However, that change prevented OS-specific part of the driver from forcing these speeds at user request. This change reverts the commit and adds 2.5G and 5G as speeds supported by the X550. Fixes: 13de2444449e ("net/ixgbe/base: remove default advertising for x550 2.5G/5G") Signed-off-by: Piotr Pietruszewski Reviewed-by: Piotr Skajewski Reviewed-by: Marek Mical Reviewed-by: Jeff Kirsher Reviewed-by: Alice Michael --- .mailmap | 1 + drivers/net/ixgbe/base/ixgbe_phy.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.mailmap b/.mailmap index 2724a689fd..4cdd9f04d9 100644 --- a/.mailmap +++ b/.mailmap @@ -845,6 +845,7 @@ Marcin Wojtas Marcin Zapolski Marco Varlese Marc Sune +Marek Mical Maria Lingemark Mario Carrillo Mário Kuka diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c index 74c5db16fa..3a8e603472 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -915,6 +915,10 @@ static s32 ixgbe_get_copper_speeds_supported(struct ixgbe_hw *hw) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_100_FULL; switch (hw->mac.type) { + case ixgbe_mac_X550: + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; + break; case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: hw->phy.speeds_supported &= ~IXGBE_LINK_SPEED_100_FULL; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.661860969 +0100 +++ 0055-net-ixgbe-base-revert-advertising-for-X550-2.5G-5G.patch 2024-06-25 00:22:13.201185974 +0100 @@ -1 +1 @@ -From 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 Mon Sep 17 00:00:00 2001 +From 5e73514050ef0367456e035b851ef83edf86676b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 075ea40f17..508d4eba24 100644 +index 2724a689fd..4cdd9f04d9 100644 @@ -32 +33 @@ -@@ -892,6 +892,7 @@ Marcin Wojtas +@@ -845,6 +845,7 @@ Marcin Wojtas