Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/604986/?format=api
{ "id": 604986, "url": "http://patchwork.ozlabs.org/api/patches/604986/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160401191819.120975.51167.stgit@mdrustad-wks.jf.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": "<20160401191819.120975.51167.stgit@mdrustad-wks.jf.intel.com>", "list_archive_url": null, "date": "2016-04-01T19:18:20", "name": "[V5,05/11] ixgbe: Read and set instance id", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4598bd6f62a25638b2a2770a147a3abe7330288f", "submitter": { "id": 13252, "url": "http://patchwork.ozlabs.org/api/people/13252/?format=api", "name": "Rustad, Mark D", "email": "mark.d.rustad@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/20160401191819.120975.51167.stgit@mdrustad-wks.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/604986/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/604986/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 3qcB4H6m9Rz9sD3\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Apr 2016 06:18:23 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 48B6688C34;\n\tFri, 1 Apr 2016 19:18:23 +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 bCUUI65DNKBk; Fri, 1 Apr 2016 19:18:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E78F38A6AC;\n\tFri, 1 Apr 2016 19:18:21 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 019F31C11DF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:21 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F0BD08469E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:20 +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 ZfaXJiReVO_b for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:20 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6C6F5843E9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:20 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga103.jf.intel.com with ESMTP; 01 Apr 2016 12:18:20 -0700", "from mdrustad-wks.jf.intel.com ([134.134.3.71])\n\tby fmsmga002.fm.intel.com with ESMTP; 01 Apr 2016 12:18:20 -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.24,428,1455004800\"; d=\"scan'208\";a=\"949835491\"", "From": "Mark D Rustad <mark.d.rustad@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 01 Apr 2016 12:18:20 -0700", "Message-ID": "<20160401191819.120975.51167.stgit@mdrustad-wks.jf.intel.com>", "In-Reply-To": "<20160401191701.120975.34684.stgit@mdrustad-wks.jf.intel.com>", "References": "<20160401191701.120975.34684.stgit@mdrustad-wks.jf.intel.com>", "User-Agent": "StGit/unknown-version", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH V5 05/11] ixgbe: Read and set instance id", "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>", "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": "Read the instance number from EEPROM and save it for later use.\n\nSigned-off-by: Mark Rustad <mark.d.rustad@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 8 ++++++++\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 5 +++++\n 2 files changed, 13 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\nindex 76080310fc6b..833567cacda4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\n@@ -681,6 +681,7 @@ s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw)\n void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw)\n {\n \tstruct ixgbe_bus_info *bus = &hw->bus;\n+\tu16 ee_ctrl_4;\n \tu32 reg;\n \n \treg = IXGBE_READ_REG(hw, IXGBE_STATUS);\n@@ -691,6 +692,13 @@ void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw)\n \treg = IXGBE_READ_REG(hw, IXGBE_FACTPS(hw));\n \tif (reg & IXGBE_FACTPS_LFS)\n \t\tbus->func ^= 0x1;\n+\n+\t/* Get MAC instance from EEPROM for configuring CS4227 */\n+\tif (hw->device_id == IXGBE_DEV_ID_X550EM_A_SFP) {\n+\t\thw->eeprom.ops.read(hw, IXGBE_EEPROM_CTRL_4, &ee_ctrl_4);\n+\t\tbus->instance_id = (ee_ctrl_4 & IXGBE_EE_CTRL_4_INST_ID) >>\n+\t\t\t\t IXGBE_EE_CTRL_4_INST_ID_SHIFT;\n+\t}\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex de02702e44c6..ec67cf06066c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -81,6 +81,7 @@\n #define IXGBE_DEV_ID_X550EM_X_10G_T\t0x15AD\n #define IXGBE_DEV_ID_X550EM_X_1G_T\t0x15AE\n #define IXGBE_DEV_ID_X550EM_A_SFP_N\t0x15C4\n+#define IXGBE_DEV_ID_X550EM_A_SFP\t0x15CE\n \n /* VF Device IDs */\n #define IXGBE_DEV_ID_X550_VF_HV\t0x1564\n@@ -1999,6 +2000,9 @@ enum {\n #define IXGBE_PBANUM_PTR_GUARD\t\t0xFAFA\n #define IXGBE_EEPROM_CHECKSUM\t\t0x3F\n #define IXGBE_EEPROM_SUM\t\t0xBABA\n+#define IXGBE_EEPROM_CTRL_4\t\t0x45\n+#define IXGBE_EE_CTRL_4_INST_ID\t\t0x10\n+#define IXGBE_EE_CTRL_4_INST_ID_SHIFT\t4\n #define IXGBE_PCIE_ANALOG_PTR\t\t0x03\n #define IXGBE_ATLAS0_CONFIG_PTR\t\t0x04\n #define IXGBE_PHY_PTR\t\t\t0x04\n@@ -3174,6 +3178,7 @@ struct ixgbe_bus_info {\n \n \tu8 func;\n \tu8 lan_id;\n+\tu8 instance_id;\n };\n \n /* Flow control parameters */\n", "prefixes": [ "V5", "05/11" ] }