Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/693940/?format=api
{ "id": 693940, "url": "http://patchwork.ozlabs.org/api/patches/693940/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478896779-13697-2-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": "<1478896779-13697-2-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-11T20:39:25", "name": "[next,S54,01/15] i40e: defeature support for PTP L4 frame detection on XL710", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8a70c174fd0515b7cae0a65451edd53cae8fb49f", "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/1478896779-13697-2-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/693940/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/693940/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3tFsJg0vhYz9t9x\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 12 Nov 2016 07:41:23 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 8851296117;\n\tFri, 11 Nov 2016 20:41:21 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id mWHitSX8u+cD; Fri, 11 Nov 2016 20:41:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3720B96123;\n\tFri, 11 Nov 2016 20:41:17 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2A0771CEC94\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 258D7C2242\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:15 +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 ZcCPdTGhBASp for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:13 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 70A7BC226D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:13 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP; 11 Nov 2016 12:41:13 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga005.fm.intel.com with ESMTP; 11 Nov 2016 12:41:12 -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.31,474,1473145200\"; d=\"scan'208\";a=\"30297928\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 11 Nov 2016 12:39:25 -0800", "Message-Id": "<1478896779-13697-2-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S54 01/15] i40e: defeature support\n\tfor PTP L4 frame detection on XL710", "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: Jacob Keller <jacob.e.keller@intel.com>\n\nA product decision has been made to defeature detection of PTP frames\nover L4 (UDP) on the XL710 MAC. Do not advertise support for L4\ntimestamping.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I41fbb0f84ebb27c43e23098c08156f2625c6ee06\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 15 +++++++++++++--\n drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++-\n drivers/net/ethernet/intel/i40e/i40e_ptp.c | 21 +++++++++++++++------\n 4 files changed, 31 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex eadece4..b05065c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -361,6 +361,7 @@ struct i40e_pf {\n #define I40E_FLAG_PF_MAC\t\t\tBIT_ULL(50)\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 \n \t/* tracks features that get auto disabled by errors */\n \tu64 auto_disable_flags;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 4b3a71a..db966c1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1675,8 +1675,19 @@ static int i40e_get_ts_info(struct net_device *dev,\n \tinfo->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);\n \n \tinfo->rx_filters = BIT(HWTSTAMP_FILTER_NONE) |\n-\t\t\t BIT(HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |\n-\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);\n+\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |\n+\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |\n+\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ);\n+\n+\tif (pf->flags & I40E_FLAG_PTP_L4_CAPABLE)\n+\t\tinfo->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_EVENT) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_SYNC) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |\n+\t\t\t\t BIT(HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex ede6e0a..0b62d63 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -8695,7 +8695,8 @@ static int i40e_sw_init(struct i40e_pf *pf)\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_GENEVE_OFFLOAD_CAPABLE |\n+\t\t\t I40E_FLAG_PTP_L4_CAPABLE;\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))) {\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\nindex 5e2272c..9e49ffa 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n@@ -521,6 +521,8 @@ static int i40e_ptp_set_timestamp_mode(struct i40e_pf *pf,\n \tcase HWTSTAMP_FILTER_PTP_V1_L4_SYNC:\n \tcase HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:\n \tcase HWTSTAMP_FILTER_PTP_V1_L4_EVENT:\n+\t\tif (!(pf->flags & I40E_FLAG_PTP_L4_CAPABLE))\n+\t\t\treturn -ERANGE;\n \t\tpf->ptp_rx = true;\n \t\ttsyntype = I40E_PRTTSYN_CTL1_V1MESSTYPE0_MASK |\n \t\t\t I40E_PRTTSYN_CTL1_TSYNTYPE_V1 |\n@@ -528,19 +530,26 @@ static int i40e_ptp_set_timestamp_mode(struct i40e_pf *pf,\n \t\tconfig->rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;\n \t\tbreak;\n \tcase HWTSTAMP_FILTER_PTP_V2_EVENT:\n-\tcase HWTSTAMP_FILTER_PTP_V2_L2_EVENT:\n \tcase HWTSTAMP_FILTER_PTP_V2_L4_EVENT:\n \tcase HWTSTAMP_FILTER_PTP_V2_SYNC:\n-\tcase HWTSTAMP_FILTER_PTP_V2_L2_SYNC:\n \tcase HWTSTAMP_FILTER_PTP_V2_L4_SYNC:\n \tcase HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:\n-\tcase HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:\n \tcase HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:\n+\t\tif (!(pf->flags & I40E_FLAG_PTP_L4_CAPABLE))\n+\t\t\treturn -ERANGE;\n+\t\t/* fall through */\n+\tcase HWTSTAMP_FILTER_PTP_V2_L2_EVENT:\n+\tcase HWTSTAMP_FILTER_PTP_V2_L2_SYNC:\n+\tcase HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:\n \t\tpf->ptp_rx = true;\n \t\ttsyntype = I40E_PRTTSYN_CTL1_V2MESSTYPE0_MASK |\n-\t\t\t I40E_PRTTSYN_CTL1_TSYNTYPE_V2 |\n-\t\t\t I40E_PRTTSYN_CTL1_UDP_ENA_MASK;\n-\t\tconfig->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;\n+\t\t\t I40E_PRTTSYN_CTL1_TSYNTYPE_V2;\n+\t\tif (pf->flags & I40E_FLAG_PTP_L4_CAPABLE) {\n+\t\t\ttsyntype |= I40E_PRTTSYN_CTL1_UDP_ENA_MASK;\n+\t\t\tconfig->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;\n+\t\t} else {\n+\t\t\tconfig->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;\n+\t\t}\n \t\tbreak;\n \tcase HWTSTAMP_FILTER_ALL:\n \tdefault:\n", "prefixes": [ "next", "S54", "01/15" ] }