From: Wei Dai <wei.dai@intel.com>
To: dev@dpdk.org
Cc: helin.zhang@intel.com, konstantin.ananyev@intel.com,
Wei Dai <wei.dai@intel.com>
Subject: [dpdk-dev] [PATCH v2 13/30] net/ixgbe/base: cleanup dead EEE code
Date: Wed, 21 Dec 2016 17:47:57 +0800 [thread overview]
Message-ID: <1482313694-31602-14-git-send-email-wei.dai@intel.com> (raw)
In-Reply-To: <1482313694-31602-1-git-send-email-wei.dai@intel.com>
Remove some specific code for enabling/disabling Energy Efficient
Ethernet (EEE).
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
drivers/net/ixgbe/base/ixgbe_x550.c | 61 ++++++-------------------------------
1 file changed, 10 insertions(+), 51 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 5cf9e40..97fbf88 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -62,7 +62,7 @@ s32 ixgbe_init_ops_X550(struct ixgbe_hw *hw)
mac->ops.dmac_config = ixgbe_dmac_config_X550;
mac->ops.dmac_config_tcs = ixgbe_dmac_config_tcs_X550;
mac->ops.dmac_update_tcs = ixgbe_dmac_update_tcs_X550;
- mac->ops.setup_eee = ixgbe_setup_eee_X550;
+ mac->ops.setup_eee = NULL;
mac->ops.set_source_address_pruning =
ixgbe_set_source_address_pruning_X550;
mac->ops.set_ethertype_anti_spoofing =
@@ -603,15 +603,6 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
else
mac->ops.setup_fc = ixgbe_setup_fc_X550em;
- 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:
- break;
- default:
- mac->ops.setup_eee = NULL;
- }
-
/* PHY */
phy->ops.init = ixgbe_init_phy_ops_X550em;
phy->ops.identify = ixgbe_identify_phy_x550em;
@@ -679,6 +670,15 @@ s32 ixgbe_init_ops_X550EM_a(struct ixgbe_hw *hw)
mac->ops.setup_fc = ixgbe_setup_fc_sgmii_x550em_a;
}
+ switch (hw->device_id) {
+ case IXGBE_DEV_ID_X550EM_A_KR:
+ case IXGBE_DEV_ID_X550EM_A_KR_L:
+ mac->ops.setup_eee = ixgbe_setup_eee_X550;
+ break;
+ default:
+ mac->ops.setup_eee = NULL;
+ }
+
return ret_val;
}
@@ -883,28 +883,10 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
*/
STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
{
- u16 autoneg_eee_reg;
u32 link_reg;
s32 status;
- if (hw->mac.type == ixgbe_mac_X550) {
- /* Advertise EEE capability */
- hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- &autoneg_eee_reg);
-
- autoneg_eee_reg |= (IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
- IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
- IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
-
- hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- autoneg_eee_reg);
- return IXGBE_SUCCESS;
- }
-
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,
@@ -938,26 +920,9 @@ STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
*/
STATIC s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
{
- u16 autoneg_eee_reg;
u32 link_reg;
s32 status;
- if (hw->mac.type == ixgbe_mac_X550) {
- /* Disable advertised EEE capability */
- hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- &autoneg_eee_reg);
-
- autoneg_eee_reg &= ~(IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
- IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
- IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
-
- hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- autoneg_eee_reg);
- return IXGBE_SUCCESS;
- }
-
switch (hw->device_id) {
case IXGBE_DEV_ID_X550EM_X_KR:
case IXGBE_DEV_ID_X550EM_A_KR:
@@ -1009,12 +974,6 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
if (enable_eee) {
eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
- /* Not supported on first revision of X550EM_x. */
- if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
- !(IXGBE_FUSES0_REV_MASK &
- IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
- return IXGBE_SUCCESS;
-
status = ixgbe_enable_eee_x550(hw);
if (status)
return status;
--
2.7.4
next prev parent reply other threads:[~2016-12-21 9:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-21 9:47 [dpdk-dev] [PATCH v2 00/30] update ixgbe shared code to version 16.11.21 Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 01/30] net/ixgbe/base: fix PHY reset check for x550em-ext Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 02/30] net/ixgbe/base: fix clearing SAN MAC address Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 03/30] net/ixgbe/base: use fast MDIO for non-10G devices Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 04/30] net/ixgbe/base: fix PHY identification for x550a Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 05/30] net/ixgbe/base: clean up X557 link status check Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 06/30] net/ixgbe/base: add driver version to firmware Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 07/30] net/ixgbe/base: store link active LED Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 08/30] net/ixgbe/base: cleanup X540 checksum calculation Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 09/30] net/ixgbe/base: enable LASI only for X552 devices Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 10/30] net/ixgbe/base: limit iXFI setup to " Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 11/30] net/ixgbe/base: fix getting PHY type for some x550 devices Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 12/30] net/ixgbe/base: fix SGMII link setup for M88 PHYs Wei Dai
2016-12-21 9:47 ` Wei Dai [this message]
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 14/30] net/ixgbe/base: fix setting unsupported autoneg speeds Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 15/30] net/ixgbe/base: support FW commands to control some PHYs Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 16/30] net/ixgbe/base: use " Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 17/30] net/ixgbe/base: support busy SGMII register reads Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 18/30] net/ixgbe/base: include new speeds in VFLINK interpretation Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 19/30] net/ixgbe/base: limit 5Gb support to X550 devices Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 20/30] net/ixgbe/base: add physical layer options for FW PHY type Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 21/30] net/ixgbe/base: remove unneeded MAC type check Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 22/30] net/ixgbe/base: remove unused PHY ID Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 23/30] net/ixgbe/base: update FW PHY flow control Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 24/30] net/ixgbe/base: add EEE support for some PHYs Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 25/30] net/ixgbe/base: remove unused enum type Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 26/30] net/ixgbe/base: fix IXGBE LSWFW register Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 27/30] net/ixgbe/base: remove unused EEE code Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 28/30] net/ixgbe/base: add write flush required by Inphi PHY Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 29/30] net/ixgbe/base: report physical layer for SGMII PHY type Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 30/30] net/ixgbe/base: update shared code version to 2016.11.21 Wei Dai
2016-12-21 17:20 ` [dpdk-dev] [PATCH v2 00/30] update ixgbe shared code to version 16.11.21 Ferruh Yigit
2016-12-22 2:35 ` 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=1482313694-31602-14-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).