Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/705229/?format=api
{ "id": 705229, "url": "http://patchwork.ozlabs.org/api/patches/705229/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1481586257-28872-3-git-send-email-bimmy.pujari@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": "<1481586257-28872-3-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-12-12T23:44:08", "name": "[next,S57,02/11] i40e: enable mc magic pkt wakeup during power down", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "794b33ac81f7d38e29d7e65af0c0146546005828", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1481586257-28872-3-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/705229/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/705229/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\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 3tczxd6mzwz9t10\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 13 Dec 2016 10:46:13 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6A1252D126;\n\tMon, 12 Dec 2016 23:46:12 +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 FE0LNkTq+nWA; Mon, 12 Dec 2016 23:46:06 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 828062D1D7;\n\tMon, 12 Dec 2016 23:46:03 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 384411C048D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Dec 2016 23:45:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 370FD861E2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Dec 2016 23:45:59 +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 886wrc4R6T0S for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Dec 2016 23:45:56 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 595FB86156\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Dec 2016 23:45:56 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga104.jf.intel.com with ESMTP; 12 Dec 2016 15:45:55 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby orsmga003.jf.intel.com with ESMTP; 12 Dec 2016 15:45:55 -0800" ], "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.33,339,1477983600\"; d=\"scan'208\";a=\"911471172\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 12 Dec 2016 15:44:08 -0800", "Message-Id": "<1481586257-28872-3-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1481586257-28872-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1481586257-28872-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S57 02/11] i40e: enable mc magic pkt\n\twakeup during power down", "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": "From: \"Joshua Hay\" <joshua.a.hay@intel.com>\n\nThis patch adds a call to the mac_address_write admin q function during\npower down to update the PRTPM_SAH/SAL registers with the MC_MAG_EN bit\nthus enabling multicast magic packet wakeup.\n \nA FW workaround is needed to write the multicast magic wake up enable \nbit in the PRTPM_SAH register. The FW expects the mac address write \nadmin q cmd to be called first with one of the WRITE_TYPE_LAA flags \nand then with the multicast relevant flags.\n\n*Note: This solution only works for X722 devices currently. A PFR will\nclear the previously mentioned bit by default, but X722 has support for a\nWOL_PRESERVE_ON_PFR flag which prevents the bit from being cleared. Once\nother devices support this flag, this solution should work as well.\n\nSigned-off-by: Joshua Hay <joshua.a.hay@intel.com>\nChange-ID: I51bd5b8535bd9051c2676e27c999c1657f786827\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +\n drivers/net/ethernet/intel/i40e/i40e_main.c | 74 ++++++++++++++++++++---\n 3 files changed, 67 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 0f2bf241..0f13d19 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -387,6 +387,7 @@ struct i40e_pf {\n #define I40E_FLAG_TRUE_PROMISC_SUPPORT\t\tBIT_ULL(51)\n #define I40E_FLAG_HAVE_CRT_RETIMER\t\tBIT_ULL(52)\n #define I40E_FLAG_PTP_L4_CAPABLE\t\tBIT_ULL(53)\n+#define I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE\t\tBIT_ULL(54)\n \n \t/* tracks features that get auto disabled by errors */\n \tu64 auto_disable_flags;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\nindex b2101a5..451f48b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n@@ -538,6 +538,8 @@ I40E_CHECK_STRUCT_LEN(24, i40e_aqc_mac_address_read_data);\n /* Manage MAC Address Write Command (0x0108) */\n struct i40e_aqc_mac_address_write {\n \t__le16\tcommand_flags;\n+#define I40E_AQC_MC_MAG_EN\t\t0x0100\n+#define I40E_AQC_WOL_PRESERVE_ON_PFR\t0x0200\n #define I40E_AQC_WRITE_TYPE_LAA_ONLY\t0x0000\n #define I40E_AQC_WRITE_TYPE_LAA_WOL\t0x4000\n #define I40E_AQC_WRITE_TYPE_PORT\t0x8000\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex cb62a1e..51a962c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -8830,16 +8830,17 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t}\n #endif /* CONFIG_PCI_IOV */\n \tif (pf->hw.mac.type == I40E_MAC_X722) {\n-\t\tpf->flags |= I40E_FLAG_RSS_AQ_CAPABLE |\n-\t\t\t I40E_FLAG_128_QP_RSS_CAPABLE |\n-\t\t\t I40E_FLAG_HW_ATR_EVICT_CAPABLE |\n-\t\t\t I40E_FLAG_OUTER_UDP_CSUM_CAPABLE |\n-\t\t\t I40E_FLAG_WB_ON_ITR_CAPABLE |\n-\t\t\t I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE |\n-\t\t\t I40E_FLAG_NO_PCI_LINK_CHECK |\n-\t\t\t I40E_FLAG_USE_SET_LLDP_MIB |\n-\t\t\t I40E_FLAG_GENEVE_OFFLOAD_CAPABLE |\n-\t\t\t I40E_FLAG_PTP_L4_CAPABLE;\n+\t\tpf->flags |= I40E_FLAG_RSS_AQ_CAPABLE\n+\t\t\t | I40E_FLAG_128_QP_RSS_CAPABLE\n+\t\t\t | I40E_FLAG_HW_ATR_EVICT_CAPABLE\n+\t\t\t | I40E_FLAG_OUTER_UDP_CSUM_CAPABLE\n+\t\t\t | I40E_FLAG_WB_ON_ITR_CAPABLE\n+\t\t\t | I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE\n+\t\t\t | I40E_FLAG_NO_PCI_LINK_CHECK\n+\t\t\t | I40E_FLAG_USE_SET_LLDP_MIB\n+\t\t\t | I40E_FLAG_GENEVE_OFFLOAD_CAPABLE\n+\t\t\t | I40E_FLAG_PTP_L4_CAPABLE\n+\t\t\t | I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE;\n \t} else if ((pf->hw.aq.api_maj_ver > 1) ||\n \t\t ((pf->hw.aq.api_maj_ver == 1) &&\n \t\t (pf->hw.aq.api_min_ver > 4))) {\n@@ -11757,6 +11758,53 @@ static void i40e_pci_error_resume(struct pci_dev *pdev)\n }\n \n /**\n+ * i40e_enable_mc_magic_wake - enable multicast magic packet wake up\n+ * using the mac_address_write admin q function\n+ * @pf: pointer to i40e_pf struct\n+ **/\n+static void i40e_enable_mc_magic_wake(struct i40e_pf *pf)\n+{\n+\tstruct i40e_hw *hw = &pf->hw;\n+\ti40e_status ret;\n+\tu8 mac_addr[6];\n+\tu16 flags = 0;\n+\n+\t/* Get current MAC address in case it's an LAA */\n+\tif (pf->vsi[pf->lan_vsi] && pf->vsi[pf->lan_vsi]->netdev) {\n+\t\tether_addr_copy(mac_addr,\n+\t\t\t\tpf->vsi[pf->lan_vsi]->netdev->dev_addr);\n+\t} else {\n+\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\"Failed to retrieve MAC address; using default\\n\");\n+\t\tether_addr_copy(mac_addr, hw->mac.addr);\n+\t}\n+\n+\t/* The FW expects the mac address write cmd to first be called with\n+\t * one of these flags before calling it again with the multicast\n+\t * enable flags.\n+\t */\n+\tflags = I40E_AQC_WRITE_TYPE_LAA_WOL;\n+\n+\tif (hw->func_caps.flex10_enable && hw->partition_id != 1)\n+\t\tflags = I40E_AQC_WRITE_TYPE_LAA_ONLY;\n+\n+\tret = i40e_aq_mac_address_write(hw, flags, mac_addr, NULL);\n+\tif (ret) {\n+\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\"Failed to update MAC address registers; cannot enable Multicast Magic packet wake up\");\n+\t\treturn;\n+\t}\n+\n+\tflags = I40E_AQC_MC_MAG_EN\n+\t\t\t| I40E_AQC_WOL_PRESERVE_ON_PFR\n+\t\t\t| I40E_AQC_WRITE_TYPE_UPDATE_MC_MAG;\n+\tret = i40e_aq_mac_address_write(hw, flags, mac_addr, NULL);\n+\tif (ret)\n+\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\"Failed to enable Multicast Magic Packet wake up\\n\");\n+}\n+\n+/**\n * i40e_shutdown - PCI callback for shutting down\n * @pdev: PCI device information struct\n **/\n@@ -11778,6 +11826,9 @@ static void i40e_shutdown(struct pci_dev *pdev)\n \tcancel_work_sync(&pf->service_task);\n \ti40e_fdir_teardown(pf);\n \n+\tif (pf->wol_en && (pf->flags & I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE))\n+\t\ti40e_enable_mc_magic_wake(pf);\n+\n \trtnl_lock();\n \ti40e_prep_for_reset(pf);\n \trtnl_unlock();\n@@ -11809,6 +11860,9 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state)\n \tset_bit(__I40E_SUSPENDED, &pf->state);\n \tset_bit(__I40E_DOWN, &pf->state);\n \n+\tif (pf->wol_en && (pf->flags & I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE))\n+\t\ti40e_enable_mc_magic_wake(pf);\n+\n \trtnl_lock();\n \ti40e_prep_for_reset(pf);\n \trtnl_unlock();\n", "prefixes": [ "next", "S57", "02/11" ] }