Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/532989/?format=api
{ "id": 532989, "url": "http://patchwork.ozlabs.org/api/patches/532989/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445350382-6739-1-git-send-email-raanan.avargil@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1445350382-6739-1-git-send-email-raanan.avargil@intel.com>", "list_archive_url": null, "date": "2015-10-20T14:13:01", "name": "[1/2] e1000e: initial support for i219-LM (3)", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9524a06b39806d45dc9d8e78031e16db8be7032e", "submitter": { "id": 66787, "url": "http://patchwork.ozlabs.org/api/people/66787/?format=api", "name": "Raanan Avargil", "email": "raanan.avargil@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445350382-6739-1-git-send-email-raanan.avargil@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/532989/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/532989/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 9485A1402D0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 21 Oct 2015 01:10:16 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D91CC88B75;\n\tTue, 20 Oct 2015 14:10:15 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 9aXljV2Z+zcQ; Tue, 20 Oct 2015 14:10:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 098928808D;\n\tTue, 20 Oct 2015 14:10:12 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6DEA81C1F83\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Oct 2015 14:10:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6925487588\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Oct 2015 14:10:11 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Ph6crviN-vXk for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Oct 2015 14:10:07 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0F98F884AB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Oct 2015 14:10:06 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga101.fm.intel.com with ESMTP; 20 Oct 2015 07:09:14 -0700", "from unknown (HELO ccdpc198.iil.intel.com) ([143.185.160.81])\n\tby FMSMGA003.fm.intel.com with ESMTP; 20 Oct 2015 07:09:12 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.17,707,1437462000\"; d=\"scan'208\";a=\"584583289\"", "From": "Raanan Avargil <raanan.avargil@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 20 Oct 2015 17:13:01 +0300", "Message-Id": "<1445350382-6739-1-git-send-email-raanan.avargil@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [PATCH 1/2] e1000e: initial support for i219-LM\n\t(3)", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "i219-LM (3) is a LOM that will be available on systems with the\nLewisburg Platform Controller Hub (PCH) chipset from Intel.\nThis patch provides the initial support for the device.\n\nSigned-off-by: Raanan Avargil <raanan.avargil@intel.com>\n---\n drivers/net/ethernet/intel/e1000e/hw.h | 1 +\n drivers/net/ethernet/intel/e1000e/ich8lan.c | 43 +++++++++++++++++++++--------\n drivers/net/ethernet/intel/e1000e/netdev.c | 1 +\n 3 files changed, 34 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h\nindex c9da465..b3949d5 100644\n--- a/drivers/net/ethernet/intel/e1000e/hw.h\n+++ b/drivers/net/ethernet/intel/e1000e/hw.h\n@@ -91,6 +91,7 @@ struct e1000_hw;\n #define E1000_DEV_ID_PCH_SPT_I219_V\t\t0x1570\t/* SPT PCH */\n #define E1000_DEV_ID_PCH_SPT_I219_LM2\t\t0x15B7\t/* SPT-H PCH */\n #define E1000_DEV_ID_PCH_SPT_I219_V2\t\t0x15B8\t/* SPT-H PCH */\n+#define E1000_DEV_ID_PCH_LBG_I219_LM3\t\t0x15B9\t/* LBG PCH */\n \n #define E1000_REVISION_4\t4\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c\nindex 64c1f36..a049e30 100644\n--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c\n+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c\n@@ -3093,24 +3093,45 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)\n \tstruct e1000_nvm_info *nvm = &hw->nvm;\n \tu32 bank1_offset = nvm->flash_bank_size * sizeof(u16);\n \tu32 act_offset = E1000_ICH_NVM_SIG_WORD * 2 + 1;\n+\tu32 nvm_dword = 0;\n \tu8 sig_byte = 0;\n \ts32 ret_val;\n \n \tswitch (hw->mac.type) {\n-\t\t/* In SPT, read from the CTRL_EXT reg instead of\n-\t\t * accessing the sector valid bits from the nvm\n-\t\t */\n \tcase e1000_pch_spt:\n-\t\t*bank = er32(CTRL_EXT)\n-\t\t & E1000_CTRL_EXT_NVMVS;\n-\t\tif ((*bank == 0) || (*bank == 1)) {\n-\t\t\te_dbg(\"ERROR: No valid NVM bank present\\n\");\n-\t\t\treturn -E1000_ERR_NVM;\n-\t\t} else {\n-\t\t\t*bank = *bank - 2;\n+\t\tbank1_offset = nvm->flash_bank_size;\n+\t\tact_offset = E1000_ICH_NVM_SIG_WORD;\n+\n+\t\t/* set bank to 0 in case flash read fails */\n+\t\t*bank = 0;\n+\n+\t\t/* Check bank 0 */\n+\t\tret_val = e1000_read_flash_dword_ich8lan(hw, act_offset,\n+\t\t\t\t\t\t\t &nvm_dword);\n+\t\tif (ret_val)\n+\t\t\treturn ret_val;\n+\t\tsig_byte = (u8)((nvm_dword & 0xFF00) >> 8);\n+\t\tif ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==\n+\t\t E1000_ICH_NVM_SIG_VALUE) {\n+\t\t\t*bank = 0;\n \t\t\treturn 0;\n \t\t}\n-\t\tbreak;\n+\n+\t\t/* Check bank 1 */\n+\t\tret_val = e1000_read_flash_dword_ich8lan(hw, act_offset +\n+\t\t\t\t\t\t\t bank1_offset,\n+\t\t\t\t\t\t\t &nvm_dword);\n+\t\tif (ret_val)\n+\t\t\treturn ret_val;\n+\t\tsig_byte = (u8)((nvm_dword & 0xFF00) >> 8);\n+\t\tif ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==\n+\t\t E1000_ICH_NVM_SIG_VALUE) {\n+\t\t\t*bank = 1;\n+\t\t\treturn 0;\n+\t\t}\n+\n+\t\te_dbg(\"ERROR: No valid NVM bank present\\n\");\n+\t\treturn -E1000_ERR_NVM;\n \tcase e1000_ich8lan:\n \tcase e1000_ich9lan:\n \t\teecd = er32(EECD);\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex 3a468435..2fd8b9d 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -7467,6 +7467,7 @@ static const struct pci_device_id e1000_pci_tbl[] = {\n \t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V), board_pch_spt },\n \t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM2), board_pch_spt },\n \t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V2), board_pch_spt },\n+\t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LBG_I219_LM3), board_pch_spt },\n \n \t{ 0, 0, 0, 0, 0, 0, 0 }\t/* terminate list */\n };\n", "prefixes": [ "1/2" ] }