Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/604992/?format=api
{ "id": 604992, "url": "http://patchwork.ozlabs.org/api/patches/604992/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160401191846.120975.65186.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": "<20160401191846.120975.65186.stgit@mdrustad-wks.jf.intel.com>", "list_archive_url": null, "date": "2016-04-01T19:18:46", "name": "[V5,10/11] ixgbe: Add KR backplane support for x550em_a", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4e59eba472049bd8d29929633b144720ae5fd898", "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/20160401191846.120975.65186.stgit@mdrustad-wks.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/604992/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/604992/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 3qcB4t3kDSz9sD3\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Apr 2016 06:18:54 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A574C2361C;\n\tFri, 1 Apr 2016 19:18:53 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 7kloNIVatxEy; Fri, 1 Apr 2016 19:18:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 3BA2025D62;\n\tFri, 1 Apr 2016 19:18:52 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7BCA31C11DF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6A42B33A86\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:50 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id NavscIAaSeSM for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:46 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby silver.osuosl.org (Postfix) with ESMTP id 977A52FE58\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 19:18:46 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga103.jf.intel.com with ESMTP; 01 Apr 2016 12:18:46 -0700", "from mdrustad-wks.jf.intel.com ([134.134.3.71])\n\tby FMSMGA003.fm.intel.com with ESMTP; 01 Apr 2016 12:18:47 -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=\"679355802\"", "From": "Mark D Rustad <mark.d.rustad@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 01 Apr 2016 12:18:46 -0700", "Message-ID": "<20160401191846.120975.65186.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 10/11] ixgbe: Add KR backplane support\n\tfor x550em_a", "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": "Add support for x550em_a-based KR backplane devices.\n\nSigned-off-by: Mark Rustad <mark.d.rustad@intel.com>\n---\nChanges in V3:\n- Move mac type check into ixgbe_setup_kr_x550em\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 ++\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 ++\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 18 ++++++++++++++----\n 3 files changed, 18 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 41bc816bbe87..0d5893a60e08 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -130,6 +130,8 @@ static const struct pci_device_id ixgbe_pci_tbl[] = {\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x},\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x},\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), board_X550EM_x},\n+\t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR), board_x550em_a },\n+\t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR_L), board_x550em_a },\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP_N), board_x550em_a },\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII), board_x550em_a },\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII_L), board_x550em_a },\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex d4cff4d7b4fa..af43b0c9c6c4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -80,6 +80,8 @@\n #define IXGBE_DEV_ID_X550EM_X_SFP\t0x15AC\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_KR\t0x15C2\n+#define IXGBE_DEV_ID_X550EM_A_KR_L\t0x15C3\n #define IXGBE_DEV_ID_X550EM_A_SFP_N\t0x15C4\n #define IXGBE_DEV_ID_X550EM_A_SGMII\t0x15C6\n #define IXGBE_DEV_ID_X550EM_A_SGMII_L\t0x15C7\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex c59556af77d5..318d4aea779e 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -291,6 +291,8 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)\n \t\thw->phy.type = ixgbe_phy_x550em_kx4;\n \t\tbreak;\n \tcase IXGBE_DEV_ID_X550EM_X_KR:\n+\tcase IXGBE_DEV_ID_X550EM_A_KR:\n+\tcase IXGBE_DEV_ID_X550EM_A_KR_L:\n \t\thw->phy.type = ixgbe_phy_x550em_kr;\n \t\tbreak;\n \tcase IXGBE_DEV_ID_X550EM_X_1G_T:\n@@ -1984,13 +1986,17 @@ static s32 ixgbe_setup_kx4_x550em(struct ixgbe_hw *hw)\n \treturn status;\n }\n \n-/** ixgbe_setup_kr_x550em - Configure the KR PHY.\n- * @hw: pointer to hardware structure\n+/**\n+ * ixgbe_setup_kr_x550em - Configure the KR PHY\n+ * @hw: pointer to hardware structure\n *\n- * Configures the integrated KR PHY.\n+ * Configures the integrated KR PHY for X550EM_x.\n **/\n static s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)\n {\n+\tif (hw->mac.type != ixgbe_mac_X550EM_x)\n+\t\treturn 0;\n+\n \treturn ixgbe_setup_kr_speed_x550em(hw, hw->phy.autoneg_advertised);\n }\n \n@@ -2196,7 +2202,9 @@ static s32 ixgbe_setup_fc_x550em(struct ixgbe_hw *hw)\n \t\treturn IXGBE_ERR_CONFIG;\n \t}\n \n-\tif (hw->device_id != IXGBE_DEV_ID_X550EM_X_KR)\n+\tif (hw->device_id != IXGBE_DEV_ID_X550EM_X_KR &&\n+\t hw->device_id != IXGBE_DEV_ID_X550EM_A_KR &&\n+\t hw->device_id != IXGBE_DEV_ID_X550EM_A_KR_L)\n \t\treturn 0;\n \n \trc = hw->mac.ops.read_iosf_sb_reg(hw,\n@@ -2437,6 +2445,8 @@ static enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw)\n \t\t/* Fallthrough */\n \tcase IXGBE_DEV_ID_X550EM_X_KR:\n \tcase IXGBE_DEV_ID_X550EM_X_KX4:\n+\tcase IXGBE_DEV_ID_X550EM_A_KR:\n+\tcase IXGBE_DEV_ID_X550EM_A_KR_L:\n \t\tmedia_type = ixgbe_media_type_backplane;\n \t\tbreak;\n \tcase IXGBE_DEV_ID_X550EM_X_SFP:\n", "prefixes": [ "V5", "10/11" ] }