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 78C3B46364 for ; Fri, 7 Mar 2025 13:48:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7491140E36; Fri, 7 Mar 2025 13:48:03 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6717540E36 for ; Fri, 7 Mar 2025 13:48:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o5O3HBiRFFkFPgd+9N9lSqae0996ux6Nj/XO+WFWq14=; b=PqgEW62NBgPK/caYD4nI7tePRntmv3YqvcI2wG21l51whbYvnWSIcRU7EzQZAGENFvGPoS mf4QRkTNN7fkFUXBHSy40wBjMLoRBNmhexp9trem0cOL7T4Bz1JeUCIdmBYGMrEslPbzdn i2khVBA7lEEmxqSwM4iLiz8MAL10Y9w= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-500-3_X67VCdMzKAnVhSpqtoBQ-1; Fri, 07 Mar 2025 07:48:00 -0500 X-MC-Unique: 3_X67VCdMzKAnVhSpqtoBQ-1 X-Mimecast-MFC-AGG-ID: 3_X67VCdMzKAnVhSpqtoBQ_1741351679 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 99C0318001E1; Fri, 7 Mar 2025 12:47:59 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5C1401955DDE; Fri, 7 Mar 2025 12:47:57 +0000 (UTC) From: Kevin Traynor To: Zaiyu Wang Cc: dpdk stable Subject: patch 'net/ngbe: fix WOL and NCSI capabilities' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:45 +0000 Message-ID: <20250307124726.475001-12-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iBY8_Bof-IJeAZwhMdeyos_R2huJH4lM0gF7AcbomHw_1741351679 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 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/12/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9d33d68367cb55a489802f2c5ae413637894e6b9 Thanks. Kevin --- >From 9d33d68367cb55a489802f2c5ae413637894e6b9 Mon Sep 17 00:00:00 2001 From: Zaiyu Wang Date: Mon, 24 Feb 2025 17:59:07 +0800 Subject: [PATCH] net/ngbe: fix WOL and NCSI capabilities [ upstream commit 7e77960c402cda75534b4bfb32e1056e1b3fa5c8 ] When determining NIC's WOL and NCSI capability via sub-system ID, flag matching must be exact, not inclusive. Misidentifying WOL/NCSI capability will skip PHY configuration, causing link-up failure. Fixes: 5f1ab0d529fc ("net/ngbe: add WOL and NCSI capability") Signed-off-by: Zaiyu Wang --- drivers/net/ngbe/base/ngbe_hw.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c index 29944f5070..1caeececf0 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -1922,4 +1922,6 @@ void ngbe_map_device_id(struct ngbe_hw *hw) { u16 oem = hw->sub_system_id & NGBE_OEM_MASK; + u16 ncsi = hw->sub_system_id & NGBE_NCSI_SUP_MASK; + u16 wol = hw->sub_system_id & NGBE_WOL_SUP_MASK; hw->is_pf = true; @@ -1982,7 +1984,7 @@ void ngbe_map_device_id(struct ngbe_hw *hw) hw->gpio_ctl = true; - hw->wol_enabled = (hw->sub_system_id & NGBE_WOL_SUP_MASK) ? true : false; - hw->ncsi_enabled = (hw->sub_system_id & NGBE_NCSI_SUP_MASK || - hw->sub_system_id & NGBE_OCP_CARD) ? true : false; + hw->wol_enabled = (wol == NGBE_WOL_SUP_MASK) ? true : false; + hw->ncsi_enabled = (ncsi == NGBE_NCSI_SUP_MASK || + oem == NGBE_OCP_CARD) ? true : false; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:57.353435696 +0000 +++ 0012-net-ngbe-fix-WOL-and-NCSI-capabilities.patch 2025-03-07 11:02:56.849335609 +0000 @@ -1 +1 @@ -From 7e77960c402cda75534b4bfb32e1056e1b3fa5c8 Mon Sep 17 00:00:00 2001 +From 9d33d68367cb55a489802f2c5ae413637894e6b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7e77960c402cda75534b4bfb32e1056e1b3fa5c8 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index e29a1946e5..6688ae6a31 100644 +index 29944f5070..1caeececf0 100644 @@ -22 +23 @@ -@@ -1923,4 +1923,6 @@ void ngbe_map_device_id(struct ngbe_hw *hw) +@@ -1922,4 +1922,6 @@ void ngbe_map_device_id(struct ngbe_hw *hw) @@ -29 +30 @@ -@@ -1983,7 +1985,7 @@ void ngbe_map_device_id(struct ngbe_hw *hw) +@@ -1982,7 +1984,7 @@ void ngbe_map_device_id(struct ngbe_hw *hw)