Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/7620/?format=api
{ "id": 7620, "url": "https://patches.dpdk.org/api/patches/7620/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1444874628-5453-15-git-send-email-wenzhuo.lu@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": "<1444874628-5453-15-git-send-email-wenzhuo.lu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1444874628-5453-15-git-send-email-wenzhuo.lu@intel.com", "date": "2015-10-15T02:03:27", "name": "[dpdk-dev,v2,14/35] e1000/base: add EEARBC_I210 for i210", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6d0b12063d2cccb53e1f7c655dafcce545b5dd7f", "submitter": { "id": 258, "url": "https://patches.dpdk.org/api/people/258/?format=api", "name": "Wenzhuo Lu", "email": "wenzhuo.lu@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1444874628-5453-15-git-send-email-wenzhuo.lu@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/7620/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/7620/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 E522791D7;\n\tThu, 15 Oct 2015 04:04:33 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id CD7DC91B4\n\tfor <dev@dpdk.org>; Thu, 15 Oct 2015 04:04:28 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga103.fm.intel.com with ESMTP; 14 Oct 2015 19:04:27 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga002.fm.intel.com with ESMTP; 14 Oct 2015 19:04:26 -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 t9F24Pdb004840;\n\tThu, 15 Oct 2015 10:04:25 +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 t9F24MZa005865; Thu, 15 Oct 2015 10:04:24 +0800", "(from wenzhuol@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9F24L2h005861; \n\tThu, 15 Oct 2015 10:04:21 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.17,683,1437462000\"; d=\"scan'208\";a=\"827238961\"", "From": "Wenzhuo Lu <wenzhuo.lu@intel.com>", "To": "dev@dpdk.org", "Date": "Thu, 15 Oct 2015 10:03:27 +0800", "Message-Id": "<1444874628-5453-15-git-send-email-wenzhuo.lu@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1444874628-5453-1-git-send-email-wenzhuo.lu@intel.com>", "References": "<1444804479-14840-1-git-send-email-wenzhuo.lu@intel.com>\n\t<1444874628-5453-1-git-send-email-wenzhuo.lu@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 14/35] e1000/base: add EEARBC_I210 for i210", "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": "EEARBC has changed on i210. It means EEARBC has a different address on\ni210 than on other NICs. So, add a new entity named EEARBC_I210 to the\nregister list and make sure the right one is being used on i210.\n\nSigned-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>\n---\n drivers/net/e1000/base/e1000_i210.c | 17 ++++++++++-------\n drivers/net/e1000/base/e1000_regs.h | 1 +\n 2 files changed, 11 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/e1000/base/e1000_i210.c b/drivers/net/e1000/base/e1000_i210.c\nindex 842e9d4..fedf88e 100644\n--- a/drivers/net/e1000/base/e1000_i210.c\n+++ b/drivers/net/e1000/base/e1000_i210.c\n@@ -925,7 +925,7 @@ s32 e1000_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)\n STATIC s32 e1000_pll_workaround_i210(struct e1000_hw *hw)\n {\n \ts32 ret_val;\n-\tu32 wuc, mdicnfg, ctrl_ext, reg_val;\n+\tu32 wuc, mdicnfg, ctrl, ctrl_ext, reg_val;\n \tu16 nvm_word, phy_word, pci_word, tmp_nvm;\n \tint i;\n \n@@ -942,9 +942,9 @@ STATIC s32 e1000_pll_workaround_i210(struct e1000_hw *hw)\n \t\tnvm_word = E1000_INVM_DEFAULT_AL;\n \ttmp_nvm = nvm_word | E1000_INVM_PLL_WO_VAL;\n \tfor (i = 0; i < E1000_MAX_PLL_TRIES; i++) {\n-\t\t/* check current state */\n-\t\thw->phy.ops.read_reg(hw, (E1000_PHY_PLL_FREQ_PAGE |\n-\t\t\t\t E1000_PHY_PLL_FREQ_REG), &phy_word);\n+\t\t/* check current state directly from internal PHY */\n+\t\te1000_read_phy_reg_gs40g(hw, (E1000_PHY_PLL_FREQ_PAGE |\n+\t\t\t\t\t E1000_PHY_PLL_FREQ_REG), &phy_word);\n \t\tif ((phy_word & E1000_PHY_PLL_UNCONF)\n \t\t != E1000_PHY_PLL_UNCONF) {\n \t\t\tret_val = E1000_SUCCESS;\n@@ -952,14 +952,17 @@ STATIC s32 e1000_pll_workaround_i210(struct e1000_hw *hw)\n \t\t} else {\n \t\t\tret_val = -E1000_ERR_PHY;\n \t\t}\n-\t\thw->phy.ops.reset(hw);\n+\t\t/* directly reset the internal PHY */\n+\t\tctrl = E1000_READ_REG(hw, E1000_CTRL);\n+\t\tE1000_WRITE_REG(hw, E1000_CTRL, ctrl|E1000_CTRL_PHY_RST);\n+\n \t\tctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);\n \t\tctrl_ext |= (E1000_CTRL_EXT_PHYPDEN | E1000_CTRL_EXT_SDLPE);\n \t\tE1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);\n \n \t\tE1000_WRITE_REG(hw, E1000_WUC, 0);\n \t\treg_val = (E1000_INVM_AUTOLOAD << 4) | (tmp_nvm << 16);\n-\t\tE1000_WRITE_REG(hw, E1000_EEARBC, reg_val);\n+\t\tE1000_WRITE_REG(hw, E1000_EEARBC_I210, reg_val);\n \n \t\te1000_read_pci_cfg(hw, E1000_PCI_PMCSR, &pci_word);\n \t\tpci_word |= E1000_PCI_PMCSR_D3;\n@@ -968,7 +971,7 @@ STATIC s32 e1000_pll_workaround_i210(struct e1000_hw *hw)\n \t\tpci_word &= ~E1000_PCI_PMCSR_D3;\n \t\te1000_write_pci_cfg(hw, E1000_PCI_PMCSR, &pci_word);\n \t\treg_val = (E1000_INVM_AUTOLOAD << 4) | (nvm_word << 16);\n-\t\tE1000_WRITE_REG(hw, E1000_EEARBC, reg_val);\n+\t\tE1000_WRITE_REG(hw, E1000_EEARBC_I210, reg_val);\n \n \t\t/* restore WUC register */\n \t\tE1000_WRITE_REG(hw, E1000_WUC, wuc);\ndiff --git a/drivers/net/e1000/base/e1000_regs.h b/drivers/net/e1000/base/e1000_regs.h\nindex 8999b5b..b9fcdea 100644\n--- a/drivers/net/e1000/base/e1000_regs.h\n+++ b/drivers/net/e1000/base/e1000_regs.h\n@@ -110,6 +110,7 @@ POSSIBILITY OF SUCH DAMAGE.\n #define E1000_PBECCSTS\t0x0100C /* Packet Buffer ECC Status - RW */\n #define E1000_EEMNGCTL\t0x01010 /* MNG EEprom Control */\n #define E1000_EEARBC\t0x01024 /* EEPROM Auto Read Bus Control */\n+#define E1000_EEARBC_I210\t0x12024 /* EEPROM Auto Read Bus Control */\n #define E1000_FLASHT\t0x01028 /* FLASH Timer Register */\n #define E1000_EEWR\t0x0102C /* EEPROM Write Register - RW */\n #define E1000_FLSWCTL\t0x01030 /* FLASH control register */\n", "prefixes": [ "dpdk-dev", "v2", "14/35" ] }