Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/623735/?format=api
{ "id": 623735, "url": "http://patchwork.ozlabs.org/api/patches/623735/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160518210424.20744-2-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-2-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-05-18T21:04:21", "name": "[v3,2/5] igb: introduce IGB_PTP_OVERFLOW_CHECK flag", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4e722f56947585e43e297fc25240936f8b0faba2", "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-2-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/623735/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/623735/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 3r96CY5J06z9t6B\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 4303691FE5;\n\tWed, 18 May 2016 21:04:56 +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 mWPsUrqmnM94; Wed, 18 May 2016 21:04:54 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5BBE391FCB;\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 804CE1CF613\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 7D98295949\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 JMuPRZ5w-yhc 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 4049495982\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=\"979911477\"", "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:21 -0700", "Message-Id": "<20160518210424.20744-2-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.2.820.gd1c5f70", "In-Reply-To": "<20160518210424.20744-1-jacob.e.keller@intel.com>", "References": "<20160518210424.20744-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v3 2/5] igb: introduce\n\tIGB_PTP_OVERFLOW_CHECK flag", "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": "Don't continue to use complex MAC type checks for handling various cases\nwhere we have overflow check code. Make this code more obvious by\nintroducing a flag which is enabled for hardware that needs these\nchecks.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/igb/igb.h | 1 +\n drivers/net/ethernet/intel/igb/igb_ptp.c | 21 ++++++++-------------\n 2 files changed, 9 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex 1e18a9eb16e0..38daaaba0cdb 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -477,6 +477,7 @@ struct igb_adapter {\n \n /* flags controlling PTP/1588 function */\n #define IGB_PTP_ENABLED\t\tBIT(0)\n+#define IGB_PTP_OVERFLOW_CHECK\tBIT(1)\n \n #define IGB_FLAG_HAS_MSI\t\tBIT(0)\n #define IGB_FLAG_DCA_ENABLED\t\tBIT(1)\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c\nindex 88e3b40415a1..e2c494ad1be0 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ptp.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c\n@@ -1066,6 +1066,7 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t\tadapter->cc.shift = IGB_82576_TSYNC_SHIFT;\n \t\t/* Dial the nominal frequency. */\n \t\twr32(E1000_TIMINCA, INCPERIOD_82576 | INCVALUE_82576);\n+\t\tadapter->ptp_flags |= IGB_PTP_OVERFLOW_CHECK;\n \t\tbreak;\n \tcase e1000_82580:\n \tcase e1000_i354:\n@@ -1086,6 +1087,7 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t\tadapter->cc.shift = 0;\n \t\t/* Enable the timer functions by clearing bit 31. */\n \t\twr32(E1000_TSAUXC, 0x0);\n+\t\tadapter->ptp_flags |= IGB_PTP_OVERFLOW_CHECK;\n \t\tbreak;\n \tcase e1000_i210:\n \tcase e1000_i211:\n@@ -1131,7 +1133,9 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t} else {\n \t\ttimecounter_init(&adapter->tc, &adapter->cc,\n \t\t\t\t ktime_to_ns(ktime_get_real()));\n+\t}\n \n+\tif (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK) {\n \t\tINIT_DELAYED_WORK(&adapter->ptp_overflow_work,\n \t\t\t\t igb_ptp_overflow_check);\n \n@@ -1168,20 +1172,11 @@ void igb_ptp_init(struct igb_adapter *adapter)\n **/\n void igb_ptp_stop(struct igb_adapter *adapter)\n {\n-\tswitch (adapter->hw.mac.type) {\n-\tcase e1000_82576:\n-\tcase e1000_82580:\n-\tcase e1000_i354:\n-\tcase e1000_i350:\n-\t\tcancel_delayed_work_sync(&adapter->ptp_overflow_work);\n-\t\tbreak;\n-\tcase e1000_i210:\n-\tcase e1000_i211:\n-\t\t/* No delayed work to cancel. */\n-\t\tbreak;\n-\tdefault:\n+\tif (!(adapter->ptp_flags & IGB_PTP_ENABLED))\n \t\treturn;\n-\t}\n+\n+\tif (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK)\n+\t\tcancel_delayed_work_sync(&adapter->ptp_overflow_work);\n \n \tcancel_work_sync(&adapter->ptp_tx_work);\n \tif (adapter->ptp_tx_skb) {\n", "prefixes": [ "v3", "2/5" ] }