From nobody Mon Oct 17 03:38:32 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MrN4n0Jqcz4fg4H; Mon, 17 Oct 2022 03:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MrN4m6sBKz3xMh; Mon, 17 Oct 2022 03:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665977913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTwFMC309kk5n/0sYpM/Jgg9tUNxdaQxjQklSF4Cf30=; b=XMKKCHzTJuGp3eeMePTrVp3oaWkbme4dMofbj6i4kteudxNQIsL4orhjD7/76n8UGPdXMR PPznN9c27S40Ve+QRQbO0VG8bAegAAIzLNXSJDNhUOHCoIi3Z/DG40ftN0TtweQDprcCFN /NI9EY6jCvxWzr5x1gDsR/8aQ9bP0zSqeEeobL+/RGBZNWJP9QdzTCDEHsT0qJu+GFc2O3 Ho+6jO3U19pW9HrUqt4wGC1bJxWQHeSynhdV3x4KqZJmwcRXG1vc+0Mzl95knTW6VJWRON vhBlBw5B+yS+zea9sK/o8KxT88Z+VG8RGMrh0uQM+jRgG6UD2t6Ln3fXmUgaEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MrN4m5tw1zh6V; Mon, 17 Oct 2022 03:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29H3cWeo009292; Mon, 17 Oct 2022 03:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29H3cWMs009291; Mon, 17 Oct 2022 03:38:32 GMT (envelope-from git) Date: Mon, 17 Oct 2022 03:38:32 GMT Message-Id: <202210170338.29H3cWMs009291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 61b2374e0c05 - stable/12 - igc: remove unnecessary PHY ID checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 61b2374e0c0517ec6942d4137b9f57fa22d05053 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665977913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTwFMC309kk5n/0sYpM/Jgg9tUNxdaQxjQklSF4Cf30=; b=RdjV1X1Wk0kzMQeXacu1BZ3nWrhPqBVgVZsJ1OGDhnY2oewqI8/zMntRRtgXzjV13hbYHs 8fsn9OZso+p0XCj7wV9fgRicWJKC5P4/SW3/Qm/KYrXo4ub2lCh+BcMQ9pBlrXBOznCWwv 5YFTvqhkP3Yco/dP658xCwgo69NwvJqIajbUy/en46IRmsaoUuxlYgJ2Mj8aES9kruwVxa BRhGFN9hOBFv8Sd5nMUb0niUz7YSEMOQLFPG67ZOrH4AvIeF2Da5xxtZwSE6mW6b4iRszz ZTakiGa5kbxUROih3+deZeAUwtbjhhkQr2Dyrt1ejTbpnraCZUHP2YaHK+sOGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665977913; a=rsa-sha256; cv=none; b=S8lVSYdyd4e5fBBnU647X/hZbtCJwLV2iQIZhPIOrI+X4vVBOiROob63JmIblVwqsNyPNI tYlNZNUd+eaOm50L5G0HJNyz2YwOF5oAvL/380S3V3o0bUG1kALunxqYGn9IBf5KtrbpMu eh9+dPc37VJj4lmAWp211cbMVPsYdq+F244eoMdsF32oKMmz4f5kwbUK31caL6eco1UAQY oBYi9jCYTLRmqGUnspLKobQtvv73sFQkDfw6QHDnyWyxj1lwQyOYtKM+C0dTeLFJsj8qyV omIfZMMmHAYcLl8M8lzRr0DMFsGAvAAbNCfuwIOIr7ULSoXNURDnMyGF6C5Qvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=61b2374e0c0517ec6942d4137b9f57fa22d05053 commit 61b2374e0c0517ec6942d4137b9f57fa22d05053 Author: Mah Yock Gen AuthorDate: 2022-09-02 00:18:28 +0000 Commit: Kevin Bowling CommitDate: 2022-10-17 03:37:22 +0000 igc: remove unnecessary PHY ID checks I225 devices have only one PHY vendor. There is unnecessary to check _I_PHY_ID during the link establishment and auto-negotiation process, the checking also caused devices like i225-IT failed. This patch is to remove the mentioned unnecessary checking. Cc: stable@dpdk.org Signed-off-by: Mah Yock Gen Signed-off-by: Taripin Samuel Acked-by: Qi Zhang Approved by: grehan Differential Revision: https://reviews.freebsd.org/D36923 (cherry picked from commit 29d7f1ff579579711dd5a3325480728b8ed45f8c) --- sys/dev/igc/igc_i225.c | 11 +---------- sys/dev/igc/igc_phy.c | 6 ++---- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/sys/dev/igc/igc_i225.c b/sys/dev/igc/igc_i225.c index 95d7d1536184..91d221cee06b 100644 --- a/sys/dev/igc/igc_i225.c +++ b/sys/dev/igc/igc_i225.c @@ -169,16 +169,7 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw) goto out; ret_val = igc_get_phy_id(hw); - /* Verify phy id and set remaining function pointers */ - switch (phy->id) { - case I225_I_PHY_ID: - default: - phy->type = igc_phy_i225; - phy->ops.set_d0_lplu_state = igc_set_d0_lplu_state_i225; - phy->ops.set_d3_lplu_state = igc_set_d3_lplu_state_i225; - /* TODO - complete with GPY PHY information */ - break; - } + phy->type = igc_phy_i225; out: return ret_val; diff --git a/sys/dev/igc/igc_phy.c b/sys/dev/igc/igc_phy.c index a6823ddf7bac..d2ae7effbb41 100644 --- a/sys/dev/igc/igc_phy.c +++ b/sys/dev/igc/igc_phy.c @@ -310,8 +310,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) return ret_val; } - if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && - hw->phy.id == I225_I_PHY_ID) { + if (phy->autoneg_mask & ADVERTISE_2500_FULL) { /* Read the MULTI GBT AN Control Register - reg 7.32 */ ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK << MMD_DEVADDR_SHIFT) | @@ -451,8 +450,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg); - if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && - hw->phy.id == I225_I_PHY_ID) + if (phy->autoneg_mask & ADVERTISE_2500_FULL) ret_val = phy->ops.write_reg(hw, (STANDARD_AN_REG_MASK << MMD_DEVADDR_SHIFT) |