From: Guinan Sun <guinanx.sun@intel.com>
To: dev@dpdk.org
Cc: Jeff Guo <jia.guo@intel.com>, Zhao1 Wei <wei.zhao1@intel.com>,
Guinan Sun <guinanx.sun@intel.com>
Subject: [dpdk-dev] [PATCH v2 19/20] net/ixgbe/base: cleanup pre-processor tags
Date: Thu, 2 Jul 2020 03:13:28 +0000 [thread overview]
Message-ID: <20200702031329.4495-20-guinanx.sun@intel.com> (raw)
In-Reply-To: <20200702031329.4495-1-guinanx.sun@intel.com>
The codes has been exposed correctly, so remove pre-processor tags.
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
drivers/net/ixgbe/base/ixgbe_common.c | 8 --------
drivers/net/ixgbe/base/ixgbe_phy.h | 2 --
drivers/net/ixgbe/base/ixgbe_type.h | 10 ----------
drivers/net/ixgbe/base/ixgbe_vf.c | 4 ----
drivers/net/ixgbe/base/ixgbe_x550.c | 22 ----------------------
5 files changed, 46 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index bc9584ae0..4cd8894ea 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4274,17 +4274,9 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
break;
case IXGBE_LINKS_SPEED_10_X550EM_A:
*speed = IXGBE_LINK_SPEED_UNKNOWN;
-#ifdef PREBOOT_SUPPORT
- if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)
- *speed = IXGBE_LINK_SPEED_10_FULL;
-#else
if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
*speed = IXGBE_LINK_SPEED_10_FULL;
-#endif /* PREBOOT_SUPPORT */
break;
default:
*speed = IXGBE_LINK_SPEED_UNKNOWN;
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h
index e28c52a7b..ceefbb3e6 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -117,10 +117,8 @@
#define IXGBE_I2C_T_SU_STO 4
#define IXGBE_I2C_T_BUF 5
-#ifndef IXGBE_SFP_DETECT_RETRIES
#define IXGBE_SFP_DETECT_RETRIES 10
-#endif /* IXGBE_SFP_DETECT_RETRIES */
#define IXGBE_TN_LASI_STATUS_REG 0x9005
#define IXGBE_TN_LASI_STATUS_TEMP_ALARM 0x0008
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index c42965611..4e9e81db6 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -2413,9 +2413,7 @@ enum {
#define IXGBE_EEPROM_CTRL_2 1 /* EEPROM CTRL word 2 */
#define IXGBE_EEPROM_CCD_BIT 2
-#ifndef IXGBE_EEPROM_GRANT_ATTEMPTS
#define IXGBE_EEPROM_GRANT_ATTEMPTS 1000 /* EEPROM attempts to gain grant */
-#endif
/* Number of 5 microseconds we wait for EERD read and
* EERW write to complete */
@@ -3145,11 +3143,7 @@ enum ixgbe_fdir_pballoc_type {
/* Host Interface Command Structures */
-#ifdef C99
#pragma pack(push, 1)
-#else
-#pragma pack (1)
-#endif /* C99 */
struct ixgbe_hic_hdr {
u8 cmd;
@@ -3262,11 +3256,7 @@ struct ixgbe_hic_phy_activity_resp {
__be32 data[FW_PHY_ACT_DATA_COUNT];
};
-#ifdef C99
#pragma pack(pop)
-#else
-#pragma pack()
-#endif /* C99 */
/* Transmit Descriptor - Legacy */
struct ixgbe_legacy_tx_desc {
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c
index 2a3e25834..91a5775eb 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_vf.c
@@ -7,12 +7,8 @@
#include "ixgbe_type.h"
#include "ixgbe_vf.h"
-#ifndef IXGBE_VFWRITE_REG
#define IXGBE_VFWRITE_REG IXGBE_WRITE_REG
-#endif
-#ifndef IXGBE_VFREAD_REG
#define IXGBE_VFREAD_REG IXGBE_READ_REG
-#endif
/**
* ixgbe_init_ops_vf - Initialize the pointers for vf
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 05199abb8..8810d1658 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1642,7 +1642,6 @@ STATIC s32 ixgbe_restart_an_internal_phy_x550em(struct ixgbe_hw *hw)
return status;
}
-#ifndef PREBOOT_SUPPORT
/**
* ixgbe_setup_sgmii - Set up link for sgmii
* @hw: pointer to hardware structure
@@ -1712,7 +1711,6 @@ STATIC s32 ixgbe_setup_sgmii(struct ixgbe_hw *hw, ixgbe_link_speed speed,
return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait);
}
-#endif /* PREBOOT_SUPPORT */
/**
* ixgbe_setup_sgmii_fw - Set up link for internal PHY SGMII auto-negotiation
* @hw: pointer to hardware structure
@@ -1837,11 +1835,7 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
case ixgbe_media_type_backplane:
if (hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||
hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)
-#ifdef PREBOOT_SUPPORT
- mac->ops.setup_link = ixgbe_setup_sgmii_fw;
-#else
mac->ops.setup_link = ixgbe_setup_sgmii;
-#endif /* PREBOOT_SUPPORT */
break;
default:
break;
@@ -1900,18 +1894,8 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
*autoneg = false;
break;
case ixgbe_phy_ext_1g_t:
-#ifdef PREBOOT_SUPPORT
- *speed = IXGBE_LINK_SPEED_1GB_FULL;
- break;
-#endif /* PREBOOT_SUPPORT */
case ixgbe_phy_sgmii:
-#ifdef PREBOOT_SUPPORT
- *speed = IXGBE_LINK_SPEED_1GB_FULL |
- IXGBE_LINK_SPEED_100_FULL |
- IXGBE_LINK_SPEED_10_FULL;
-#else
*speed = IXGBE_LINK_SPEED_1GB_FULL;
-#endif /* PREBOOT_SUPPORT */
break;
case ixgbe_phy_x550em_kr:
if (hw->mac.type == ixgbe_mac_X550EM_a) {
@@ -3673,13 +3657,7 @@ u64 ixgbe_get_supported_physical_layer_X550em(struct ixgbe_hw *hw)
physical_layer |= IXGBE_PHYSICAL_LAYER_10BASE_T;
break;
case ixgbe_phy_sgmii:
-#ifdef PREBOOT_SUPPORT
- physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX |
- IXGBE_PHYSICAL_LAYER_100BASE_TX |
- IXGBE_PHYSICAL_LAYER_10BASE_T;
-#else
physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX;
-#endif /* PREBOOT_SUPPORT */
break;
case ixgbe_phy_ext_1g_t:
physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
--
2.17.1
next prev parent reply other threads:[~2020-07-02 3:33 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 3:23 [dpdk-dev] [PATCH 00/21] update ixgbe base code Guinan Sun
2020-06-12 3:23 ` [dpdk-dev] [PATCH 01/21] net/ixgbe/base: clear VFMBMEM and toggle VF's Tx queues Guinan Sun
2020-06-22 11:58 ` Ferruh Yigit
2020-06-30 1:57 ` Sun, GuinanX
2020-06-12 3:23 ` [dpdk-dev] [PATCH 02/21] net/ixgbe/base: change in the condition for response HI Guinan Sun
2020-06-22 11:58 ` Ferruh Yigit
2020-06-29 9:27 ` Yang, Qiming
2020-06-30 2:17 ` Sun, GuinanX
2020-06-12 3:23 ` [dpdk-dev] [PATCH 03/21] net/ixgbe/base: hange flow for "Apply Update" command Guinan Sun
2020-06-22 11:58 ` Ferruh Yigit
2020-06-30 2:24 ` Sun, GuinanX
2020-06-12 3:23 ` [dpdk-dev] [PATCH 04/21] net/ixgbe/base: x550em 10G NIC driver issue Guinan Sun
2020-06-22 11:59 ` Ferruh Yigit
2020-07-01 2:54 ` Sun, GuinanX
2020-06-12 3:23 ` [dpdk-dev] [PATCH 05/21] net/ixgbe/base: added API for NVM update Guinan Sun
2020-06-22 11:59 ` Ferruh Yigit
2020-06-30 2:37 ` Sun, GuinanX
2020-06-12 3:23 ` [dpdk-dev] [PATCH 06/21] net/ixgbe/base: resolve infinite recursion on PCIe link down Guinan Sun
2020-06-12 3:23 ` [dpdk-dev] [PATCH 07/21] net/ixgbe/base: added register definitions for NVM update Guinan Sun
2020-06-12 3:23 ` [dpdk-dev] [PATCH 08/21] net/ixgbe/base: cleanup spelling mistakes in comments Guinan Sun
2020-06-12 3:23 ` [dpdk-dev] [PATCH 09/21] net/ixgbe/base: remove whitespace in function comments Guinan Sun
2020-06-12 3:23 ` [dpdk-dev] [PATCH 10/21] net/ixgbe/base: move increments after evaluations Guinan Sun
2020-06-22 11:59 ` Ferruh Yigit
2020-06-30 2:51 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 11/21] net/ixgbe/base: modify loop accounting for retries Guinan Sun
2020-06-22 11:59 ` Ferruh Yigit
2020-06-30 2:52 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 12/21] net/ixgbe/base: create dedicated func to restart auto nego Guinan Sun
2020-06-22 11:59 ` Ferruh Yigit
2020-06-12 3:24 ` [dpdk-dev] [PATCH 13/21] net/ixgbe/base: modify Klocwork hits for DDK 7.0 Guinan Sun
2020-06-22 12:00 ` Ferruh Yigit
2020-07-01 4:52 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 14/21] net/ixgbe/base: add defines for min rollback revision fields Guinan Sun
2020-06-22 12:00 ` Ferruh Yigit
2020-07-01 5:08 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 15/21] net/ixgbe/base: remove unnecessary log message FC autonego Guinan Sun
2020-06-12 3:24 ` [dpdk-dev] [PATCH 16/21] net/ixgbe/base: initialize data field in struct buffer Guinan Sun
2020-06-12 3:24 ` [dpdk-dev] [PATCH 17/21] net/ixgbe/base: improve log about autonego being disabled Guinan Sun
2020-06-22 12:00 ` Ferruh Yigit
2020-07-01 5:19 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 18/21] net/ixgbe/base: ipv6 Mask for purpose FDIR VLAN Port Feature Guinan Sun
2020-06-22 12:00 ` Ferruh Yigit
2020-07-01 5:21 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 19/21] net/ixgbe/base: remove default advertising for 2.5G and 5G Guinan Sun
2020-06-22 12:00 ` Ferruh Yigit
2020-07-01 6:24 ` Sun, GuinanX
2020-06-12 3:24 ` [dpdk-dev] [PATCH 20/21] net/ixgbe/base: check Host Interface Return Status Guinan Sun
2020-06-12 3:24 ` [dpdk-dev] [PATCH 21/21] net/ixgbe/base: update version Guinan Sun
2020-06-22 12:01 ` Ferruh Yigit
2020-07-01 6:27 ` Sun, GuinanX
2020-06-15 5:47 ` [dpdk-dev] [PATCH 00/21] update ixgbe base code Zhao1, Wei
2020-06-15 5:59 ` Sun, GuinanX
2020-06-22 2:42 ` Zhao1, Wei
2020-06-22 3:50 ` Zhang, Qi Z
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 00/20] " Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 01/20] net/ixgbe/base: toggle VF's Tx queues Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 02/20] net/ixgbe/base: add support to clear VFMBMEM Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 03/20] net/ixgbe/base: fix host interface shadow RAM read Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 04/20] net/ixgbe/base: change flow for "Apply Update" command Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 05/20] net/ixgbe/base: fix x550em 10G NIC link status report Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 06/20] net/ixgbe/base: resolve infinite recursion on PCIe link down Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 07/20] net/ixgbe/base: added register definitions for NVM update Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 08/20] net/ixgbe/base: cleanup spelling mistakes in comments Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 09/20] net/ixgbe/base: remove whitespace in function comments Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 10/20] net/ixgbe/base: move increments after evaluations Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 11/20] net/ixgbe/base: create dedicated func to restart auto nego Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 12/20] net/ixgbe/base: modify coding style Guinan Sun
2020-07-08 15:26 ` Ferruh Yigit
2020-07-09 7:58 ` Sun, GuinanX
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 13/20] net/ixgbe/base: remove unnecessary log message FC autonego Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 14/20] net/ixgbe/base: initialize data field in struct buffer Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 15/20] net/ixgbe/base: improve log about autonego being disabled Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 16/20] net/ixgbe/base: add ipv6 mask for FDIR feature Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 17/20] net/ixgbe/base: remove default advertising for x550 2.5G/5G Guinan Sun
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 18/20] net/ixgbe/base: check host interface return status Guinan Sun
2020-07-02 3:13 ` Guinan Sun [this message]
2020-07-02 3:13 ` [dpdk-dev] [PATCH v2 20/20] net/ixgbe/base: update version Guinan Sun
2020-07-08 0:50 ` [dpdk-dev] [PATCH v2 00/20] update ixgbe base code Zhang, Qi Z
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 00/19] " Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 01/19] net/ixgbe/base: fix host interface shadow RAM read Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 02/19] net/ixgbe/base: change flow for "Apply Update" command Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 03/19] net/ixgbe/base: fix x550em 10G NIC link status report Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 04/19] net/ixgbe/base: resolve infinite recursion on PCIe link down Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 05/19] net/ixgbe/base: added register definitions for NVM update Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 06/19] net/ixgbe/base: cleanup spelling mistakes in comments Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 07/19] net/ixgbe/base: remove whitespace in function comments Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 08/19] net/ixgbe/base: move increments after evaluations Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 09/19] net/ixgbe/base: create dedicated func to restart auto nego Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 10/19] net/ixgbe/base: add typecast for type mismatch Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 11/19] net/ixgbe/base: remove unnecessary return value check Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 12/19] net/ixgbe/base: remove unnecessary log message FC autonego Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 13/19] net/ixgbe/base: initialize data field in struct buffer Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 14/19] net/ixgbe/base: improve log about autonego being disabled Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 15/19] net/ixgbe/base: add ipv6 mask for FDIR feature Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 16/19] net/ixgbe/base: remove default advertising for x550 2.5G/5G Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 17/19] net/ixgbe/base: check host interface return status Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 18/19] net/ixgbe/base: cleanup pre-processor tags Guinan Sun
2020-07-09 8:00 ` [dpdk-dev] [PATCH v3 19/19] net/ixgbe/base: update version Guinan Sun
2020-07-09 10:46 ` [dpdk-dev] [PATCH v3 00/19] update ixgbe base code Zhang, Qi Z
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=20200702031329.4495-20-guinanx.sun@intel.com \
--to=guinanx.sun@intel.com \
--cc=dev@dpdk.org \
--cc=jia.guo@intel.com \
--cc=wei.zhao1@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).