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 2F2B046364 for ; Fri, 7 Mar 2025 13:24:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2974040E35; Fri, 7 Mar 2025 13:24:53 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id B65254029E for ; Fri, 7 Mar 2025 13:24:51 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4393dc02b78so10884975e9.3 for ; Fri, 07 Mar 2025 04:24:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741350291; x=1741955091; 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=AxxbNCWYQzuja+/WlA07Dq4K5cS1XFoUSfHN0WZRDes=; b=APl/3yEIXSeWtrDECbpVHSwBPNJIlQkL6ywARHN/IO0TfKUjLYdBeF2Mdwo3pWVRkV HuM5y8iuPbCYfuu+hYwyd/kliG5ScC8GDArwqLr5WU9JKUYPbhkpa1Nfef384UuJRGsI HiQC17b7ynTXs+CSN4sP73KYOBwfmUeQLfIhFu1g0dB7SVjOJDHrQgO41c35mqCsa9CA nuGJN7rlsKaaE7bWDsi4myOyCX7nVtvtrDAyh1vIs391gZ4mi728TaiB47Bm/c9dHifZ OedKeJpH1R5u8ufrdArnagrWOfS4LvSJ3CMvMwjYpTupa5kpmYCmBV5Y50MAS1+Uik6n Xmog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350291; x=1741955091; 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=AxxbNCWYQzuja+/WlA07Dq4K5cS1XFoUSfHN0WZRDes=; b=RAK2yrEI8aZt/RUS4wGRTuNEYue0Zq/AOtTGPUaedPCnOuDYRZX7L3VBSmw01hHiCX UA/jezwdDv/oNXUkfBOgdqsbkmxf+lnVPlygQdvg70Eudfbkd2LrPeEmef+AmUlfJ9AL QHFZXvnITir3OvbmHD9xdlp4BDb1BosRdhPTIC5PGibDBqORc5wk9Qcd1IMqT1FaDODQ owtOzDuaOYTxzoZywp1uzcFLizegDcBTiA0wn9vK3jUg21s8iutGcLD0x0Rk4f1xkGUm jKf99KxsR1Qx/BUkMC6N0caBEtyTDtFmBH1JgO8QzCgizh6bHvb7kaPrhnJ2TJ/UP5gp LayQ== X-Gm-Message-State: AOJu0Yxc8OdHc6DhHX70nLfxq5DIAV6BPI7oC+CksNtps/rR5y98/jvF aTDEpZ9n2WFnr+e/Ct/eLAXzHGyOcHxbnMtCyBg6liN+HhkP7Sfi3z8+j39/ X-Gm-Gg: ASbGncsuN8n3ABKiFsZWuRyawYAspEWvpQXW6kKdYZUiPGCvXeNh4NfGhBTRy4sH+WS vGtpWcb/Winqhw2RWnClOuSLJOYFXfYCiOKHnCDwfjiFLG8UGNoqdftKHnceA3o4Cnx0oOtNSC9 +0CaV/sff/z3PI2wopMJy+ZnIDg3CySzJSrZ6vXk4im+sX4RoqXuUJm6jEqA7e4ep3/UwAMSR5W j0X+EZRx6fossai6UVhXNN0lxdb9P/sArKWs9pHxXnZhEpjDDmI5kVvB1TxwRkihg9xskD454IK RM49znx1oYkptfB+4WTK1xYWirnOM2YYD6aZERe34HMHL3wT3xc= X-Google-Smtp-Source: AGHT+IEdA7vxNIY2mXkM/f+oy4kuNyoJv+ePrG3FZlWoMYhR0in14C5DcPTr3gaHy3dqgP13RzM2AQ== X-Received: by 2002:a05:600c:3b1e:b0:43b:c965:954d with SMTP id 5b1f17b1804b1-43c5a5e92f3mr18101255e9.1.1741350291233; Fri, 07 Mar 2025 04:24:51 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:ff31:f049:bd38:f7cf]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bd429195csm78789645e9.10.2025.03.07.04.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 04:24:50 -0800 (PST) From: luca.boccassi@gmail.com To: Zaiyu Wang Cc: dpdk stable Subject: patch 'net/txgbe: remove useless condition for SW-FW sync' has been queued to stable release 22.11.8 Date: Fri, 7 Mar 2025 12:24:06 +0000 Message-ID: <20250307122431.1415551-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250307122431.1415551-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-79-luca.boccassi@gmail.com> <20250307122431.1415551-1-luca.boccassi@gmail.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 22.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/25. 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/b5562baa75502f083ea38582ada2a515bd638c80 Thanks. Luca Boccassi --- >From b5562baa75502f083ea38582ada2a515bd638c80 Mon Sep 17 00:00:00 2001 From: Zaiyu Wang Date: Mon, 24 Feb 2025 17:59:08 +0800 Subject: [PATCH] net/txgbe: remove useless condition for SW-FW sync [ upstream commit 0d6b122c28b4a3ab4cbb79103f305e49a9edfcae ] Remove superfluous 'if' and 'else' for SW-FW sync. Bugzilla ID: 1581 Fixes: 5364a1ce30df ("net/txgbe: add PHY init") Signed-off-by: Zaiyu Wang --- drivers/net/txgbe/base/txgbe_phy.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c index a7c11c50df..abcc9e72bd 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -80,12 +80,8 @@ static s32 txgbe_read_phy_if(struct txgbe_hw *hw) if (hw->phy.nw_mng_if_sel & TXGBE_ETHPHYIF_MDIO_ACT) hw->phy.addr = TXGBE_ETHPHYIF_MDIO_BASE(hw->phy.nw_mng_if_sel); - if (!hw->phy.phy_semaphore_mask) { - if (hw->bus.lan_id) - hw->phy.phy_semaphore_mask = TXGBE_MNGSEM_SWPHY; - else - hw->phy.phy_semaphore_mask = TXGBE_MNGSEM_SWPHY; - } + if (!hw->phy.phy_semaphore_mask) + hw->phy.phy_semaphore_mask = TXGBE_MNGSEM_SWPHY; return 0; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 12:23:38.293754883 +0000 +++ 0007-net-txgbe-remove-useless-condition-for-SW-FW-sync.patch 2025-03-07 12:23:37.998838059 +0000 @@ -1 +1 @@ -From 0d6b122c28b4a3ab4cbb79103f305e49a9edfcae Mon Sep 17 00:00:00 2001 +From b5562baa75502f083ea38582ada2a515bd638c80 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0d6b122c28b4a3ab4cbb79103f305e49a9edfcae ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index d87af656d5..ce6882e262 100644 +index a7c11c50df..abcc9e72bd 100644