From: Wei Dai <wei.dai@intel.com>
To: helin.zhang@intel.com, konstantin.ananyev@intel.com
Cc: dev@dpdk.org, Wei Dai <wei.dai@intel.com>
Subject: [dpdk-dev] [PATCH 26/29] net/ixgbe/base: remove unused old EEE code
Date: Sun, 4 Dec 2016 14:31:37 +0800 [thread overview]
Message-ID: <1480833100-48545-26-git-send-email-wei.dai@intel.com> (raw)
In-Reply-To: <1480833100-48545-1-git-send-email-wei.dai@intel.com>
remove unused old EEE code.
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
drivers/net/ixgbe/base/ixgbe_x550.c | 113 +-----------------------------------
drivers/net/ixgbe/base/ixgbe_x550.h | 2 -
2 files changed, 1 insertion(+), 114 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 2aaed6b..4a98530 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -942,6 +942,7 @@ s32 ixgbe_init_ops_X550EM_x(struct ixgbe_hw *hw)
ixgbe_write_i2c_combined_generic_unlocked;
link->addr = IXGBE_CS4227;
+
return ret_val;
}
@@ -1109,118 +1110,6 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
}
/**
- * ixgbe_enable_eee_x550 - Enable EEE support
- * @hw: pointer to hardware structure
- */
-STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
-{
- u32 link_reg;
- s32 status;
-
- switch (hw->device_id) {
- case IXGBE_DEV_ID_X550EM_A_KR:
- case IXGBE_DEV_ID_X550EM_A_KR_L:
- status = hw->mac.ops.read_iosf_sb_reg(hw,
- IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
- IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
- if (status != IXGBE_SUCCESS)
- return status;
-
- link_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |
- IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;
-
- /* Don't advertise FEC capability when EEE enabled. */
- link_reg &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;
-
- status = hw->mac.ops.write_iosf_sb_reg(hw,
- IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
- IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
- if (status != IXGBE_SUCCESS)
- return status;
- break;
- default:
- break;
- }
-
- return IXGBE_SUCCESS;
-}
-
-/**
- * ixgbe_disable_eee_x550 - Disable EEE support
- * @hw: pointer to hardware structure
- */
-STATIC s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
-{
- u32 link_reg;
- s32 status;
-
- switch (hw->device_id) {
- case IXGBE_DEV_ID_X550EM_X_KR:
- case IXGBE_DEV_ID_X550EM_A_KR:
- case IXGBE_DEV_ID_X550EM_A_KR_L:
- status = hw->mac.ops.read_iosf_sb_reg(hw,
- IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
- IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
- if (status != IXGBE_SUCCESS)
- return status;
-
- link_reg &= ~(IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |
- IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX);
-
- /* Advertise FEC capability when EEE is disabled. */
- link_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;
-
- status = hw->mac.ops.write_iosf_sb_reg(hw,
- IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
- IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
- if (status != IXGBE_SUCCESS)
- return status;
- break;
- default:
- break;
- }
-
- return IXGBE_SUCCESS;
-}
-
-/**
- * ixgbe_setup_eee_X550 - Enable/disable EEE support
- * @hw: pointer to the HW structure
- * @enable_eee: boolean flag to enable EEE
- *
- * Enable/disable EEE based on enable_eee flag.
- * Auto-negotiation must be started after BASE-T EEE bits in PHY register 7.3C
- * are modified.
- *
- **/
-s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
-{
- s32 status;
- u32 eeer;
-
- DEBUGFUNC("ixgbe_setup_eee_X550");
-
- eeer = IXGBE_READ_REG(hw, IXGBE_EEER);
- /* Enable or disable EEE per flag */
- if (enable_eee) {
- eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
-
- status = ixgbe_enable_eee_x550(hw);
- if (status)
- return status;
- } else {
- eeer &= ~(IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
-
- status = ixgbe_disable_eee_x550(hw);
- if (status)
- return status;
- }
- IXGBE_WRITE_REG(hw, IXGBE_EEER, eeer);
-
- return IXGBE_SUCCESS;
-}
-
-/**
* ixgbe_set_source_address_pruning_X550 - Enable/Disbale source address pruning
* @hw: pointer to hardware structure
* @enable: enable or disable source address pruning
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.h b/drivers/net/ixgbe/base/ixgbe_x550.h
index 2d1876b..30ca5df 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.h
+++ b/drivers/net/ixgbe/base/ixgbe_x550.h
@@ -57,8 +57,6 @@ s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset,
u16 *data);
s32 ixgbe_write_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset,
u16 data);
-s32 ixgbe_set_eee_X550(struct ixgbe_hw *hw, bool enable_eee);
-s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee);
void ixgbe_set_source_address_pruning_X550(struct ixgbe_hw *hw, bool enable,
unsigned int pool);
void ixgbe_set_ethertype_anti_spoofing_X550(struct ixgbe_hw *hw,
--
2.7.4
next prev parent reply other threads:[~2016-12-04 6:35 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 6:31 [dpdk-dev] [PATCH 01/29] net/ixgbe/base: fix check for PHY reset Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 02/29] net/ixgbe/base: fix condition to clear RAR entry Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 03/29] net/ixgbe/base: use fast MDIO for non-10G MDIO devices Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 04/29] net/ixgbe/base: fix PHY identification Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 05/29] net/ixgbe/base: clean up X557 link status check Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 06/29] net/ixgbe/base: add driver version to firmware Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 07/29] net/ixgbe/base: add support to store LED link active Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 08/29] net/ixgbe/base: cleanup logic in X540 checksum calculation Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 09/29] net/ixgbe/base: enable LASI interrupts only for X552 devices Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 10/29] net/ixgbe/base: add X552 MAC check for iXFI flows Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 11/29] net/ixgbe/base: fix getting phy type Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 12/29] net/ixgbe/base: fix SGMII link setup for M88 PHYs Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 13/29] net/ixgbe/base: cleanup dead EEE code Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 14/29] net/ixgbe/base: update setup PHY link to unset all speeds Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 15/29] net/ixgbe/base: support FW commands to control some PHYs Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 16/29] net/ixgbe/base: use " Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 17/29] net/ixgbe/base: support busy SGMII register reads Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 18/29] net/ixgbe/base: include new speeds in VFLINK interpretation Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 19/29] net/ixgbe/base: check only X550 devices support 5G Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 20/29] net/ixgbe/base: add physical layer options for FW PHY type Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 21/29] net/ixgbe/base: remove unneeded MAC check Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 22/29] net/ixgbe/base: remove unused PHY ID Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 23/29] net/ixgbe/base: update FW PHY flow control Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 24/29] net/ixgbe/base: add EEE support for DNL-controlled PHYs Wei Dai
2016-12-05 19:40 ` Ferruh Yigit
2016-12-21 10:17 ` Dai, Wei
2016-12-04 6:31 ` [dpdk-dev] [PATCH 25/29] net/ixgbe/base: fix incorrect IXGBE LSWFW register Wei Dai
2016-12-04 6:31 ` Wei Dai [this message]
2016-12-04 6:31 ` [dpdk-dev] [PATCH 27/29] net/ixgbe/base: add write flush required by Inphi Wei Dai
2016-12-05 19:40 ` Ferruh Yigit
2016-12-21 10:31 ` Dai, Wei
2016-12-04 6:31 ` [dpdk-dev] [PATCH 28/29] net/ixgbe/base: report physical layer for SGMII PHY type Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 29/29] net/ixgbe/base: update version of basical codes in README Wei Dai
2016-12-05 19:41 ` Ferruh Yigit
2016-12-17 14:39 ` Dai, Wei
2016-12-21 10:32 ` Dai, Wei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480833100-48545-26-git-send-email-wei.dai@intel.com \
--to=wei.dai@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=konstantin.ananyev@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).