Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/623734/?format=api
{ "id": 623734, "url": "http://patchwork.ozlabs.org/api/patches/623734/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160518210424.20744-1-jacob.e.keller@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": "<20160518210424.20744-1-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-05-18T21:04:20", "name": "[v3,1/5] igb: introduce ptp_flags variable and use it to replace IGB_FLAG_PTP", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "eb215861f8eb4d249b5677ddc90f5eff6b2360af", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20160518210424.20744-1-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/623734/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/623734/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\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 3r96CY1vbgz9t5g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 19 May 2016 07:04:57 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9792691FC7;\n\tWed, 18 May 2016 21:04:55 +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 ZzlbuNIyI8u4; Wed, 18 May 2016 21:04:53 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 2EBDD91FC9;\n\tWed, 18 May 2016 21:04:53 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 318F01CF613\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 May 2016 21:04:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2F1A1959C5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 May 2016 21:04:50 +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 GLHkiWfKtLsv for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 May 2016 21:04:48 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 32C4F95949\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 May 2016 21:04:48 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP; 18 May 2016 14:04:26 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.173])\n\tby orsmga002.jf.intel.com with ESMTP; 18 May 2016 14:04:25 -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.26,330,1459839600\"; d=\"scan'208\";a=\"979911476\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 18 May 2016 14:04:20 -0700", "Message-Id": "<20160518210424.20744-1-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.2.820.gd1c5f70", "Subject": "[Intel-wired-lan] [PATCH v3 1/5] igb: introduce ptp_flags variable\n\tand use it to replace IGB_FLAG_PTP", "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": "Upcoming patches will introduce new PTP specific flags. To avoid\ncluttering the normal flags variable, introduce PTP specific \"ptp_flags\"\nvariable for this purpose, and move IGB_FLAG_PTP to become\nIGB_PTP_ENABLED.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/igb/igb.h | 5 ++++-\n drivers/net/ethernet/intel/igb/igb_ptp.c | 8 ++++----\n 2 files changed, 8 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex b9609afa5ca3..1e18a9eb16e0 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -445,6 +445,7 @@ struct igb_adapter {\n \tunsigned long ptp_tx_start;\n \tunsigned long last_rx_ptp_check;\n \tunsigned long last_rx_timestamp;\n+\tunsigned int ptp_flags;\n \tspinlock_t tmreg_lock;\n \tstruct cyclecounter cc;\n \tstruct timecounter tc;\n@@ -474,12 +475,14 @@ struct igb_adapter {\n \tu16 eee_advert;\n };\n \n+/* flags controlling PTP/1588 function */\n+#define IGB_PTP_ENABLED\t\tBIT(0)\n+\n #define IGB_FLAG_HAS_MSI\t\tBIT(0)\n #define IGB_FLAG_DCA_ENABLED\t\tBIT(1)\n #define IGB_FLAG_QUAD_PORT_A\t\tBIT(2)\n #define IGB_FLAG_QUEUE_PAIRS\t\tBIT(3)\n #define IGB_FLAG_DMAC\t\t\tBIT(4)\n-#define IGB_FLAG_PTP\t\t\tBIT(5)\n #define IGB_FLAG_RSS_FIELD_IPV4_UDP\tBIT(6)\n #define IGB_FLAG_RSS_FIELD_IPV6_UDP\tBIT(7)\n #define IGB_FLAG_WOL_SUPPORTED\t\tBIT(8)\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c\nindex f097c5a8ab93..88e3b40415a1 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ptp.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c\n@@ -684,7 +684,7 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter)\n \tu32 tsyncrxctl = rd32(E1000_TSYNCRXCTL);\n \tunsigned long rx_event;\n \n-\tif (hw->mac.type != e1000_82576)\n+\tif (!(adapter->ptp_flags & IGB_PTP_ENABLED))\n \t\treturn;\n \n \t/* If we don't have a valid timestamp in the registers, just update the\n@@ -1156,7 +1156,7 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t} else {\n \t\tdev_info(&adapter->pdev->dev, \"added PHC on %s\\n\",\n \t\t\t adapter->netdev->name);\n-\t\tadapter->flags |= IGB_FLAG_PTP;\n+\t\tadapter->ptp_flags |= IGB_PTP_ENABLED;\n \t}\n }\n \n@@ -1194,7 +1194,7 @@ void igb_ptp_stop(struct igb_adapter *adapter)\n \t\tptp_clock_unregister(adapter->ptp_clock);\n \t\tdev_info(&adapter->pdev->dev, \"removed PHC on %s\\n\",\n \t\t\t adapter->netdev->name);\n-\t\tadapter->flags &= ~IGB_FLAG_PTP;\n+\t\tadapter->ptp_flags &= ~IGB_PTP_ENABLED;\n \t}\n }\n \n@@ -1209,7 +1209,7 @@ void igb_ptp_reset(struct igb_adapter *adapter)\n \tstruct e1000_hw *hw = &adapter->hw;\n \tunsigned long flags;\n \n-\tif (!(adapter->flags & IGB_FLAG_PTP))\n+\tif (!(adapter->ptp_flags & IGB_PTP_ENABLED))\n \t\treturn;\n \n \t/* reset the tstamp_config */\n", "prefixes": [ "v3", "1/5" ] }