Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73614/?format=api
https://patches.dpdk.org/api/patches/73614/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200709080046.65879-19-guinanx.sun@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200709080046.65879-19-guinanx.sun@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200709080046.65879-19-guinanx.sun@intel.com", "date": "2020-07-09T08:00:45", "name": "[v3,18/19] net/ixgbe/base: cleanup pre-processor tags", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "10991747805a84d56b8c40170214583d84a08105", "submitter": { "id": 1476, "url": "https://patches.dpdk.org/api/people/1476/?format=api", "name": "Guinan Sun", "email": "guinanx.sun@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200709080046.65879-19-guinanx.sun@intel.com/mbox/", "series": [ { "id": 10915, "url": "https://patches.dpdk.org/api/series/10915/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10915", "date": "2020-07-09T08:00:27", "name": "update ixgbe base code", "version": 3, "mbox": "https://patches.dpdk.org/series/10915/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/73614/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/73614/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 6CAE2A0526;\n\tThu, 9 Jul 2020 10:17:19 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5C6791DEE0;\n\tThu, 9 Jul 2020 10:14:44 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by dpdk.org (Postfix) with ESMTP id 68E4F1DA9C\n for <dev@dpdk.org>; Thu, 9 Jul 2020 10:14:31 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Jul 2020 01:14:30 -0700", "from intel.sh.intel.com ([10.239.255.18])\n by orsmga002.jf.intel.com with ESMTP; 09 Jul 2020 01:14:28 -0700" ], "IronPort-SDR": [ "\n Lp0gywseXaJkWLTbSpyEq2xqLW+kuayBOnLORpR96XsM+wBF8+3D0JJnwl0zlG+uqjmRf6rMMj\n YoxgwLgVCzcg==", "\n P3kGLAptDY0tZ+6kq1D4weUP0E54Pta2ovuu9d3OfKVv6/s+MxeZpOIOaUmuqCUXKNwlLeceOR\n qP02YXAIwgGA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9676\"; a=\"145449388\"", "E=Sophos;i=\"5.75,331,1589266800\"; d=\"scan'208\";a=\"145449388\"", "E=Sophos;i=\"5.75,331,1589266800\"; d=\"scan'208\";a=\"297989374\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Guinan Sun <guinanx.sun@intel.com>", "To": "dev@dpdk.org", "Cc": "Jeff Guo <jia.guo@intel.com>, Zhao1 Wei <wei.zhao1@intel.com>,\n Guinan Sun <guinanx.sun@intel.com>", "Date": "Thu, 9 Jul 2020 08:00:45 +0000", "Message-Id": "<20200709080046.65879-19-guinanx.sun@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200709080046.65879-1-guinanx.sun@intel.com>", "References": "<20200702031329.4495-1-guinanx.sun@intel.com>\n <20200709080046.65879-1-guinanx.sun@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 18/19] net/ixgbe/base: cleanup pre-processor\n\ttags", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The codes has been exposed correctly, so remove pre-processor tags.\n\nSigned-off-by: Guinan Sun <guinanx.sun@intel.com>\nReviewed-by: Wei Zhao <wei.zhao1@intel.com>\n---\n drivers/net/ixgbe/base/ixgbe_common.c | 8 --------\n drivers/net/ixgbe/base/ixgbe_phy.h | 2 --\n drivers/net/ixgbe/base/ixgbe_type.h | 10 ----------\n drivers/net/ixgbe/base/ixgbe_vf.c | 4 ----\n drivers/net/ixgbe/base/ixgbe_x550.c | 22 ----------------------\n 5 files changed, 46 deletions(-)", "diff": "diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c\nindex ca8ec907e..14e54a8bc 100644\n--- a/drivers/net/ixgbe/base/ixgbe_common.c\n+++ b/drivers/net/ixgbe/base/ixgbe_common.c\n@@ -4218,17 +4218,9 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,\n \t\tbreak;\n \tcase IXGBE_LINKS_SPEED_10_X550EM_A:\n \t\t*speed = IXGBE_LINK_SPEED_UNKNOWN;\n-#ifdef PREBOOT_SUPPORT\n-\t\tif (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||\n-\t\t hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L ||\n-\t\t hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||\n-\t\t hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)\n-\t\t\t*speed = IXGBE_LINK_SPEED_10_FULL;\n-#else\n \t\tif (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||\n \t\t hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)\n \t\t\t*speed = IXGBE_LINK_SPEED_10_FULL;\n-#endif /* PREBOOT_SUPPORT */\n \t\tbreak;\n \tdefault:\n \t\t*speed = IXGBE_LINK_SPEED_UNKNOWN;\ndiff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h\nindex e28c52a7b..ceefbb3e6 100644\n--- a/drivers/net/ixgbe/base/ixgbe_phy.h\n+++ b/drivers/net/ixgbe/base/ixgbe_phy.h\n@@ -117,10 +117,8 @@\n #define IXGBE_I2C_T_SU_STO\t4\n #define IXGBE_I2C_T_BUF\t\t5\n \n-#ifndef IXGBE_SFP_DETECT_RETRIES\n #define IXGBE_SFP_DETECT_RETRIES\t10\n \n-#endif /* IXGBE_SFP_DETECT_RETRIES */\n #define IXGBE_TN_LASI_STATUS_REG\t0x9005\n #define IXGBE_TN_LASI_STATUS_TEMP_ALARM\t0x0008\n \ndiff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h\nindex 51cdff39d..b7eec4563 100644\n--- a/drivers/net/ixgbe/base/ixgbe_type.h\n+++ b/drivers/net/ixgbe/base/ixgbe_type.h\n@@ -2413,9 +2413,7 @@ enum {\n #define IXGBE_EEPROM_CTRL_2\t\t1 /* EEPROM CTRL word 2 */\n #define IXGBE_EEPROM_CCD_BIT\t\t2\n \n-#ifndef IXGBE_EEPROM_GRANT_ATTEMPTS\n #define IXGBE_EEPROM_GRANT_ATTEMPTS\t1000 /* EEPROM attempts to gain grant */\n-#endif\n \n /* Number of 5 microseconds we wait for EERD read and\n * EERW write to complete */\n@@ -3145,11 +3143,7 @@ enum ixgbe_fdir_pballoc_type {\n \n /* Host Interface Command Structures */\n \n-#ifdef C99\n #pragma pack(push, 1)\n-#else\n-#pragma pack (1)\n-#endif /* C99 */\n \n struct ixgbe_hic_hdr {\n \tu8 cmd;\n@@ -3262,11 +3256,7 @@ struct ixgbe_hic_phy_activity_resp {\n \t__be32 data[FW_PHY_ACT_DATA_COUNT];\n };\n \n-#ifdef C99\n #pragma pack(pop)\n-#else\n-#pragma pack()\n-#endif /* C99 */\n \n /* Transmit Descriptor - Legacy */\n struct ixgbe_legacy_tx_desc {\ndiff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c\nindex 2a3e25834..91a5775eb 100644\n--- a/drivers/net/ixgbe/base/ixgbe_vf.c\n+++ b/drivers/net/ixgbe/base/ixgbe_vf.c\n@@ -7,12 +7,8 @@\n #include \"ixgbe_type.h\"\n #include \"ixgbe_vf.h\"\n \n-#ifndef IXGBE_VFWRITE_REG\n #define IXGBE_VFWRITE_REG IXGBE_WRITE_REG\n-#endif\n-#ifndef IXGBE_VFREAD_REG\n #define IXGBE_VFREAD_REG IXGBE_READ_REG\n-#endif\n \n /**\n * ixgbe_init_ops_vf - Initialize the pointers for vf\ndiff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c\nindex 05199abb8..8810d1658 100644\n--- a/drivers/net/ixgbe/base/ixgbe_x550.c\n+++ b/drivers/net/ixgbe/base/ixgbe_x550.c\n@@ -1642,7 +1642,6 @@ STATIC s32 ixgbe_restart_an_internal_phy_x550em(struct ixgbe_hw *hw)\n \treturn status;\n }\n \n-#ifndef PREBOOT_SUPPORT\n /**\n * ixgbe_setup_sgmii - Set up link for sgmii\n * @hw: pointer to hardware structure\n@@ -1712,7 +1711,6 @@ STATIC s32 ixgbe_setup_sgmii(struct ixgbe_hw *hw, ixgbe_link_speed speed,\n \treturn hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait);\n }\n \n-#endif /* PREBOOT_SUPPORT */\n /**\n * ixgbe_setup_sgmii_fw - Set up link for internal PHY SGMII auto-negotiation\n * @hw: pointer to hardware structure\n@@ -1837,11 +1835,7 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)\n \tcase ixgbe_media_type_backplane:\n \t\tif (hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||\n \t\t hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)\n-#ifdef PREBOOT_SUPPORT\n-\t\t\tmac->ops.setup_link = ixgbe_setup_sgmii_fw;\n-#else\n \t\t\tmac->ops.setup_link = ixgbe_setup_sgmii;\n-#endif /* PREBOOT_SUPPORT */\n \t\tbreak;\n \tdefault:\n \t\tbreak;\n@@ -1900,18 +1894,8 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,\n \t\t\t*autoneg = false;\n \t\t\tbreak;\n \t\tcase ixgbe_phy_ext_1g_t:\n-#ifdef PREBOOT_SUPPORT\n-\t\t\t*speed = IXGBE_LINK_SPEED_1GB_FULL;\n-\t\t\tbreak;\n-#endif /* PREBOOT_SUPPORT */\n \t\tcase ixgbe_phy_sgmii:\n-#ifdef PREBOOT_SUPPORT\n-\t\t\t*speed = IXGBE_LINK_SPEED_1GB_FULL |\n-\t\t\t\t IXGBE_LINK_SPEED_100_FULL |\n-\t\t\t\t IXGBE_LINK_SPEED_10_FULL;\n-#else\n \t\t\t*speed = IXGBE_LINK_SPEED_1GB_FULL;\n-#endif /* PREBOOT_SUPPORT */\n \t\t\tbreak;\n \t\tcase ixgbe_phy_x550em_kr:\n \t\t\tif (hw->mac.type == ixgbe_mac_X550EM_a) {\n@@ -3673,13 +3657,7 @@ u64 ixgbe_get_supported_physical_layer_X550em(struct ixgbe_hw *hw)\n \t\t\tphysical_layer |= IXGBE_PHYSICAL_LAYER_10BASE_T;\n \t\tbreak;\n \tcase ixgbe_phy_sgmii:\n-#ifdef PREBOOT_SUPPORT\n-\t\tphysical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX |\n-\t\t\t\t IXGBE_PHYSICAL_LAYER_100BASE_TX |\n-\t\t\t\t IXGBE_PHYSICAL_LAYER_10BASE_T;\n-#else\n \t\tphysical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX;\n-#endif /* PREBOOT_SUPPORT */\n \t\tbreak;\n \tcase ixgbe_phy_ext_1g_t:\n \t\tphysical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;\n", "prefixes": [ "v3", "18/19" ] }{ "id": 73614, "url": "