Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/849012/?format=api
{ "id": 849012, "url": "http://patchwork.ozlabs.org/api/patches/849012/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1513323522-15021-9-git-send-email-sagar.a.kamble@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": "<1513323522-15021-9-git-send-email-sagar.a.kamble@intel.com>", "list_archive_url": null, "date": "2017-12-15T07:38:23", "name": "[08/27] e1000e: Use timecounter_initialize interface", "commit_ref": null, "pull_url": null, "state": "awaiting-upstream", "archived": false, "hash": "ef3a15faee7c68143c654927461afba234bbe8da", "submitter": { "id": 72926, "url": "http://patchwork.ozlabs.org/api/people/72926/?format=api", "name": "Sagar Arun Kamble", "email": "sagar.a.kamble@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/1513323522-15021-9-git-send-email-sagar.a.kamble@intel.com/mbox/", "series": [ { "id": 18670, "url": "http://patchwork.ozlabs.org/api/series/18670/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=18670", "date": "2017-12-15T07:38:16", "name": "[01/27] timecounter: Make cyclecounter struct part of timecounter struct", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/18670/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/849012/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/849012/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 3yyhzw03RSz9t2Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Dec 2017 18:35:39 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DC3D42C8FA;\n\tFri, 15 Dec 2017 07:35:37 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id umDt54GtBWqn; Fri, 15 Dec 2017 07:35:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9CE302F270;\n\tFri, 15 Dec 2017 07:35:35 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id C636F1C436E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Dec 2017 07:35:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C0F1326F66\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Dec 2017 07:35:34 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id PpvGLOey958h for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Dec 2017 07:35:34 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E21BD265B2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Dec 2017 07:35:33 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Dec 2017 23:35:31 -0800", "from sakamble-desktop.iind.intel.com ([10.223.26.118])\n\tby orsmga004.jf.intel.com with ESMTP; 14 Dec 2017 23:35:29 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.45,403,1508828400\"; d=\"scan'208\";a=\"158949265\"", "From": "Sagar Arun Kamble <sagar.a.kamble@intel.com>", "To": "linux-kernel@vger.kernel.org", "Date": "Fri, 15 Dec 2017 13:08:23 +0530", "Message-Id": "<1513323522-15021-9-git-send-email-sagar.a.kamble@intel.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1513323522-15021-1-git-send-email-sagar.a.kamble@intel.com>", "References": "<1513323522-15021-1-git-send-email-sagar.a.kamble@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 08/27] e1000e: Use timecounter_initialize\n\tinterface", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "intel-wired-lan@lists.osuosl.org,\n\tRichard Cochran <richardcochran@gmail.com>,\n\tSagar Arun Kamble <sagar.a.kamble@intel.com>, netdev@vger.kernel.org", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "With new interface timecounter_initialize we can initialize timecounter\nfields and underlying cyclecounter together. Update e1000e timecounter\ninit with this new function.\n\nSigned-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>\nCc: Richard Cochran <richardcochran@gmail.com>\nCc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nCc: intel-wired-lan@lists.osuosl.org\nCc: netdev@vger.kernel.org\nCc: linux-kernel@vger.kernel.org\n---\n drivers/net/ethernet/intel/e1000e/e1000.h | 4 ++++\n drivers/net/ethernet/intel/e1000e/netdev.c | 31 +++++++++++++++++-------------\n 2 files changed, 22 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h\nindex b59f82a..d6b0e59 100644\n--- a/drivers/net/ethernet/intel/e1000e/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000e/e1000.h\n@@ -341,6 +341,10 @@ struct e1000_adapter {\n \tstruct work_struct tx_hwtstamp_work;\n \tspinlock_t systim_lock;\t/* protects SYSTIML/H regsters */\n \tstruct timecounter tc;\n+\tu64 (*cc_read)(const struct cyclecounter *cc);\n+\tu64 cc_mask;\n+\tu32 cc_mult;\n+\tu32 cc_shift;\n \tstruct ptp_clock *ptp_clock;\n \tstruct ptp_clock_info ptp_clock_info;\n \tstruct pm_qos_request pm_qos_req;\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex c9f7ba3..6be1327 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -3536,7 +3536,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \t\tincperiod = INCPERIOD_96MHZ;\n \t\tincvalue = INCVALUE_96MHZ;\n \t\tshift = INCVALUE_SHIFT_96MHZ;\n-\t\tadapter->tc.cc.shift = shift + INCPERIOD_SHIFT_96MHZ;\n+\t\tadapter->cc_shift = shift + INCPERIOD_SHIFT_96MHZ;\n \t\tbreak;\n \tcase e1000_pch_lpt:\n \t\tif (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {\n@@ -3544,13 +3544,13 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \t\t\tincperiod = INCPERIOD_96MHZ;\n \t\t\tincvalue = INCVALUE_96MHZ;\n \t\t\tshift = INCVALUE_SHIFT_96MHZ;\n-\t\t\tadapter->tc.cc.shift = shift + INCPERIOD_SHIFT_96MHZ;\n+\t\t\tadapter->cc_shift = shift + INCPERIOD_SHIFT_96MHZ;\n \t\t} else {\n \t\t\t/* Stable 25MHz frequency */\n \t\t\tincperiod = INCPERIOD_25MHZ;\n \t\t\tincvalue = INCVALUE_25MHZ;\n \t\t\tshift = INCVALUE_SHIFT_25MHZ;\n-\t\t\tadapter->tc.cc.shift = shift;\n+\t\t\tadapter->cc_shift = shift;\n \t\t}\n \t\tbreak;\n \tcase e1000_pch_spt:\n@@ -3559,7 +3559,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \t\t\tincperiod = INCPERIOD_24MHZ;\n \t\t\tincvalue = INCVALUE_24MHZ;\n \t\t\tshift = INCVALUE_SHIFT_24MHZ;\n-\t\t\tadapter->tc.cc.shift = shift;\n+\t\t\tadapter->cc_shift = shift;\n \t\t\tbreak;\n \t\t}\n \t\treturn -EINVAL;\n@@ -3569,13 +3569,13 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \t\t\tincperiod = INCPERIOD_24MHZ;\n \t\t\tincvalue = INCVALUE_24MHZ;\n \t\t\tshift = INCVALUE_SHIFT_24MHZ;\n-\t\t\tadapter->tc.cc.shift = shift;\n+\t\t\tadapter->cc_shift = shift;\n \t\t} else {\n \t\t\t/* Stable 38400KHz frequency */\n \t\t\tincperiod = INCPERIOD_38400KHZ;\n \t\t\tincvalue = INCVALUE_38400KHZ;\n \t\t\tshift = INCVALUE_SHIFT_38400KHZ;\n-\t\t\tadapter->tc.cc.shift = shift;\n+\t\t\tadapter->cc_shift = shift;\n \t\t}\n \t\tbreak;\n \tcase e1000_82574:\n@@ -3584,7 +3584,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \t\tincperiod = INCPERIOD_25MHZ;\n \t\tincvalue = INCVALUE_25MHZ;\n \t\tshift = INCVALUE_SHIFT_25MHZ;\n-\t\tadapter->tc.cc.shift = shift;\n+\t\tadapter->cc_shift = shift;\n \t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n@@ -3953,9 +3953,14 @@ static void e1000e_systim_reset(struct e1000_adapter *adapter)\n \t\treturn;\n \t}\n \n-\t/* reset the systim ns time counter */\n+\t/* reinitialize the systim ns time counter */\n \tspin_lock_irqsave(&adapter->systim_lock, flags);\n-\ttimecounter_init(&adapter->tc, ktime_to_ns(ktime_get_real()));\n+\ttimecounter_initialize(&adapter->tc,\n+\t\t\t adapter->cc_read,\n+\t\t\t adapter->cc_mask,\n+\t\t\t adapter->cc_mult,\n+\t\t\t adapter->cc_shift,\n+\t\t\t ktime_to_ns(ktime_get_real()));\n \tspin_unlock_irqrestore(&adapter->systim_lock, flags);\n \n \t/* restore the previous hwtstamp configuration settings */\n@@ -4448,10 +4453,10 @@ static int e1000_sw_init(struct e1000_adapter *adapter)\n \n \t/* Setup hardware time stamping cyclecounter */\n \tif (adapter->flags & FLAG_HAS_HW_TIMESTAMP) {\n-\t\tadapter->tc.cc.read = e1000e_cyclecounter_read;\n-\t\tadapter->tc.cc.mask = CYCLECOUNTER_MASK(64);\n-\t\tadapter->tc.cc.mult = 1;\n-\t\t/* tc.cc.shift set in e1000e_get_base_tininca() */\n+\t\tadapter->cc_read = e1000e_cyclecounter_read;\n+\t\tadapter->cc_mask = CYCLECOUNTER_MASK(64);\n+\t\tadapter->cc_mult = 1;\n+\t\t/* cc_shift set in e1000e_get_base_tininca() */\n \n \t\tspin_lock_init(&adapter->systim_lock);\n \t\tINIT_WORK(&adapter->tx_hwtstamp_work, e1000e_tx_hwtstamp_work);\n", "prefixes": [ "08/27" ] }