Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/753493/?format=api
{ "id": 753493, "url": "http://patchwork.ozlabs.org/api/patches/753493/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1492767433-7430-1-git-send-email-paul.greenwalt@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": "<1492767433-7430-1-git-send-email-paul.greenwalt@intel.com>", "list_archive_url": null, "date": "2017-04-21T09:37:13", "name": "[v2] ixgbe: Remove MAC X550EM_X 1Gbase-t led_[on|off] support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "caeea7c09dad50806217e323516a7966acc67162", "submitter": { "id": 71166, "url": "http://patchwork.ozlabs.org/api/people/71166/?format=api", "name": "Paul Greenwalt", "email": "paul.greenwalt@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/1492767433-7430-1-git-send-email-paul.greenwalt@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/753493/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/753493/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3w8hVb6Mnqz9s1h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 22 Apr 2017 02:47:35 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B923B89578;\n\tFri, 21 Apr 2017 16:47:32 +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 9dDUswzocUNG; Fri, 21 Apr 2017 16:47:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0E4B58956C;\n\tFri, 21 Apr 2017 16:47:31 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 1AA241BFA57\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 21 Apr 2017 16:47:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id E629330F8B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 21 Apr 2017 16:47:15 +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 qTxuDebWqVkS for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 21 Apr 2017 16:47:15 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 1A3D222FD3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 21 Apr 2017 16:47:15 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t21 Apr 2017 09:47:14 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.152.55])\n\tby fmsmga004.fm.intel.com with ESMTP; 21 Apr 2017 09:47:14 -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.37,230,1488873600\"; d=\"scan'208\";a=\"251971354\"", "From": "Paul Greenwalt <paul.greenwalt@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 21 Apr 2017 05:37:13 -0400", "Message-Id": "<1492767433-7430-1-git-send-email-paul.greenwalt@intel.com>", "X-Mailer": "git-send-email 2.7.4", "Subject": "[Intel-wired-lan] [PATCH v2] ixgbe: Remove MAC X550EM_X 1Gbase-t\n\tled_[on|off] support", "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": "Since FW configures the PHY and MAC X550EM_X has no\nPHY access, led_[on|off] is not supported with the 1Gbase-t design.\n\nRemoved MAC X550EM_X 1Gbase-t led_[on|off] support by setting\nfunction pointers to NULL and added NULL pointer checks. Also set\ninit_led_link_act to NULL and added NULL pointer check.\n\nSigned-off-by: Paul Greenwalt <paul.greenwalt@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 3 ++-\n drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 +++\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 25 +++++++++++++++++++++++-\n 3 files changed, 29 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\nindex c38d50c..3af6127 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c\n@@ -395,7 +395,8 @@ s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw)\n \t}\n \n \t/* Initialize the LED link active for LED blink support */\n-\thw->mac.ops.init_led_link_act(hw);\n+\tif (hw->mac.ops.init_led_link_act)\n+\t\thw->mac.ops.init_led_link_act(hw);\n \n \treturn status;\n }\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\nindex 7e5e336..cced74d 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\n@@ -2254,6 +2254,9 @@ static int ixgbe_set_phys_id(struct net_device *netdev,\n \tstruct ixgbe_adapter *adapter = netdev_priv(netdev);\n \tstruct ixgbe_hw *hw = &adapter->hw;\n \n+\tif (!hw->mac.ops.led_on || !hw->mac.ops.led_off)\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (state) {\n \tcase ETHTOOL_ID_ACTIVE:\n \t\tadapter->led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 2ba024b..b8d9097 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -3206,6 +3206,7 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)\n \t\tphy->ops.setup_link = NULL;\n \t\tphy->ops.read_reg = NULL;\n \t\tphy->ops.write_reg = NULL;\n+\t\tphy->ops.reset = NULL;\n \t\tbreak;\n \tdefault:\n \t\tbreak;\n@@ -3819,6 +3820,28 @@ static const struct ixgbe_mac_operations mac_ops_X550EM_x = {\n \t.write_iosf_sb_reg\t= ixgbe_write_iosf_sb_reg_x550,\n };\n \n+static const struct ixgbe_mac_operations mac_ops_X550EM_x_fw = {\n+\tX550_COMMON_MAC\n+\t.led_on\t\t\t= NULL,\n+\t.led_off\t\t= NULL,\n+\t.init_led_link_act\t= NULL, \n+\t.reset_hw\t\t= &ixgbe_reset_hw_X550em,\n+\t.get_media_type\t\t= &ixgbe_get_media_type_X550em,\n+\t.get_san_mac_addr\t= NULL,\n+\t.get_wwn_prefix\t\t= NULL,\n+\t.setup_link\t\t= &ixgbe_setup_mac_link_X540,\n+\t.get_link_capabilities\t= &ixgbe_get_link_capabilities_X550em,\n+\t.get_bus_info\t\t= &ixgbe_get_bus_info_X550em,\n+\t.setup_sfp\t\t= ixgbe_setup_sfp_modules_X550em,\n+\t.acquire_swfw_sync\t= &ixgbe_acquire_swfw_sync_X550em,\n+\t.release_swfw_sync\t= &ixgbe_release_swfw_sync_X550em,\n+\t.init_swfw_sync\t\t= &ixgbe_init_swfw_sync_X540,\n+\t.setup_fc\t\t= NULL,\n+\t.fc_autoneg\t\t= ixgbe_fc_autoneg,\n+\t.read_iosf_sb_reg\t= ixgbe_read_iosf_sb_reg_x550,\n+\t.write_iosf_sb_reg\t= ixgbe_write_iosf_sb_reg_x550,\n+};\n+\n static struct ixgbe_mac_operations mac_ops_x550em_a = {\n \tX550_COMMON_MAC\n \t.led_on\t\t\t= ixgbe_led_on_t_x550em,\n@@ -3986,7 +4009,7 @@ const struct ixgbe_info ixgbe_X550EM_x_info = {\n const struct ixgbe_info ixgbe_x550em_x_fw_info = {\n \t.mac\t\t\t= ixgbe_mac_X550EM_x,\n \t.get_invariants\t\t= ixgbe_get_invariants_X550_x_fw,\n-\t.mac_ops\t\t= &mac_ops_X550EM_x,\n+\t.mac_ops\t\t= &mac_ops_X550EM_x_fw,\n \t.eeprom_ops\t\t= &eeprom_ops_X550EM_x,\n \t.phy_ops\t\t= &phy_ops_x550em_x_fw,\n \t.mbx_ops\t\t= &mbx_ops_generic,\n", "prefixes": [ "v2" ] }