Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/625926/?format=api
{ "id": 625926, "url": "http://patchwork.ozlabs.org/api/patches/625926/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160524205631.21225-3-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": "<20160524205631.21225-3-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-05-24T20:56:29", "name": "[v4,3/5] igb: re-use igb_ptp_reset in igb_ptp_init", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6ebaaf3019bd7656f33be7caf6afdace27e96914", "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/20160524205631.21225-3-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/625926/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/625926/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3rDnlG59M9z9sds\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 25 May 2016 06:56:42 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4F374A6C3C;\n\tTue, 24 May 2016 20:56:41 +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 Iv_RAt5HIwP4; Tue, 24 May 2016 20:56:40 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 79E9CA6461;\n\tTue, 24 May 2016 20:56:40 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9F3F01C0E3F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 24 May 2016 20:56:37 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9B3C0923E8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 24 May 2016 20:56:37 +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 yvMTXlULL+iF for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 24 May 2016 20:56:33 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C8C6A924C7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 24 May 2016 20:56:33 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga104.fm.intel.com with ESMTP; 24 May 2016 13:56:33 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.173])\n\tby FMSMGA003.fm.intel.com with ESMTP; 24 May 2016 13:56:33 -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,360,1459839600\"; d=\"scan'208\";a=\"708329479\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Tue, 24 May 2016 13:56:29 -0700", "Message-Id": "<20160524205631.21225-3-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.2.820.gd1c5f70", "In-Reply-To": "<20160524205631.21225-1-jacob.e.keller@intel.com>", "References": "<20160524205631.21225-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v4 3/5] igb: re-use igb_ptp_reset in\n\tigb_ptp_init", "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_reset, 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. igb_ptp_reset now also takes care\nof starting the delayed work item for overflow checks, as well.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/igb/igb_main.c | 3 +-\n drivers/net/ethernet/intel/igb/igb_ptp.c | 48 +++++++++++--------------------\n 2 files changed, 18 insertions(+), 33 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 21727692bef6..0321f0884fa0 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -2027,7 +2027,8 @@ void igb_reset(struct igb_adapter *adapter)\n \twr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE);\n \n \t/* Re-enable PTP, where applicable. */\n-\tigb_ptp_reset(adapter);\n+\tif (adapter->ptp_flags & IGB_PTP_ENABLED)\n+\t\tigb_ptp_reset(adapter);\n \n \tigb_get_phy_info(hw);\n }\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c\nindex 88d367d5a78d..907c225d9b20 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ptp.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c\n@@ -1043,6 +1043,13 @@ int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr)\n \t\t-EFAULT : 0;\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@@ -1065,8 +1072,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@@ -1086,8 +1091,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@@ -1113,46 +1116,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_reset(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@@ -1205,9 +1186,6 @@ void igb_ptp_reset(struct igb_adapter *adapter)\n \tstruct e1000_hw *hw = &adapter->hw;\n \tunsigned long flags;\n \n-\tif (!(adapter->ptp_flags & IGB_PTP_ENABLED))\n-\t\treturn;\n-\n \t/* reset the tstamp_config */\n \tigb_ptp_set_timestamp_mode(adapter, &adapter->tstamp_config);\n \n@@ -1244,4 +1222,10 @@ 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+\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", "prefixes": [ "v4", "3/5" ] }