Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/609846/?format=api
{ "id": 609846, "url": "http://patchwork.ozlabs.org/api/patches/609846/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/e943a9f336c2dd089fdc6c1dafbf768bc0983075.1460517387.git.brian@walsh.ws/", "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": "<e943a9f336c2dd089fdc6c1dafbf768bc0983075.1460517387.git.brian@walsh.ws>", "list_archive_url": null, "date": "2016-04-13T03:22:31", "name": "[v2,2/2] e1000e: Fix ptp time reset on network interruption", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "d8f4f159cec08d44d085a076a267349933516b8d", "submitter": { "id": 68336, "url": "http://patchwork.ozlabs.org/api/people/68336/?format=api", "name": "Brian Walsh", "email": "brian@walsh.ws" }, "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/e943a9f336c2dd089fdc6c1dafbf768bc0983075.1460517387.git.brian@walsh.ws/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/609846/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/609846/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 3ql8TM4yR9z9sdm\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Apr 2016 13:30:47 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id CC21295D0C;\n\tWed, 13 Apr 2016 03:30:46 +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 kQ5DwA2vtUqm; Wed, 13 Apr 2016 03:30:46 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5C3EB95CE6;\n\tWed, 13 Apr 2016 03:30:46 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id D9CE71C120C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Apr 2016 03:30:44 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id D4ABF95D06\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Apr 2016 03:30:44 +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 XDWJHd5C4+z1 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Apr 2016 03:30:43 +0000 (UTC)", "from mail-yw0-f177.google.com (mail-yw0-f177.google.com\n\t[209.85.161.177])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 2B49695CE6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Apr 2016 03:30:43 +0000 (UTC)", "by mail-yw0-f177.google.com with SMTP id t10so52519799ywa.0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Apr 2016 20:30:43 -0700 (PDT)", "from hobbes.lan20.walshnetwork.net\n\t([2606:a000:4b40:8c01:c4a9:e7a0:24:9c26])\n\tby smtp.gmail.com with ESMTPSA id\n\t204sm19440428ywz.39.2016.04.12.20.22.37\n\tfor <intel-wired-lan@lists.osuosl.org>\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 12 Apr 2016 20:22:37 -0700 (PDT)", "from localhost.lan20.walshnetwork.net ([127.0.0.1]\n\thelo=hobbes.lan20.walshnetwork.net)\n\tby hobbes.lan20.walshnetwork.net with esmtp (Exim 4.84_2)\n\t(envelope-from <brian@walsh.ws>) id 1aqBNw-0004IH-3H\n\tfor intel-wired-lan@lists.osuosl.org; Tue, 12 Apr 2016 23:22:32 -0400" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=walsh.ws header.i=@walsh.ws header.b=Y43AAhCA;\n\tdkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Amavis-Alert": [ "BAD HEADER SECTION, Duplicate header field: \"References\"", "BAD HEADER SECTION, Duplicate header field: \"References\"" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=walsh.ws; s=google; \n\th=from:to:subject:date:message-id:in-reply-to:references:in-reply-to\n\t:references; bh=FMs1DLGLna8bK+5ooNZ+uo6W61+DdKiSNT7rAeyoMLA=;\n\tb=Y43AAhCAwM4jgZcbjo8MoXUpIbgWJh4w0S7SN8dsQc9DIsWCPgoLcnG9yr5ISnkaOG\n\tFLIR+Nzkc1RDu34UOhed+cwlVy78fhzCtq7Wo8NiZXYrz6ylWIwb0a+DtS0atBPhUC0D\n\tIzyhoO3cEehSislvg5vMm0UMdF9M2e0oxnclU=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references:in-reply-to:references;\n\tbh=FMs1DLGLna8bK+5ooNZ+uo6W61+DdKiSNT7rAeyoMLA=;\n\tb=POkxYbMIbgGFbwoxLY5BKOsgKISBdFaEYGdRhUBAsI+FOZQ0hwJhXQxzVNjQNvRsPY\n\ti+g1ncIyn6z5UAC6wEU/ULk2P+alDV4dLpOYy1rrtj4+iXlQmtMhF51InmaoVV3Ib8cq\n\t/9kSEn809yz+GpMOLvp1UDNME0s8BizuNovOE98alkGhi7LaehyNj+F7sFWK/ba1m3/m\n\tPeLHhtrFSoGH+6bz8JcjeDJoRG3BwPuo8xyQZ66hpJGyHFN/1Q3qj2Q4F1ziG5PeZFTp\n\tU9p89sqntkLfOpC7FNJ/BSdBrykLiHifMjjNwqkr6orrygMetB8HJU7o/d+telDCcp+b\n\tk2jw==", "X-Gm-Message-State": "AOPr4FVnqsb4lfdtLwDy0U4K1Ei3hXW45uGZD+UNMMxh7PhHVmOdj8GASOJwq0H+WZVr8w==", "X-Received": "by 10.129.122.207 with SMTP id v198mr3703231ywc.82.1460517758122;\n\tTue, 12 Apr 2016 20:22:38 -0700 (PDT)", "From": "Brian Walsh <brian@walsh.ws>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 12 Apr 2016 23:22:31 -0400", "Message-Id": "<e943a9f336c2dd089fdc6c1dafbf768bc0983075.1460517387.git.brian@walsh.ws>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": [ "<a17942d94a295a0db7ef205060b97313289b1640.1460517387.git.brian@walsh.ws>", "<1455662685-7231-1-git-send-email-brian@walsh.ws>" ], "References": [ "<a17942d94a295a0db7ef205060b97313289b1640.1460517387.git.brian@walsh.ws>", "<1455662685-7231-1-git-send-email-brian@walsh.ws>" ], "Subject": "[Intel-wired-lan] [PATCH v2 2/2] e1000e: Fix ptp time reset on\n\tnetwork interruption", "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": "Time is resetting on any interruption of network connectivity. This\ncauses the clock to jump around by the leapsecond offset. It should\nonly reset when the device is initialized.\n\nSigned-off-by: Brian Walsh <brian@walsh.ws>\n---\n drivers/net/ethernet/intel/e1000e/netdev.c | 22 +++++++++++-----------\n 1 file changed, 11 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex 370b0dc..98f645e 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -3580,7 +3580,6 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter,\n \tbool is_l4 = false;\n \tbool is_l2 = false;\n \tu32 regval;\n-\ts32 ret_val;\n \n \tif (!(adapter->flags & FLAG_HAS_HW_TIMESTAMP))\n \t\treturn -EINVAL;\n@@ -3719,16 +3718,6 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter,\n \ter32(RXSTMPH);\n \ter32(TXSTMPH);\n \n-\t/* Get and set the System Time Register SYSTIM base frequency */\n-\tret_val = e1000e_get_base_timinca(adapter, ®val);\n-\tif (ret_val)\n-\t\treturn ret_val;\n-\tew32(TIMINCA, regval);\n-\n-\t/* reset the ns time counter */\n-\ttimecounter_init(&adapter->tc, &adapter->cc,\n-\t\t\t ktime_to_ns(ktime_get_real()));\n-\n \treturn 0;\n }\n \n@@ -6966,6 +6955,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tu16 eeprom_data = 0;\n \tu16 eeprom_apme_mask = E1000_EEPROM_APME;\n \ts32 ret_val = 0;\n+\tu32 regval;\n \n \tif (ei->flags2 & FLAG2_DISABLE_ASPM_L0S)\n \t\taspm_disable_flag = PCIE_LINK_STATE_L0S;\n@@ -7256,6 +7246,16 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t/* carrier off reporting is important to ethtool even BEFORE open */\n \tnetif_carrier_off(netdev);\n \n+\t/* Get and set the System Time Register SYSTIM base frequency */\n+\tret_val = e1000e_get_base_timinca(adapter, ®val);\n+\tif (ret_val)\n+\t\tgoto err_register;\n+\tew32(TIMINCA, regval);\n+\n+\t/* reset the ns time counter */\n+\ttimecounter_init(&adapter->tc, &adapter->cc,\n+\t\t\t ktime_to_ns(ktime_get_real()));\n+\n \t/* init PTP hardware clock */\n \te1000e_ptp_init(adapter);\n \n", "prefixes": [ "v2", "2/2" ] }