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 2B09DA0555 for ; Thu, 9 Jun 2022 13:38:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 260E440689; Thu, 9 Jun 2022 13:38:09 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B701842802 for ; Thu, 9 Jun 2022 13:38:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774685; 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=dVcFGKKuB7FzmcEu9SjUm1qmIV8Q+jnrpfiJKAIOXIc=; b=cmllxumd3uke8yJRyl/tLxWc90E+RFJkOeEtVNyrC8F834A2BQsNWhEXaui+k8y1NpC5Ka 2kZip8cmIFEP8bOHRt0jy3dawsrtukJswPnQ3lyc8cr43j+UBX1rQ6VGvFvzHaDgB3dX6N GZKKeAhgzHF7GYSXT6i9xeen9cM1iLc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-467-OhIL0t1BPSKm75WSZsZbdA-1; Thu, 09 Jun 2022 07:38:02 -0400 X-MC-Unique: OhIL0t1BPSKm75WSZsZbdA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDBA438041D7; Thu, 9 Jun 2022 11:38:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5410F1730C; Thu, 9 Jun 2022 11:38:01 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix reading PHY ID' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:24 +0100 Message-Id: <20220609113701.386938-37-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 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 21.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 06/13/22. 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/fe6c80f4a5a7a98b31aeddd75b5986735706f993 Thanks. Kevin --- >From fe6c80f4a5a7a98b31aeddd75b5986735706f993 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 30 May 2022 17:30:10 +0800 Subject: [PATCH] net/ngbe: fix reading PHY ID [ upstream commit abe02c6c4c08b293ec523db0d69b36a0cb9f582c ] Change to check low ID register to determine the valid PHY address, for yt8521s PHY with high ID register value 0. And fix polling register when expect value is 0, to complete MDIO read. Fixes: 44e97550ca68 ("net/ngbe: identify and reset PHY") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_phy.c | 7 ++----- drivers/net/ngbe/base/ngbe_regs.h | 9 +++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/ngbe/base/ngbe_phy.c b/drivers/net/ngbe/base/ngbe_phy.c index 7a0ebba98c..e2b6b05ddf 100644 --- a/drivers/net/ngbe/base/ngbe_phy.c +++ b/drivers/net/ngbe/base/ngbe_phy.c @@ -122,9 +122,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr) bool valid = false; - if (hw->sub_device_id == NGBE_SUB_DEV_ID_EM_YT8521S_SFP) - return true; - hw->phy.addr = phy_addr; - hw->phy.read_reg(hw, NGBE_MD_PHY_ID_HIGH, + hw->phy.read_reg(hw, NGBE_MD_PHY_ID_LOW, NGBE_MD_DEV_PMA_PMD, &phy_id); @@ -132,5 +129,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr) valid = true; - DEBUGOUT("PHY ID HIGH is 0x%04X", phy_id); + DEBUGOUT("PHY ID LOW is 0x%04X", phy_id); return valid; diff --git a/drivers/net/ngbe/base/ngbe_regs.h b/drivers/net/ngbe/base/ngbe_regs.h index 6432ad8736..640e385990 100644 --- a/drivers/net/ngbe/base/ngbe_regs.h +++ b/drivers/net/ngbe/base/ngbe_regs.h @@ -1423,6 +1423,11 @@ po32m(struct ngbe_hw *hw, u32 reg, u32 mask, u32 expect, u32 *actual, do { - all |= rd32(hw, reg); - value |= mask & all; + if (expect != 0) { + all |= rd32(hw, reg); + value |= mask & all; + } else { + all = rd32(hw, reg); + value = mask & all; + } if (value == expect) break; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.649380926 +0100 +++ 0037-net-ngbe-fix-reading-PHY-ID.patch 2022-06-09 12:34:29.742980635 +0100 @@ -1 +1 @@ -From abe02c6c4c08b293ec523db0d69b36a0cb9f582c Mon Sep 17 00:00:00 2001 +From fe6c80f4a5a7a98b31aeddd75b5986735706f993 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit abe02c6c4c08b293ec523db0d69b36a0cb9f582c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 8199696428..1025d7d3a1 100644 +index 7a0ebba98c..e2b6b05ddf 100644 @@ -23 +24 @@ -@@ -121,9 +121,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr) +@@ -122,9 +122,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr) @@ -34 +35 @@ -@@ -131,5 +128,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr) +@@ -132,5 +129,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)