From nobody Mon Oct 10 08:52:07 2022 X-Original-To: dev-commits-src-main@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 4MmCMq5LsFz4dvF4; Mon, 10 Oct 2022 08:52:07 +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 4MmCMq4gvHz3cLC; Mon, 10 Oct 2022 08:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665391927; 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=X8wgzCPQFYZHVX0bLTMZJMxwzqxu3OpTE3o0a8KEqkA=; b=HGObDp15wReSdTLOBkU9ix/OBscxpFb2aGp7kRynUQ/wREd01m4/laDipSeEjSWnqsJwql 1wdBjp+tCl/YupzFX+tXjk3XMCPKxJ69CrUxOtvz8wsTm2ypEKERLnecRtdWstK9hWfmym RqB5YJb/XJ9R9q3jkuhY+8wGy3h+aDdgsL6U4ibUsBSmf5OJFVZWaMGtxFVg1ExhJXuYVV w7MOlutdAVEkl+k5z2ZVJnEdOK2PvKJKjKocn2m+ZICSNBWf7tw0ULYqIjqHDDZD+184Lu pn23OEK1fExla+nHhVbJOay1z2twRr6WMNF8N/OfK3xcvidgzAcTACaMXP536A== 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 4MmCMq3knjzZf5; Mon, 10 Oct 2022 08:52:07 +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 29A8q7Sr041641; Mon, 10 Oct 2022 08:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29A8q7xM041640; Mon, 10 Oct 2022 08:52:07 GMT (envelope-from git) Date: Mon, 10 Oct 2022 08:52:07 GMT Message-Id: <202210100852.29A8q7xM041640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 29d7f1ff5795 - main - igc: remove unnecessary PHY ID checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 29d7f1ff579579711dd5a3325480728b8ed45f8c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665391927; 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=X8wgzCPQFYZHVX0bLTMZJMxwzqxu3OpTE3o0a8KEqkA=; b=UAwAWHnQNvnrXf4n3v3h7pr8pZD6EZP+9mfPnQKZlu83Z43buofYlGnmn+zbPDXvYCalDD mm67avPvkJF1D0NLo2yAdWBvUKwrtX5VwlO0WAfh0PITlHbuC7OMRNA1acE3D50rqAqi1q aHOuzcCSp63Knm++QwDJ+lCqQJOnw9SxjmnQ2XHoJU/6VbQoX3vZ7r8g0gooRaGTKbE3lp dbc3ks0SqntsSG1plH6+6Bz/K7GIVTFwZeYtxmCbvP+DStKVrgUbg81zOi2SrD6U5ODrgH c1wLhurgvCEB9ke/duYMtC8EQJPhO2uFlsrS0voO/p8ZLEuCuCuPBEOCnAsSKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665391927; a=rsa-sha256; cv=none; b=PCoqcRGRmLBNtnF8prhMTOBEHbhJWc/WWJvJ8sCB5ypSxVFp7C+vL+398BOOmJmLsfwxRk sEhfH68SlAnqLh0wQwRd1Jeznu/vKsGqVsR/kj2OSxSGvXwdp3d4X2We6YP2De31Ro0GMD cCnTfGcIca7y0OW55n4U+4qQ1wI11jiMtJeIwrCOJVpGXVo+Za/SzykM1tkM4fa1RUXr3M iTbMK2OkKoggdqhvN7y7ZBOm1T+IMQcPC87mu+uon192B0mq5Wg+H9EpZLMsdIQ5jNCg0E y3LFV0ON64KxIFShskiIdQUTqBs+m5cE4VsMIz85xZU5mEPUhFGVsqBmSZ85AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=29d7f1ff579579711dd5a3325480728b8ed45f8c commit 29d7f1ff579579711dd5a3325480728b8ed45f8c Author: Mah Yock Gen AuthorDate: 2022-09-02 00:18:28 +0000 Commit: Kevin Bowling CommitDate: 2022-10-10 08:50:46 +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 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36923 --- 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 97cb11d1cd01..3911e1ff6fa2 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) |