Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/747629/?format=api
{ "id": 747629, "url": "http://patchwork.ozlabs.org/api/patches/747629/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170406072703.10810-1-sasha.neftin@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": "<20170406072703.10810-1-sasha.neftin@intel.com>", "list_archive_url": null, "date": "2017-04-06T07:27:03", "name": "[3/3] e1000e: Add Support for 38.4MHZ frequency", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1afd7a81633e9169e45649cfdd9a856c536da791", "submitter": { "id": 69860, "url": "http://patchwork.ozlabs.org/api/people/69860/?format=api", "name": "Sasha Neftin", "email": "sasha.neftin@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/20170406072703.10810-1-sasha.neftin@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/747629/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/747629/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 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 3vzDn00sq0z9s8Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 6 Apr 2017 17:27:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 986BC301E0;\n\tThu, 6 Apr 2017 07:27:14 +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 Yc7as-puDJQs; Thu, 6 Apr 2017 07:27:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id CEDB630283;\n\tThu, 6 Apr 2017 07:27:09 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 39D221C03CF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Apr 2017 07:27:08 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 310363021A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Apr 2017 07:27:08 +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 4YK1VgmYz3Jm for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Apr 2017 07:27:07 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E1DC630236\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Apr 2017 07:27:06 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Apr 2017 00:27:06 -0700", "from ccdlinuxdev01.ger.corp.intel.com (HELO\n\tccdlinuxdev01.iil.intel.com) ([143.185.162.145])\n\tby fmsmga001.fm.intel.com with ESMTP; 06 Apr 2017 00:27:04 -0700" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"key not found in DNS\" (0-bit key;\n\tunprotected) header.d=intel.com header.i=@intel.com\n\theader.b=\"nq39HaTY\"; dkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=simple/simple;\n\td=intel.com; i=@intel.com; q=dns/txt; s=intel;\n\tt=1491463626; x=1522999626;\n\th=from:to:cc:subject:date:message-id;\n\tbh=5GvObFJEtOI+V9AYyyw0kmvcu81CgLgG7N+dWXY/SOQ=;\n\tb=nq39HaTYWEMcKf6M8RKuwDLgirX3DTIEp37wQ2cjkN1gHMnhFvMiY0WB\n\tXRsGCXaW5p9bePV6P+gxHSX+OCJxLA==;", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.37,283,1488873600\"; d=\"scan'208\";\n\ta=\"1131699323\"", "From": "Sasha Neftin <sasha.neftin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org,\n\tjeffrey.t.kirsher@intel.com", "Date": "Thu, 6 Apr 2017 10:27:03 +0300", "Message-Id": "<20170406072703.10810-1-sasha.neftin@intel.com>", "X-Mailer": "git-send-email 2.11.0", "Subject": "[Intel-wired-lan] [PATCH 3/3] e1000e: Add Support for 38.4MHZ\n\tfrequency", "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": "Description: add support for 38.4MHz frequency is required for PTP\non CannonLake. SYSTIM frequency adjustment attributes for TIMINCA are\nget/set dependent on the hardware clock frequency for a different\ntypes of adapters. 38.4MHz frequency supported by CannonLake\nand active once time synchronisation mechanism was enabled\nChanged abbreviation from Hz to HZ to be compliant checkpatch code style\n\nReviewed-by: Raanan Avargil <raanan.avargil@intel.com>\nReviewed-by: Dima Ruinskiy <dima.ruinskiy@intel.com>\nSigned-off-by: Sasha Neftin <sasha.neftin@intel.com>\n---\n drivers/net/ethernet/intel/e1000e/e1000.h | 28 ++++++++++--------\n drivers/net/ethernet/intel/e1000e/netdev.c | 47 +++++++++++++++++++++---------\n 2 files changed, 50 insertions(+), 25 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h\nindex f16d9826c66d..c7c994eb410e 100644\n--- a/drivers/net/ethernet/intel/e1000e/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000e/e1000.h\n@@ -379,18 +379,22 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca);\n * INCVALUE_n into the TIMINCA register allowing 32+8+(24-INCVALUE_SHIFT_n)\n * bits to count nanoseconds leaving the rest for fractional nonseconds.\n */\n-#define INCVALUE_96MHz\t\t125\n-#define INCVALUE_SHIFT_96MHz\t17\n-#define INCPERIOD_SHIFT_96MHz\t2\n-#define INCPERIOD_96MHz\t\t(12 >> INCPERIOD_SHIFT_96MHz)\n-\n-#define INCVALUE_25MHz\t\t40\n-#define INCVALUE_SHIFT_25MHz\t18\n-#define INCPERIOD_25MHz\t\t1\n-\n-#define INCVALUE_24MHz\t\t125\n-#define INCVALUE_SHIFT_24MHz\t14\n-#define INCPERIOD_24MHz\t\t3\n+#define INCVALUE_96MHZ\t\t125\n+#define INCVALUE_SHIFT_96MHZ\t17\n+#define INCPERIOD_SHIFT_96MHZ\t2\n+#define INCPERIOD_96MHZ\t\t(12 >> INCPERIOD_SHIFT_96MHZ)\n+\n+#define INCVALUE_25MHZ\t\t40\n+#define INCVALUE_SHIFT_25MHZ\t18\n+#define INCPERIOD_25MHZ\t\t1\n+\n+#define INCVALUE_24MHZ\t\t125\n+#define INCVALUE_SHIFT_24MHZ\t14\n+#define INCPERIOD_24MHZ\t\t3\n+\n+#define INCVALUE_38400KHZ\t26\n+#define INCVALUE_SHIFT_38400KHZ\t19\n+#define INCPERIOD_38400KHZ\t1\n \n /* Another drawback of scaling the incvalue by a large factor is the\n * 64-bit SYSTIM register overflows more quickly. This is dealt with\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex dc83ac92cb67..22e99b0ca24d 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -3508,37 +3508,58 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \n \tswitch (hw->mac.type) {\n \tcase e1000_pch2lan:\n+\t\t/* Stable 96MHz frequency */\n+\t\tincperiod = INCPERIOD_96MHZ;\n+\t\tincvalue = INCVALUE_96MHZ;\n+\t\tshift = INCVALUE_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 \t\t\t/* Stable 96MHz frequency */\n-\t\t\tincperiod = INCPERIOD_96MHz;\n-\t\t\tincvalue = INCVALUE_96MHz;\n-\t\t\tshift = INCVALUE_SHIFT_96MHz;\n-\t\t\tadapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;\n+\t\t\tincperiod = INCPERIOD_96MHZ;\n+\t\t\tincvalue = INCVALUE_96MHZ;\n+\t\t\tshift = INCVALUE_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\tincperiod = INCPERIOD_25MHZ;\n+\t\t\tincvalue = INCVALUE_25MHZ;\n+\t\t\tshift = INCVALUE_SHIFT_25MHZ;\n \t\t\tadapter->cc.shift = shift;\n \t\t}\n \t\tbreak;\n \tcase e1000_pch_spt:\n \t\tif (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {\n \t\t\t/* Stable 24MHz frequency */\n-\t\t\tincperiod = INCPERIOD_24MHz;\n-\t\t\tincvalue = INCVALUE_24MHz;\n-\t\t\tshift = INCVALUE_SHIFT_24MHz;\n+\t\t\tincperiod = INCPERIOD_24MHZ;\n+\t\t\tincvalue = INCVALUE_24MHZ;\n+\t\t\tshift = INCVALUE_SHIFT_24MHZ;\n \t\t\tadapter->cc.shift = shift;\n \t\t\tbreak;\n \t\t}\n \t\treturn -EINVAL;\n+\tcase e1000_pch_cnp:\n+\t\tif (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {\n+\t\t\t/* Stable 24MHz frequency */\n+\t\t\tincperiod = INCPERIOD_24MHZ;\n+\t\t\tincvalue = INCVALUE_24MHZ;\n+\t\t\tshift = INCVALUE_SHIFT_24MHZ;\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->cc.shift = shift;\n+\t\t}\n+\t\tbreak;\n \tcase e1000_82574:\n \tcase e1000_82583:\n \t\t/* Stable 25MHz frequency */\n-\t\tincperiod = INCPERIOD_25MHz;\n-\t\tincvalue = INCVALUE_25MHz;\n-\t\tshift = INCVALUE_SHIFT_25MHz;\n+\t\tincperiod = INCPERIOD_25MHZ;\n+\t\tincvalue = INCVALUE_25MHZ;\n+\t\tshift = INCVALUE_SHIFT_25MHZ;\n \t\tadapter->cc.shift = shift;\n \t\tbreak;\n \tdefault:\n", "prefixes": [ "3/3" ] }