Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/621317/?format=api
{ "id": 621317, "url": "http://patchwork.ozlabs.org/api/patches/621317/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160511231824.22542-4-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": "<20160511231824.22542-4-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-05-11T23:18:22", "name": "[net,v2,3/5] igb: introduce igb_ptp_resume function", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "306e990ca5ca020eb9b5327637b2091b6ef81cf5", "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/20160511231824.22542-4-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/621317/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/621317/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\tby ozlabs.org (Postfix) with ESMTP id 3r4sVx0hDMz9t0t\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 12 May 2016 09:18:33 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5F46C9560E;\n\tWed, 11 May 2016 23:18:32 +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 dWTZfZ-jZ6p7; Wed, 11 May 2016 23:18:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A26E987BE9;\n\tWed, 11 May 2016 23:18:31 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5FF991C10FA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 May 2016 23:18:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5D6888810E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 May 2016 23:18:28 +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 FgdACEy7+6yI for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 May 2016 23:18:27 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 551409557C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 11 May 2016 23:18:27 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga103.jf.intel.com with ESMTP; 11 May 2016 16:18:26 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.173])\n\tby orsmga001.jf.intel.com with ESMTP; 11 May 2016 16:18:27 -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.24,609,1455004800\"; d=\"scan'208\";a=\"951359141\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 11 May 2016 16:18:22 -0700", "Message-Id": "<20160511231824.22542-4-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.1.493.g7b22612", "In-Reply-To": "<20160511231824.22542-1-jacob.e.keller@intel.com>", "References": "<20160511231824.22542-1-jacob.e.keller@intel.com>", "Cc": "Vidya Sagar <sagar.tv@gmail.com>", "Subject": "[Intel-wired-lan] [net v2 3/5] igb: introduce igb_ptp_resume\n\tfunction", "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": "Modify igb_ptp_init to take advantage of igb_ptp_resume, and remove\nduplicated work that was occurring in both igb_ptp_reset and\nigb_ptp_init.\n\nIn total, resetting the TSAUXC register, and resetting the system time\nboth happen in igb_ptp_reset already, which the new igb_ptp_resume\ncalls. igb_ptp_resume also takes care of starting the delayed work item\nfor overflow checks, as well.\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 | 57 ++++++++++++++++----------------\n 2 files changed, 29 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex 38daaaba0cdb..fcba5ebba5ab 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -550,6 +550,7 @@ void igb_set_fw_version(struct igb_adapter *);\n void igb_ptp_init(struct igb_adapter *adapter);\n void igb_ptp_stop(struct igb_adapter *adapter);\n void igb_ptp_reset(struct igb_adapter *adapter);\n+void igb_ptp_resume(struct igb_adapter *adapter);\n void igb_ptp_rx_hang(struct igb_adapter *adapter);\n void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);\n void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va,\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c\nindex e2c494ad1be0..6c7d05d35894 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ptp.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c\n@@ -1042,6 +1042,29 @@ int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr)\n \t\t-EFAULT : 0;\n }\n \n+/**\n+ * igb_ptp_resume - Restart PTP and associated work items\n+ * @adapter: Board private structure\n+ *\n+ * This function restarts the overflow check if required, and calls\n+ * igb_ptp_reset to restore proper functionality after the machine resumes.\n+ */\n+void igb_ptp_resume(struct igb_adapter *adapter)\n+{\n+\tif (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK)\n+\t\tschedule_delayed_work(&adapter->ptp_overflow_work,\n+\t\t\t\t IGB_SYSTIM_OVERFLOW_PERIOD);\n+\n+\tigb_ptp_reset(adapter);\n+}\n+\n+/**\n+ * igb_ptp_init - Initialize PTP functionality\n+ * @adapter: Board private structure\n+ *\n+ * This function is called at device probe to initialize the PTP\n+ * functionality.\n+ */\n void igb_ptp_init(struct igb_adapter *adapter)\n {\n \tstruct e1000_hw *hw = &adapter->hw;\n@@ -1064,8 +1087,6 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t\tadapter->cc.mask = CYCLECOUNTER_MASK(64);\n \t\tadapter->cc.mult = 1;\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@@ -1085,8 +1106,6 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t\tadapter->cc.mask = CYCLECOUNTER_MASK(IGB_NBITS_82580);\n \t\tadapter->cc.mult = 1;\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@@ -1112,46 +1131,24 @@ void igb_ptp_init(struct igb_adapter *adapter)\n \t\tadapter->ptp_caps.settime64 = igb_ptp_settime_i210;\n \t\tadapter->ptp_caps.enable = igb_ptp_feature_enable_i210;\n \t\tadapter->ptp_caps.verify = igb_ptp_verify_pin;\n-\t\t/* Enable the timer functions by clearing bit 31. */\n-\t\twr32(E1000_TSAUXC, 0x0);\n \t\tbreak;\n \tdefault:\n \t\tadapter->ptp_clock = NULL;\n \t\treturn;\n \t}\n \n-\twrfl();\n-\n \tspin_lock_init(&adapter->tmreg_lock);\n \tINIT_WORK(&adapter->ptp_tx_work, igb_ptp_tx_work);\n \n-\t/* Initialize the clock and overflow work for devices that need it. */\n-\tif ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) {\n-\t\tstruct timespec64 ts = ktime_to_timespec64(ktime_get_real());\n-\n-\t\tigb_ptp_settime_i210(&adapter->ptp_caps, &ts);\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+\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-\t\tschedule_delayed_work(&adapter->ptp_overflow_work,\n-\t\t\t\t IGB_SYSTIM_OVERFLOW_PERIOD);\n-\t}\n-\n-\t/* Initialize the time sync interrupts for devices that support it. */\n-\tif (hw->mac.type >= e1000_82580) {\n-\t\twr32(E1000_TSIM, TSYNC_INTERRUPTS);\n-\t\twr32(E1000_IMS, E1000_IMS_TS);\n-\t}\n-\n \tadapter->tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;\n \tadapter->tstamp_config.tx_type = HWTSTAMP_TX_OFF;\n \n+\tigb_ptp_resume(adapter);\n+\n \tadapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps,\n \t\t\t\t\t\t&adapter->pdev->dev);\n \tif (IS_ERR(adapter->ptp_clock)) {\n@@ -1243,4 +1240,6 @@ void igb_ptp_reset(struct igb_adapter *adapter)\n \t}\n out:\n \tspin_unlock_irqrestore(&adapter->tmreg_lock, flags);\n+\n+\twrfl();\n }\n", "prefixes": [ "net", "v2", "3/5" ] }