From patchwork Mon Aug 29 08:14:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: iotg.dpdk.ref.app@intel.com X-Patchwork-Id: 115595 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90AC4A0542; Mon, 29 Aug 2022 11:55:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 38A6D4069D; Mon, 29 Aug 2022 11:55:45 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 6637840694 for ; Mon, 29 Aug 2022 10:14:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661760882; x=1693296882; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=PuoMUcsZUz24i9emlsIf9Qh+0CtxOH9wU1GHL3ISF8Q=; b=AS1rz1gXKHxsCxpD+MuNwamlI20Z8Kj9/Cz1QzWGEdy2GVPRvFuwMaFu TzBtTP0xlnds/hEkCitGA69ILTkjMnhifnHdsKNzRCHFBPq9YlKs8ZCxK Z9szI/Pbj0H5YecRNXk9cfTBCJmbKIGkDM9XAcgNR41G+PVkvQ6pvWtiS QVktGvcdwSwRrG6eRJQKj2sYEFpe7oBm1qvKpaFPivU7lJxWtCtanwD11 a5hlHz08XeXRmcDKorzNT1s7vtdhKgh00X6Iuj2VpfvpBlqOiWtb7+t62 XJBGlFifbn+71iLCs2yyHsFi5NRGXH/gvfEdlDeat1Csr2LBUOKq9G6yw g==; X-IronPort-AV: E=McAfee;i="6500,9779,10453"; a="274589931" X-IronPort-AV: E=Sophos;i="5.93,272,1654585200"; d="scan'208";a="274589931" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 01:14:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,272,1654585200"; d="scan'208";a="714779231" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga002.fm.intel.com with ESMTP; 29 Aug 2022 01:14:40 -0700 From: iotg.dpdk.ref.app@intel.com To: dev@dpdk.org Subject: [PATCH] IGC: Remove I225_I_PHY_ID checking Date: Mon, 29 Aug 2022 16:14:36 +0800 Message-Id: <20220829081436.29945-1-iotg.dpdk.ref.app@intel.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 29 Aug 2022 11:55:43 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: NSWE SWS DPDK Dev 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: NSWE SWS DPDK Dev --- drivers/net/igc/base/igc_api.c | 1 + drivers/net/igc/base/igc_hw.h | 1 + drivers/net/igc/base/igc_i225.c | 15 ++------------- drivers/net/igc/base/igc_phy.c | 6 ++---- drivers/net/igc/igc_ethdev.c | 1 + 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/net/igc/base/igc_api.c b/drivers/net/igc/base/igc_api.c index 9b791dc082..c9fc9ed4b0 100644 --- a/drivers/net/igc/base/igc_api.c +++ b/drivers/net/igc/base/igc_api.c @@ -886,6 +886,7 @@ s32 igc_set_mac_type(struct igc_hw *hw) case IGC_DEV_ID_I225_V: case IGC_DEV_ID_I225_K: case IGC_DEV_ID_I225_I: + case IGC_DEV_ID_I225_IT: case IGC_DEV_ID_I220_V: case IGC_DEV_ID_I225_BLANK_NVM: case IGC_DEV_ID_I226_K: diff --git a/drivers/net/igc/base/igc_hw.h b/drivers/net/igc/base/igc_hw.h index 707a1883b4..e919a11c02 100644 --- a/drivers/net/igc/base/igc_hw.h +++ b/drivers/net/igc/base/igc_hw.h @@ -164,6 +164,7 @@ struct igc_hw; #define IGC_DEV_ID_I225_V 0x15F3 #define IGC_DEV_ID_I225_K 0x3100 #define IGC_DEV_ID_I225_I 0x15F8 +#define IGC_DEV_ID_I225_IT 0x0D9F #define IGC_DEV_ID_I220_V 0x15F7 #define IGC_DEV_ID_I225_BLANK_NVM 0x15FD #define IGC_DEV_ID_I226_K 0x3102 diff --git a/drivers/net/igc/base/igc_i225.c b/drivers/net/igc/base/igc_i225.c index 5f3d535490..bdc6f74976 100644 --- a/drivers/net/igc/base/igc_i225.c +++ b/drivers/net/igc/base/igc_i225.c @@ -173,19 +173,8 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw) phy->ops.write_reg = igc_write_phy_reg_gpy; ret_val = igc_get_phy_id(hw); - /* Verify phy id and set remaining function pointers */ - switch (phy->id) { - case I225_I_PHY_ID: - case I226_LM_PHY_ID: - 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; - default: - ret_val = -IGC_ERR_PHY; - goto out; - } + + phy->type = igc_phy_i225; out: return ret_val; diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c index 43bbe69bca..2906bae21a 100644 --- a/drivers/net/igc/base/igc_phy.c +++ b/drivers/net/igc/base/igc_phy.c @@ -1474,8 +1474,7 @@ 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) | @@ -1615,8 +1614,7 @@ 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) | diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 7f221a5d34..2989b8d488 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -97,6 +97,7 @@ static const struct rte_pci_id pci_id_igc_map[] = { { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I225_V) }, { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I225_I) }, { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I225_K) }, + { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I225_IT) }, { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I226_K) }, { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I226_LMVP) }, { RTE_PCI_DEVICE(IGC_INTEL_VENDOR_ID, IGC_DEV_ID_I226_LM) },