Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/13767/?format=api
{ "id": 13767, "url": "https://patches.dpdk.org/api/patches/13767/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1465977220-3970-7-git-send-email-beilei.xing@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": "<1465977220-3970-7-git-send-email-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1465977220-3970-7-git-send-email-beilei.xing@intel.com", "date": "2016-06-15T07:53:16", "name": "[dpdk-dev,v3,06/30] ixgbe/base: refactor eee setup for X550", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "992287d3b2ab17bd30e8b78439ae3677793dc622", "submitter": { "id": 410, "url": "https://patches.dpdk.org/api/people/410/?format=api", "name": "Xing, Beilei", "email": "beilei.xing@intel.com" }, "delegate": { "id": 10, "url": "https://patches.dpdk.org/api/users/10/?format=api", "username": "bruce", "first_name": "Bruce", "last_name": "Richardson", "email": "bruce.richardson@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1465977220-3970-7-git-send-email-beilei.xing@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/13767/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/13767/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 947B4B45C;\n\tWed, 15 Jun 2016 09:54:14 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id E3C39B436\n\tfor <dev@dpdk.org>; Wed, 15 Jun 2016 09:54:09 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga101.jf.intel.com with ESMTP; 15 Jun 2016 00:54:09 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 15 Jun 2016 00:54:07 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id u5F7rwgn014245;\n\tWed, 15 Jun 2016 15:53:58 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid u5F7rtwn004047; Wed, 15 Jun 2016 15:53:57 +0800", "(from beileixi@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u5F7rtsg004043; \n\tWed, 15 Jun 2016 15:53:55 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.26,475,1459839600\"; d=\"scan'208\";a=\"987792196\"", "From": "Beilei Xing <beilei.xing@intel.com>", "To": "wenzhuo.lu@intel.com", "Cc": "dev@dpdk.org, Beilei Xing <beilei.xing@intel.com>", "Date": "Wed, 15 Jun 2016 15:53:16 +0800", "Message-Id": "<1465977220-3970-7-git-send-email-beilei.xing@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1465977220-3970-1-git-send-email-beilei.xing@intel.com>", "References": "<1465887596-10346-1-git-send-email-beilei.xing@intel.com>\n\t<1465977220-3970-1-git-send-email-beilei.xing@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 06/30] ixgbe/base: refactor eee setup for X550", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Break ixgbe_setup_eee_X550 down to better handle a change from if\nstatements to switch statements needed to add X550em_a KR support.\n\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\n---\n drivers/net/ixgbe/base/ixgbe_x550.c | 174 ++++++++++++++++++++++--------------\n 1 file changed, 105 insertions(+), 69 deletions(-)", "diff": "diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c\nindex 36df3c3..78672a6 100644\n--- a/drivers/net/ixgbe/base/ixgbe_x550.c\n+++ b/drivers/net/ixgbe/base/ixgbe_x550.c\n@@ -751,6 +751,99 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)\n }\n \n /**\n+ * ixgbe_enable_eee_x550 - Enable EEE support\n+ * @hw: pointer to hardware structure\n+ */\n+static s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)\n+{\n+\tu16 autoneg_eee_reg;\n+\tu32 link_reg;\n+\ts32 status;\n+\n+\tif (hw->mac.type == ixgbe_mac_X550) {\n+\t\t/* Advertise EEE capability */\n+\t\thw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n+\t\t\t\t IXGBE_MDIO_AUTO_NEG_DEV_TYPE,\n+\t\t\t\t &autoneg_eee_reg);\n+\n+\t\tautoneg_eee_reg |= (IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |\n+\t\t\t\t IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |\n+\t\t\t\t IXGBE_AUTO_NEG_100BASE_EEE_ADVT);\n+\n+\t\thw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n+\t\t\t\t IXGBE_MDIO_AUTO_NEG_DEV_TYPE,\n+\t\t\t\t autoneg_eee_reg);\n+\t} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {\n+\n+\t\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n+\t\t\t\t IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\t IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);\n+\t\tif (status != IXGBE_SUCCESS)\n+\t\t\treturn status;\n+\n+\t\tlink_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |\n+\t\t\tIXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;\n+\n+\t\t/* Don't advertise FEC capability when EEE enabled. */\n+\t\tlink_reg &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;\n+\n+\t\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n+\t\t\t\t IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\t IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);\n+\t\tif (status != IXGBE_SUCCESS)\n+\t\t\treturn status;\n+\t}\n+\n+\treturn IXGBE_SUCCESS;\n+}\n+\n+/**\n+ * ixgbe_disable_eee_x550 - Disable EEE support\n+ * @hw: pointer to hardware structure\n+ */\n+static s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)\n+{\n+\tu16 autoneg_eee_reg;\n+\tu32 link_reg;\n+\ts32 status;\n+\n+\tif (hw->mac.type == ixgbe_mac_X550) {\n+\t\t/* Disable advertised EEE capability */\n+\t\thw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n+\t\t\t\t IXGBE_MDIO_AUTO_NEG_DEV_TYPE,\n+\t\t\t\t &autoneg_eee_reg);\n+\n+\t\tautoneg_eee_reg &= ~(IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |\n+\t\t\t\t IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |\n+\t\t\t\t IXGBE_AUTO_NEG_100BASE_EEE_ADVT);\n+\n+\t\thw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n+\t\t\t\t IXGBE_MDIO_AUTO_NEG_DEV_TYPE,\n+\t\t\t\t autoneg_eee_reg);\n+\t} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {\n+\t\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n+\t\t\t\t IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\t IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);\n+\t\tif (status != IXGBE_SUCCESS)\n+\t\t\treturn status;\n+\n+\t\tlink_reg &= ~(IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |\n+\t\t\t IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX);\n+\n+\t\t/* Advertise FEC capability when EEE is disabled. */\n+\t\tlink_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;\n+\n+\t\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n+\t\t\t\t IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\t IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);\n+\t\tif (status != IXGBE_SUCCESS)\n+\t\t\treturn status;\n+\t}\n+\n+\treturn IXGBE_SUCCESS;\n+}\n+\n+/**\n * ixgbe_setup_eee_X550 - Enable/disable EEE support\n * @hw: pointer to the HW structure\n * @enable_eee: boolean flag to enable EEE\n@@ -762,10 +855,8 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)\n **/\n s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)\n {\n-\tu32 eeer;\n-\tu16 autoneg_eee_reg;\n-\tu32 link_reg;\n \ts32 status;\n+\tu32 eeer;\n \n \tDEBUGFUNC(\"ixgbe_setup_eee_X550\");\n \n@@ -774,75 +865,20 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)\n \tif (enable_eee) {\n \t\teeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);\n \n-\t\tif (hw->mac.type == ixgbe_mac_X550) {\n-\t\t\t/* Advertise EEE capability */\n-\t\t\thw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n-\t\t\t\tIXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_eee_reg);\n-\n-\t\t\tautoneg_eee_reg |= (IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |\n-\t\t\t\tIXGBE_AUTO_NEG_1000BASE_EEE_ADVT |\n-\t\t\t\tIXGBE_AUTO_NEG_100BASE_EEE_ADVT);\n-\n-\t\t\thw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n-\t\t\t\tIXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_eee_reg);\n-\t\t} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {\n-\t\t\t/* Not supported on first revision of X550EM_x. */\n-\t\t\tif ((hw->mac.type == ixgbe_mac_X550EM_x) &&\n-\t\t\t !(IXGBE_FUSES0_REV_MASK &\n-\t\t\t IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))\n-\t\t\t\treturn IXGBE_SUCCESS;\n-\n-\t\t\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n-\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);\n-\t\t\tif (status != IXGBE_SUCCESS)\n-\t\t\t\treturn status;\n-\n-\t\t\tlink_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |\n-\t\t\t\t IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;\n-\n-\t\t\t/* Don't advertise FEC capability when EEE enabled. */\n-\t\t\tlink_reg &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;\n-\n-\t\t\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n-\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);\n-\t\t\tif (status != IXGBE_SUCCESS)\n-\t\t\t\treturn status;\n-\t\t}\n+\t\t/* Not supported on first revision of X550EM_x. */\n+\t\tif ((hw->mac.type == ixgbe_mac_X550EM_x) &&\n+\t\t !(IXGBE_FUSES0_REV_MASK &\n+\t\t IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))\n+\t\t\treturn IXGBE_SUCCESS;\n+\t\tstatus = ixgbe_enable_eee_x550(hw);\n+\t\tif (status)\n+\t\t\treturn status;\n \t} else {\n \t\teeer &= ~(IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);\n \n-\t\tif (hw->mac.type == ixgbe_mac_X550) {\n-\t\t\t/* Disable advertised EEE capability */\n-\t\t\thw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n-\t\t\t\tIXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_eee_reg);\n-\n-\t\t\tautoneg_eee_reg &= ~(IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |\n-\t\t\t\tIXGBE_AUTO_NEG_1000BASE_EEE_ADVT |\n-\t\t\t\tIXGBE_AUTO_NEG_100BASE_EEE_ADVT);\n-\n-\t\t\thw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,\n-\t\t\t\tIXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_eee_reg);\n-\t\t} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {\n-\t\t\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n-\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);\n-\t\t\tif (status != IXGBE_SUCCESS)\n-\t\t\t\treturn status;\n-\n-\t\t\tlink_reg &= ~(IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX);\n-\n-\t\t\t/* Advertise FEC capability when EEE is disabled. */\n-\t\t\tlink_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;\n-\n-\t\t\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n-\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);\n-\t\t\tif (status != IXGBE_SUCCESS)\n-\t\t\t\treturn status;\n-\t\t}\n+\t\tstatus = ixgbe_disable_eee_x550(hw);\n+\t\tif (status)\n+\t\t\treturn status;\n \t}\n \tIXGBE_WRITE_REG(hw, IXGBE_EEER, eeer);\n \n", "prefixes": [ "dpdk-dev", "v3", "06/30" ] }