Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/3202/?format=api
{ "id": 3202, "url": "https://patches.dpdk.org/api/patches/3202/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1423742468-30404-13-git-send-email-changchun.ouyang@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": "<1423742468-30404-13-git-send-email-changchun.ouyang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1423742468-30404-13-git-send-email-changchun.ouyang@intel.com", "date": "2015-02-12T12:00:44", "name": "[dpdk-dev,12/36] ixgbe base codes: Refine struct for physical information", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e3e8b09a90a6230bf10cb87b78e3ae7a0bc21c0f", "submitter": { "id": 31, "url": "https://patches.dpdk.org/api/people/31/?format=api", "name": "Ouyang Changchun", "email": "changchun.ouyang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1423742468-30404-13-git-send-email-changchun.ouyang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/3202/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/3202/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 CED209ACA;\n\tThu, 12 Feb 2015 13:01:46 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id F3F409AC5\n\tfor <dev@dpdk.org>; Thu, 12 Feb 2015 13:01:44 +0100 (CET)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP; 12 Feb 2015 04:01:43 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga002.fm.intel.com with ESMTP; 12 Feb 2015 04:01:42 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t1CC1dRO006921;\n\tThu, 12 Feb 2015 20:01:39 +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 t1CC1aAw030522; Thu, 12 Feb 2015 20:01:38 +0800", "(from couyang@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t1CC1a9n030518; \n\tThu, 12 Feb 2015 20:01:36 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.09,565,1418112000\"; d=\"scan'208\";a=\"676887139\"", "From": "Ouyang Changchun <changchun.ouyang@intel.com>", "To": "dev@dpdk.org", "Date": "Thu, 12 Feb 2015 20:00:44 +0800", "Message-Id": "<1423742468-30404-13-git-send-email-changchun.ouyang@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1423742468-30404-1-git-send-email-changchun.ouyang@intel.com>", "References": "<1423742468-30404-1-git-send-email-changchun.ouyang@intel.com>", "Subject": "[dpdk-dev] [PATCH 12/36] ixgbe base codes: Refine struct for\n\tphysical information", "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": "Remove lan_id from struct ixgbe_phy_info.\n\nSigned-off-by: Changchun Ouyang <changchun.ouyang@intel.com>\n---\n lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c | 4 +-\n lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h | 1 -\n lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c | 2 +-\n lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c | 66 ++++++++++++++++-----------------\n 4 files changed, 34 insertions(+), 39 deletions(-)", "diff": "diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c\nindex a1144d4..b19ef38 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c\n@@ -283,9 +283,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)\n \tDEBUGFUNC(\"ixgbe_identify_phy_generic\");\n \n \tif (!hw->phy.phy_semaphore_mask) {\n-\t\thw->phy.lan_id = IXGBE_READ_REG(hw, IXGBE_STATUS) &\n-\t\t\t\t\t\tIXGBE_STATUS_LAN_ID_1;\n-\t\tif (hw->phy.lan_id)\n+\t\tif (hw->bus.lan_id)\n \t\t\thw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY1_SM;\n \t\telse\n \t\t\thw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM;\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h\nindex cac6387..23e45c2 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h\n+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h\n@@ -3600,7 +3600,6 @@ struct ixgbe_phy_info {\n \tu32 revision;\n \tenum ixgbe_media_type media_type;\n \tu32 phy_semaphore_mask;\n-\tu8 lan_id;\n \tbool reset_disable;\n \tixgbe_autoneg_advertised autoneg_advertised;\n \tenum ixgbe_smart_speed smart_speed;\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c\nindex c2d685f..6e8835d 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c\n@@ -747,7 +747,7 @@ STATIC void ixgbe_set_mux(struct ixgbe_hw *hw, u8 state)\n {\n \tu32 esdp;\n \n-\tif (!hw->phy.lan_id)\n+\tif (!hw->bus.lan_id)\n \t\treturn;\n \tesdp = IXGBE_READ_REG(hw, IXGBE_ESDP);\n \tif (state)\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c\nindex 3c76c3d..45315ec 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c\n@@ -94,10 +94,8 @@ STATIC s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)\n \tswitch (hw->device_id) {\n \tcase IXGBE_DEV_ID_X550EM_X_SFP:\n \t\t/* set up for CS4227 usage */\n-\t\thw->phy.lan_id = IXGBE_READ_REG(hw, IXGBE_STATUS) &\n-\t\t\t\t IXGBE_STATUS_LAN_ID_1;\n \t\thw->phy.phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;\n-\t\tif (hw->phy.lan_id) {\n+\t\tif (hw->bus.lan_id) {\n \n \t\t\tesdp &= ~(IXGBE_ESDP_SDP1_NATIVE | IXGBE_ESDP_SDP1);\n \t\t\tesdp |= IXGBE_ESDP_SDP1_DIR;\n@@ -407,7 +405,7 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)\n \t\t} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR ||\n \t\t\t hw->device_id == IXGBE_DEV_ID_X550EM_X) {\n \t\t\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\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@@ -416,7 +414,7 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)\n \t\t\t\t IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;\n \n \t\t\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\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@@ -438,7 +436,7 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)\n \t\t} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR ||\n \t\t\t hw->device_id == IXGBE_DEV_ID_X550EM_X) {\n \t\t\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\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@@ -447,7 +445,7 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)\n \t\t\t\tIXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX);\n \n \t\t\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\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@@ -822,7 +820,7 @@ s32 ixgbe_setup_sfp_modules_X550em(struct ixgbe_hw *hw)\n \t/* The CS4227 slice address is the base address + the port-pair reg\n \t * offset. I.e. Slice 0 = 0x12B0 and slice 1 = 0x22B0.\n \t */\n-\treg_slice = IXGBE_CS4227_SPARE24_LSB + (hw->phy.lan_id << 12);\n+\treg_slice = IXGBE_CS4227_SPARE24_LSB + (hw->bus.lan_id << 12);\n \n \tif (setup_linear)\n \t\tedc_mode = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;\n@@ -914,10 +912,9 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)\n \n \tif (hw->device_id == IXGBE_DEV_ID_X550EM_X_SFP) {\n \t\tesdp = IXGBE_READ_REG(hw, IXGBE_ESDP);\n-\t\tphy->lan_id = IXGBE_READ_REG(hw, IXGBE_STATUS) &\n-\t\t\t IXGBE_STATUS_LAN_ID_1;\n \t\tphy->phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;\n-\t\tif (phy->lan_id) {\n+\n+\t\tif (hw->bus.lan_id) {\n \t\t\tesdp &= ~(IXGBE_ESDP_SDP1_NATIVE | IXGBE_ESDP_SDP1);\n \t\t\tesdp |= IXGBE_ESDP_SDP1_DIR;\n \t\t}\n@@ -1059,7 +1056,7 @@ s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)\n \tu32 reg_val;\n \n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status)\n \t\treturn status;\n@@ -1081,7 +1078,7 @@ s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)\n \t/* Restart auto-negotiation. */\n \treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \n \treturn status;\n@@ -1100,35 +1097,36 @@ s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw)\n \n \t/* Disable AN and force speed to 10G Serial. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n+\n \treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;\n \treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;\n \treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Disable training protocol FSM. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \treg_val |= IXGBE_KRM_RX_TRN_LINKUP_CTRL_CONV_WO_PROTOCOL;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Disable Flex from training TXFFE. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_4(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_4(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n@@ -1136,12 +1134,12 @@ s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw)\n \treg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CP1_CN1_EN;\n \treg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CO_ADAPT_EN;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_4(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_4(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_5(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_5(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n@@ -1149,14 +1147,14 @@ s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw)\n \treg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CP1_CN1_EN;\n \treg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CO_ADAPT_EN;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_5(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_DSP_TXFFE_STATE_5(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Enable override for coefficients. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_TX_COEFF_CTRL_1(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_TX_COEFF_CTRL_1(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n@@ -1165,20 +1163,20 @@ s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw)\n \treg_val |= IXGBE_KRM_TX_COEFF_CTRL_1_CPLUS1_OVRRD_EN;\n \treg_val |= IXGBE_KRM_TX_COEFF_CTRL_1_CMINUS1_OVRRD_EN;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_TX_COEFF_CTRL_1(hw->phy.lan_id),\n+\t\t\t\tIXGBE_KRM_TX_COEFF_CTRL_1(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Toggle port SW reset by AN reset. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \n \treturn status;\n@@ -1197,7 +1195,7 @@ s32 ixgbe_setup_phy_loopback_x550em(struct ixgbe_hw *hw)\n \n \t/* Disable AN and force speed to 10G Serial. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n@@ -1205,47 +1203,47 @@ s32 ixgbe_setup_phy_loopback_x550em(struct ixgbe_hw *hw)\n \treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;\n \treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_LINK_CTRL_1(hw->phy.lan_id),\n+\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Set near-end loopback clocks. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_PORT_CAR_GEN_CTRL(hw->phy.lan_id),\n+\t\tIXGBE_KRM_PORT_CAR_GEN_CTRL(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \treg_val |= IXGBE_KRM_PORT_CAR_GEN_CTRL_NELB_32B;\n \treg_val |= IXGBE_KRM_PORT_CAR_GEN_CTRL_NELB_KRPCS;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_PORT_CAR_GEN_CTRL(hw->phy.lan_id),\n+\t\tIXGBE_KRM_PORT_CAR_GEN_CTRL(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Set loopback enable. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_PMD_DFX_BURNIN(hw->phy.lan_id),\n+\t\tIXGBE_KRM_PMD_DFX_BURNIN(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \treg_val |= IXGBE_KRM_PMD_DFX_BURNIN_TX_RX_KR_LB_MASK;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_PMD_DFX_BURNIN(hw->phy.lan_id),\n+\t\tIXGBE_KRM_PMD_DFX_BURNIN(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \n \t/* Training bypass. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->phy.lan_id),\n+\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n \tif (status != IXGBE_SUCCESS)\n \t\treturn status;\n \treg_val |= IXGBE_KRM_RX_TRN_LINKUP_CTRL_PROTOCOL_BYPASS;\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->phy.lan_id),\n+\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),\n \t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \n \treturn status;\n@@ -1798,7 +1796,7 @@ void ixgbe_disable_rx_x550(struct ixgbe_hw *hw)\n \t\tfw_cmd.hdr.cmd = FW_DISABLE_RXEN_CMD;\n \t\tfw_cmd.hdr.buf_len = FW_DISABLE_RXEN_LEN;\n \t\tfw_cmd.hdr.checksum = FW_DEFAULT_CHECKSUM;\n-\t\tfw_cmd.port_number = hw->phy.lan_id;\n+\t\tfw_cmd.port_number = (u8)hw->bus.lan_id;\n \n \t\tstatus = ixgbe_host_interface_command(hw, (u32 *)&fw_cmd,\n \t\t\t\t\tsizeof(struct ixgbe_hic_disable_rxen),\n", "prefixes": [ "dpdk-dev", "12/36" ] }