Received: by 10.223.164.202 with SMTP id h10csp959505wrb; Tue, 7 Nov 2017 18:30:05 -0800 (PST) X-Google-Smtp-Source: ABhQp+T0o32I7Ix8UezBOCe/4Et4elqaoIYeHZVYp8VkXw24Q3rzTQfaCw3hwu3EB6utLZlwB/pj X-Received: by 10.84.200.39 with SMTP id s36mr726864pld.9.1510108205618; Tue, 07 Nov 2017 18:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510108205; cv=none; d=google.com; s=arc-20160816; b=XAVO9PyWJ8Z12LXKtW2xupKw44qVoNJbkmrPZEQJeqaKdN+S1xgmfNNFHMVQUW276V dOkNqrqHvA/6ZVKoiT4a4ExBndZTROo1sBahXpINepUYXY5T7zSct01cLpAioUsR9wIX F3v2pH1vkhIwrBEhhz4S85ly2dIT16EgcV3tBxlms7Nme7QGsgADGilywdyQ2PX7dgY1 +huqy/8Vee9xYrAnfrRFddCfaH/QCpPHMMiPmVal01VrtSVNxiuRuoyf1TmOGONoGf0R VQxS7Kn1nmYIPqAFkTWSFkPUVzzF6YqBYhHykggtvMEa2hdOmUfQgUX16yHPPfWS6DII j62A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:arc-authentication-results; bh=4qC+mtj6K8ZsV6e7G7EQL+NlCEu+ZbvnNYpanENYrY8=; b=sXYZzrr7iJhXgGY1TL+Lo8ia+hDtdRQsg9gFuchO1HoqFhxYA8sgjXqNAVMOTL5HMo H+eRDa17hUEQYBM/3COR4/BTJlQ/kxWTSZe9JSybuGTFzILMfDRzNQgp/w9OjAIKpN94 iAPXbB1IbPHI6eD0zwdiF4O4+Gr5ITDZCtNz/1fFTpJotRfcne9rp+PAlFl+czf3rtJi z41CWAvFq5Fi5/JXksw/MPvqmGNfHt7CdCF2o7vcae6e8GaJYIPtzmzkKVkDj1+NdVsl ZpmZfCcdpymekMOAtErDkU6bVr/+lsrz7fgKTffpj5E83fZZoIyMQbn3BfHftM1zjm95 2u/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com header.s=selector1-cavium-com header.b=F700v+03; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q7si2443924pgn.232.2017.11.07.18.29.53; Tue, 07 Nov 2017 18:30:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com header.s=selector1-cavium-com header.b=F700v+03; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933151AbdKGTH4 (ORCPT + 90 others); Tue, 7 Nov 2017 14:07:56 -0500 Received: from mail-by2nam01on0081.outbound.protection.outlook.com ([104.47.34.81]:45659 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933090AbdKGTHu (ORCPT ); Tue, 7 Nov 2017 14:07:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4qC+mtj6K8ZsV6e7G7EQL+NlCEu+ZbvnNYpanENYrY8=; b=F700v+03vjW1CTdGhV2ZB8ynRS8J/j/dKtCGCiAg7E45IWBw2MbntIOVCWj3ULDUOwSjoi5oJE3vAuqJfBYv9fWLun5o70Kz9xHAhWx2ULmxyPpKwRYPRNbCcZ+qJ3ZUBGEH+yQvGbODYeiDNESkzB4E+4n+n5cH88qnnvulA+Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Aleksey.Makarov@cavium.com; Received: from localhost.localdomain (46.242.12.6) by CO2PR07MB2488.namprd07.prod.outlook.com (10.166.200.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Tue, 7 Nov 2017 19:07:46 +0000 From: Aleksey Makarov To: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Goutham, Sunil" , Radoslaw Biernacki , Aleksey Makarov , Robert Richter , Sunil Goutham Subject: [PATCH net-next 2/2] net: thunderx: add timestamping support Date: Tue, 7 Nov 2017 22:07:02 +0300 Message-Id: <20171107190704.15458-3-aleksey.makarov@cavium.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171107190704.15458-1-aleksey.makarov@cavium.com> References: <20171107190704.15458-1-aleksey.makarov@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [46.242.12.6] X-ClientProxiedBy: AM5PR0701CA0059.eurprd07.prod.outlook.com (10.169.145.149) To CO2PR07MB2488.namprd07.prod.outlook.com (10.166.200.146) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a7760f5-d26c-4f0a-786f-08d52612d5ea X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:CO2PR07MB2488; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2488;3:bTSDlamZQxa3vN7xg7SEWZcUwrbksiO03vZ4gczei+tO1iDRSU8V/ClCqm1zTlAcOIsGHTkQG92/STLM3Zlx2CgK41V0z7iKdaLKt4KjQhFfm2AjYhLvWgqbwu5sugLCwn1kWDUJIWB2B78fxttmJ256yuGXG4+kvsaJ62JJKK/8DgA4RyyAmlXfSotZDYI0PkneJL014fSbmxVnJ3IqOoaNwg95oQ/eblq6KOjlxGIzE6wRA9upJDtTVUKrMosX;25:X9Zl7sT5HNixTiOtlpV2QuIFywpBEweuQWNO+OnKIPb+5ioDA6+/Hnd5ZXC05/cO3+BLjajQ/UxspE+P1904XHXP9sqUFRUmi9tpwVGHJ6UvWdRQL9OXD4XUW9IgaIdoovGKEW0devvol4w3RIxFaBSI1+nMVRpb6TMmQb5rRCt+p/qlnZV2eM4LVVaTrv35Is56sPjk+cvdIUokqjMwnz3T4Kz9Qfzolox7DXboI3pX7lT2VuxOsruPMvcrh8x3xEwrBtkxgDwWNJ1HOJZ7Ln8uqtiP2wVf2/hKBBqRDMB/mUw02NpP6zpS7xZphuwYmWPr3RRH+NOCFNz+rRKavA==;31:pI9pcrQ6BLkvzkePaR8PuQ6vVfG+QUobNovUcTkrEXdVo6U4L3f2eR/mPwnPeRlUVoMGyo2T9Txhs5fnoV/QVsomIrClanCyX2Loj+LxkquitVOSWEZYm9DrxV95ojop8VQDyHiLbozFhsddmkHv/kOlrLa+7jfD1Y07p1FLBoWk3SMpc51aTwTR7OTKiPh6tBTTwEPN2exdPwCVdR3qsVwHR7s4O2k4hBExnSTFBIk= X-MS-TrafficTypeDiagnostic: CO2PR07MB2488: X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2488;20:rnhp5j+y96fYK+kxPr0zQA/uIZeze9DyHWVgvlvUVwDtAPEELhSdnM5gM85CpJETROxwcGIuTuja1RvR+RDQQ/PXeHVYujd1UiItoBgBt9oFIm5ookQ8UPSSofxhhc3dG67Gb63k3tqiGb3rc3nFOH3pzRFvIDb8fiFNkIPWDzLBMpGvFG5dPHO/iRiRNLdvl8wVCif1yBQraJMTRrRk1/q2CmVb+yW5CZhMDzVkDU38RE8IUhC9pgYw+H10KF2fRXYJ54IsRZHDPM3T+OQ619YmwUqmOXqgSqOus0iA+HWsRh4jEZrxoGV+ebazIPRYOvHm9LW4eei1G52izHEvdZfsREbL7Ildg66/hEwU2+tfKSt5Kj0cPmBVFXUWxg4FMU4lFwLn8wuSNZ7WqdTfRabNtR70FXTVoAthM6Mu/OrI82fLU2dJJiceFaArFcZ46j9qA+bCzvKiVT3lm1pau399HjewKHbJS4gND5M6MCRmjO749xI8suozvtxjoANx;4:0hCSdTOWBboXRGca4kFusf+MRP5Vr+1LkLZKAcZRM1WAA/am7c9QOSvoIs1xAIn6wc3PxwbD6rYWdIat3B/uaiId+gTNh3EnzWwcSyIbozkEetB8NR3JLG/bBfhRqLFidsUJltZn2aDWUfr6huwJ6YfQFVHagmlw+HueKf92P1q70FMe4+mNr0TSJtVIXeb7ZqKzJrGVlC35tMObb7XzTq0pi2W9iNW/O7PGxJimSZVpa2LzIu0DKedP8kaWXmVip5qFWRVZIjog4YWEEAGC5A== X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231021)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CO2PR07MB2488;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CO2PR07MB2488; X-Forefront-PRVS: 0484063412 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6069001)(6009001)(376002)(346002)(199003)(189002)(316002)(6916009)(101416001)(50986999)(6506006)(575784001)(25786009)(6666003)(6486002)(72206003)(5660300001)(6116002)(3846002)(36756003)(86362001)(1076002)(2950100002)(478600001)(76176999)(105586002)(106356001)(47776003)(66066001)(2361001)(2351001)(5003940100001)(50466002)(53936002)(68736007)(81166006)(81156014)(8676002)(7736002)(8936002)(48376002)(50226002)(33646002)(305945005)(107886003)(54906003)(97736004)(16526018)(189998001)(16586007)(2906002)(4326008)(6512007);DIR:OUT;SFP:1101;SCL:1;SRVR:CO2PR07MB2488;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO2PR07MB2488;23:yxwL0Mz89uYvSC9wYDHCltTMrVOc5aOcqpdqr3l4e?= =?us-ascii?Q?XZuuJ2ijqoCqGbOYbQFM4ksXr5ouAQBe0RONDcp1M6acl6+HqPP86iDWlWY5?= =?us-ascii?Q?DT8YP81ZZwQwi5OFTPsDjQqzSDy2cYE2SEsHbbvEx+VMUw9Me1OeBxbEnuz2?= =?us-ascii?Q?5FXVC0EpZ9V5v9oB7AGvY1TH3adRP2eu+pt37rrjN32zvUWDHALn/7/pWM45?= =?us-ascii?Q?ONXebJ1JAl7Wqx4MLiTmpjeLLMnbtTPOcfQqLO2frHDnbVBT4nTYnsl8uzrW?= =?us-ascii?Q?mUjDxyPa1eVqI8bavToiXHnGvYQhCPEqGZmVX8ehJiO7iyNNaJmrp3uiCLxv?= =?us-ascii?Q?n6WSYbpSXWC+AyZTQwJM8mpwKs2aFkU+OLHSbI71ayuH1OF/2O6V1+QrHzfn?= =?us-ascii?Q?w0uCVfBSpczQP9TTmpT7ugMfzf9T2J/3leNrb9u9tSfqhnHMRKCeUCEr5oQG?= =?us-ascii?Q?quFIyF0MxceFeiq/boTD1n8ggzJTLRLAHbGFpjKeUM4D3fukXlVg/fgYusoh?= =?us-ascii?Q?foUusX40OerKLmVaGjQhC91uE8UrWd6+usZWuwaWksvJr8WJAK081OYMEpvY?= =?us-ascii?Q?qop9V99qcgwQ7WFvA8TVgTZuV0xDHjPaurNolp8EqjW/lcZpiAw2TXRJSxwL?= =?us-ascii?Q?c3P/dDHAILNDha6OB7nfj0e0rxJ88V/HN2OwXaWDCwu6YNDdqT8DuXDxFeps?= =?us-ascii?Q?SU5jheuc9GjmJ08fC/0ONcoNDxdvcuo7I/UqsKCCd1lxz37fJF4ev3n5/j4G?= =?us-ascii?Q?S9jSYSYTfSzZwxo+F4liAYa2jKl/tnApdCynQAUTwCVbVxPbLPiomir4TxBF?= =?us-ascii?Q?AmWvwHDj8O9MYKnGDGTTXb7Lqhvx6cRllC9G1Ycb8w9b2PENhFLl3Aw7YrTj?= =?us-ascii?Q?AidlgFxgD55dbyrBEK1yc5VeIVPGksh0ljiJfqmmpJaByJqeLFgEudxoQthA?= =?us-ascii?Q?xjuaHa+HQF9yzjS5PxRpkwt0uG1eXStfx97eVwtnXbTLqJVMQInqCVoHehX6?= =?us-ascii?Q?DXXq7GTQq1jjPzzWLiDRdQb4BGBGkWkN7X6jGfsSvB1LRI7GDd562Jt2i1Y8?= =?us-ascii?Q?hTaqneD2Pjz6dOfLBCQYOJo9RRxAMXW7KD46/GyNNmD3llte06VcCUUWgwCK?= =?us-ascii?Q?cNm2zRr7NQ05SH2mgyUNeUWRwu9Zm/boYn3pRaF4T9qN2BUy8eHaf5x02ygA?= =?us-ascii?Q?z3frBvcQi31UhCQK6AUQ3yl1nm3yJ6tD88HJXKSxJ+7Lnqg0EJN5xhdTw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2488;6:SE5dhKMSu1pc/+ZSoEhOf2r7dEuWmN7eF9eJcamXezlmuarUiyShZY7ZOrTOW8/Rbm9Cpusg4gElniR1m3F+XFfuwM2P3KdqBqBDfbGJMaSaXOrr3mu79+waX8oe8o1/ZEzwpOdrteIZ/v+TceSWlfrY5O7mTYqvQUYpNzXAs2ACakG34i09U0zzbyl80xWtWGLMNInnWgJ7ozcdo1wlXauAENcuXvMhjfayt9QFxUAZQHSDSptsMzRUCiyAwKF545Lr7/oW3wZzwSD9pk/Vg44uSGLHHkiCfNdw0ror+Z7cYCEr2MvGOQvAt0JgaRacWNttK1SCE/0P27dDxsQlZ0TLsMx7iZWNbUX5h+8u00A=;5:lU4XQZqBf0UxZlrE+aLtAvgyeKOYTIecQV8Rz9ysO1VsVmX47udKt3Ua1s488pMWpTQC2yHQtRAX1weAdWzrX69CM83j9pTFBBdMGF5HzdoHEYhImuReZbjvYVmhkb1F2RcXzPO2zU1kLCDnCO6OmPG45FJfnQn20JpOx369oT4=;24:ZjOdtooPzP6XaQlg5774BlfbD2Ill+lfWJZ6gxQmFvznB7bTOjsEvp51q9Po2z9f8G5VUty4WJ0dQvuKqqVAYDGYarDM8hkEBEsAsMbA7b4=;7:/IC+29JLQ/snuz84LbK1burC7H8pBbJWIOiIQ3dN9MY3EKXmf/GF3EKtm8dTsXN/2aPYgpdJOgNbc1XB5+nVvl7MpAST5m+y47jSglOKR6BPQJMLH5FNpnGaETX27SXAaTxEgXQpPMCKQs7ze4kDOq6dmixa7epBwbScCXLxZ7Ojq1UWxnljTOXhjkRyYokCNT7uStgz2KK9f4m7SCi+q4x1DahHfMME7z+vPhEtFjs8V1YFSN9xEoIdoPX73BN3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2017 19:07:46.1612 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a7760f5-d26c-4f0a-786f-08d52612d5ea X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB2488 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sunil Goutham This adds timestamping support for both receive and transmit paths. On the receive side no filters are supported i.e either all pkts will get a timestamp appended infront of the packet or none. On the transmit side HW doesn't support timestamp insertion but only generates a separate CQE with transmitted packet's timestamp. Also HW supports only one packet at a time for timestamping on the transmit side. Signed-off-by: Sunil Goutham Signed-off-by: Aleksey Makarov --- drivers/net/ethernet/cavium/Kconfig | 1 + drivers/net/ethernet/cavium/thunder/nic.h | 15 ++ drivers/net/ethernet/cavium/thunder/nic_main.c | 58 ++++++- drivers/net/ethernet/cavium/thunder/nic_reg.h | 1 + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 29 +++- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 173 ++++++++++++++++++++- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 26 ++++ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 29 ++++ drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 4 + 9 files changed, 330 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index 634c79a8c812..b61be4afc9b8 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -27,6 +27,7 @@ config THUNDER_NIC_PF config THUNDER_NIC_VF tristate "Thunder Virtual function driver" + select CAVIUM_PTP depends on 64BIT ---help--- This driver supports Thunder's NIC virtual function diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h index 4a02e618e318..204b234beb9d 100644 --- a/drivers/net/ethernet/cavium/thunder/nic.h +++ b/drivers/net/ethernet/cavium/thunder/nic.h @@ -263,6 +263,8 @@ struct nicvf_drv_stats { struct u64_stats_sync syncp; }; +struct cavium_ptp; + struct nicvf { struct nicvf *pnicvf; struct net_device *netdev; @@ -312,6 +314,12 @@ struct nicvf { struct tasklet_struct qs_err_task; struct work_struct reset_task; + /* PTP timestamp */ + struct cavium_ptp *ptp_clock; + bool hw_rx_tstamp; + struct sk_buff *ptp_skb; + atomic_t tx_ptp_skbs; + /* Interrupt coalescing settings */ u32 cq_coalesce_usecs; u32 msg_enable; @@ -371,6 +379,7 @@ struct nicvf { #define NIC_MBOX_MSG_LOOPBACK 0x16 /* Set interface in loopback */ #define NIC_MBOX_MSG_RESET_STAT_COUNTER 0x17 /* Reset statistics counters */ #define NIC_MBOX_MSG_PFC 0x18 /* Pause frame control */ +#define NIC_MBOX_MSG_PTP_CFG 0x19 /* HW packet timestamp */ #define NIC_MBOX_MSG_CFG_DONE 0xF0 /* VF configuration done */ #define NIC_MBOX_MSG_SHUTDOWN 0xF1 /* VF is being shutdown */ @@ -521,6 +530,11 @@ struct pfc { u8 fc_tx; }; +struct set_ptp { + u8 msg; + bool enable; +}; + /* 128 bit shared memory between PF and each VF */ union nic_mbx { struct { u8 msg; } msg; @@ -540,6 +554,7 @@ union nic_mbx { struct set_loopback lbk; struct reset_stat_cfg reset_stat; struct pfc pfc; + struct set_ptp ptp; }; #define NIC_NODE_ID_MASK 0x03 diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index fb770b0182d3..c12ab7f1adb9 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -460,13 +460,22 @@ static int nic_init_hw(struct nicpf *nic) /* Enable backpressure */ nic_reg_write(nic, NIC_PF_BP_CFG, (1ULL << 6) | 0x03); - /* TNS and TNS bypass modes are present only on 88xx */ + /* TNS and TNS bypass modes are present only on 88xx + * Also offset of this CSR has changed in 81xx and 83xx. + */ if (nic->pdev->subsystem_device == PCI_SUBSYS_DEVID_88XX_NIC_PF) { /* Disable TNS mode on both interfaces */ nic_reg_write(nic, NIC_PF_INTF_0_1_SEND_CFG, - (NIC_TNS_BYPASS_MODE << 7) | BGX0_BLOCK); + (NIC_TNS_BYPASS_MODE << 7) | + BGX0_BLOCK | (1ULL << 16)); nic_reg_write(nic, NIC_PF_INTF_0_1_SEND_CFG | (1 << 8), - (NIC_TNS_BYPASS_MODE << 7) | BGX1_BLOCK); + (NIC_TNS_BYPASS_MODE << 7) | + BGX1_BLOCK | (1ULL << 16)); + } else { + /* Configure timestamp generation timeout to 10us */ + for (i = 0; i < nic->hw->bgx_cnt; i++) + nic_reg_write(nic, NIC_PF_INTFX_SEND_CFG | (i << 3), + (1ULL << 16)); } nic_reg_write(nic, NIC_PF_INTF_0_1_BP_CFG, @@ -920,6 +929,46 @@ static void nic_pause_frame(struct nicpf *nic, int vf, struct pfc *cfg) } } +/* Enable or disable HW timestamping by BGX for pkts received on a LMAC */ +static void nic_config_timestamp(struct nicpf *nic, int vf, struct set_ptp *ptp) +{ + struct pkind_cfg *pkind; + u8 lmac, bgx_idx; + u64 pkind_val, pkind_idx; + + if (vf >= nic->num_vf_en) + return; + + bgx_idx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]); + lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]); + + pkind_idx = lmac + bgx_idx * MAX_LMAC_PER_BGX; + pkind_val = nic_reg_read(nic, NIC_PF_PKIND_0_15_CFG | (pkind_idx << 3)); + pkind = (struct pkind_cfg *)&pkind_val; + + if (ptp->enable && !pkind->hdr_sl) { + /* Skiplen to exclude 8byte timestamp while parsing pkt + * If not configured, will result in L2 errors. + */ + pkind->hdr_sl = 4; + /* Adjust max packet length allowed */ + pkind->maxlen += (pkind->hdr_sl * 2); + bgx_config_timestamping(nic->node, bgx_idx, lmac, true); + nic_reg_write(nic, + NIC_PF_RX_ETYPE_0_7 | (1 << 3), + (ETYPE_ALG_ENDPARSE << 16) | ETH_P_1588); + } else if (!ptp->enable && pkind->hdr_sl) { + pkind->maxlen -= (pkind->hdr_sl * 2); + pkind->hdr_sl = 0; + bgx_config_timestamping(nic->node, bgx_idx, lmac, false); + nic_reg_write(nic, + NIC_PF_RX_ETYPE_0_7 | (1 << 3), + (1ULL << 16) | ETH_P_8021Q); /* reset value */ + } + + nic_reg_write(nic, NIC_PF_PKIND_0_15_CFG | (pkind_idx << 3), pkind_val); +} + /* Interrupt handler to handle mailbox messages from VFs */ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) { @@ -1062,6 +1111,9 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) case NIC_MBOX_MSG_PFC: nic_pause_frame(nic, vf, &mbx.pfc); goto unlock; + case NIC_MBOX_MSG_PTP_CFG: + nic_config_timestamp(nic, vf, &mbx.ptp); + break; default: dev_err(&nic->pdev->dev, "Invalid msg from VF%d, msg 0x%x\n", vf, mbx.msg.msg); diff --git a/drivers/net/ethernet/cavium/thunder/nic_reg.h b/drivers/net/ethernet/cavium/thunder/nic_reg.h index 80d46337cf29..a16c48a1ebb2 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_reg.h +++ b/drivers/net/ethernet/cavium/thunder/nic_reg.h @@ -99,6 +99,7 @@ #define NIC_PF_ECC3_DBE_INT_W1S (0x2708) #define NIC_PF_ECC3_DBE_ENA_W1C (0x2710) #define NIC_PF_ECC3_DBE_ENA_W1S (0x2718) +#define NIC_PF_INTFX_SEND_CFG (0x4000) #define NIC_PF_MCAM_0_191_ENA (0x100000) #define NIC_PF_MCAM_0_191_M_0_5_DATA (0x110000) #define NIC_PF_MCAM_CTRL (0x120000) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c index b9ece9cbf98b..ed9f10bdf41e 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c @@ -9,12 +9,14 @@ /* ETHTOOL Support for VNIC_VF Device*/ #include +#include #include "nic_reg.h" #include "nic.h" #include "nicvf_queues.h" #include "q_struct.h" #include "thunder_bgx.h" +#include "../common/cavium_ptp.h" #define DRV_NAME "thunder-nicvf" #define DRV_VERSION "1.0" @@ -824,6 +826,31 @@ static int nicvf_set_pauseparam(struct net_device *dev, return 0; } +static int nicvf_get_ts_info(struct net_device *netdev, + struct ethtool_ts_info *info) +{ + struct nicvf *nic = netdev_priv(netdev); + + if (!nic->ptp_clock) + return ethtool_op_get_ts_info(netdev, info); + + info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE | + SOF_TIMESTAMPING_RX_SOFTWARE | + SOF_TIMESTAMPING_SOFTWARE | + SOF_TIMESTAMPING_TX_HARDWARE | + SOF_TIMESTAMPING_RX_HARDWARE | + SOF_TIMESTAMPING_RAW_HARDWARE; + + info->phc_index = cavium_ptp_clock_index(nic->ptp_clock); + + info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON); + + info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) | + (1 << HWTSTAMP_FILTER_ALL); + + return 0; +} + static const struct ethtool_ops nicvf_ethtool_ops = { .get_link = nicvf_get_link, .get_drvinfo = nicvf_get_drvinfo, @@ -847,7 +874,7 @@ static const struct ethtool_ops nicvf_ethtool_ops = { .set_channels = nicvf_set_channels, .get_pauseparam = nicvf_get_pauseparam, .set_pauseparam = nicvf_set_pauseparam, - .get_ts_info = ethtool_op_get_ts_info, + .get_ts_info = nicvf_get_ts_info, .get_link_ksettings = nicvf_get_link_ksettings, }; diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index 805ab45e9b5a..bb8559d0ae09 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -20,11 +20,13 @@ #include #include #include +#include #include "nic_reg.h" #include "nic.h" #include "nicvf_queues.h" #include "thunder_bgx.h" +#include "../common/cavium_ptp.h" #define DRV_NAME "thunder-nicvf" #define DRV_VERSION "1.0" @@ -588,6 +590,44 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, return false; } +static void nicvf_snd_ptp_handler(struct net_device *netdev, + struct cqe_send_t *cqe_tx) +{ + struct nicvf *nic = netdev_priv(netdev); + struct skb_shared_hwtstamps ts; + u64 ns; + + nic = nic->pnicvf; + + /* Sync for 'ptp_skb' */ + smp_rmb(); + + /* New timestamp request can be queued now */ + atomic_set(&nic->tx_ptp_skbs, 0); + + /* Check for timestamp requested skb */ + if (!nic->ptp_skb) + return; + + /* Check if timestamping is timedout, which is set to 10us */ + if (cqe_tx->send_status == CQ_TX_ERROP_TSTMP_TIMEOUT || + cqe_tx->send_status == CQ_TX_ERROP_TSTMP_CONFLICT) + goto no_tstamp; + + /* Get the timestamp */ + memset(&ts, 0, sizeof(ts)); + ns = cavium_ptp_tstamp2time(nic->ptp_clock, cqe_tx->ptp_timestamp); + ts.hwtstamp = ns_to_ktime(ns); + skb_tstamp_tx(nic->ptp_skb, &ts); + +no_tstamp: + /* Free the original skb */ + dev_kfree_skb_any(nic->ptp_skb); + nic->ptp_skb = NULL; + /* Sync 'ptp_skb' */ + smp_wmb(); +} + static void nicvf_snd_pkt_handler(struct net_device *netdev, struct cqe_send_t *cqe_tx, int budget, int *subdesc_cnt, @@ -644,7 +684,12 @@ static void nicvf_snd_pkt_handler(struct net_device *netdev, prefetch(skb); (*tx_pkts)++; *tx_bytes += skb->len; - napi_consume_skb(skb, budget); + /* If timestamp is requested for this skb, don't free it */ + if (skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS && + !nic->pnicvf->ptp_skb) + nic->pnicvf->ptp_skb = skb; + else + napi_consume_skb(skb, budget); sq->skbuff[cqe_tx->sqe_ptr] = (u64)NULL; } else { /* In case of SW TSO on 88xx, only last segment will have @@ -683,6 +728,21 @@ static inline void nicvf_set_rxhash(struct net_device *netdev, skb_set_hash(skb, hash, hash_type); } +static inline void nicvf_set_rxtstamp(struct nicvf *nic, struct sk_buff *skb) +{ + u64 ns; + + if (!nic->ptp_clock || !nic->hw_rx_tstamp) + return; + + /* The first 8 bytes is the timestamp */ + ns = cavium_ptp_tstamp2time(nic->ptp_clock, + be64_to_cpu(*(u64 *)skb->data)); + skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(ns); + + __skb_pull(skb, 8); +} + static void nicvf_rcv_pkt_handler(struct net_device *netdev, struct napi_struct *napi, struct cqe_rx_t *cqe_rx, struct snd_queue *sq) @@ -733,6 +793,7 @@ static void nicvf_rcv_pkt_handler(struct net_device *netdev, return; } + nicvf_set_rxtstamp(nic, skb); nicvf_set_rxhash(netdev, cqe_rx, skb); skb_record_rx_queue(skb, rq_idx); @@ -807,10 +868,12 @@ static int nicvf_cq_intr_handler(struct net_device *netdev, u8 cq_idx, &tx_pkts, &tx_bytes); tx_done++; break; + case CQE_TYPE_SEND_PTP: + nicvf_snd_ptp_handler(netdev, (void *)cq_desc); + break; case CQE_TYPE_INVALID: case CQE_TYPE_RX_SPLIT: case CQE_TYPE_RX_TCP: - case CQE_TYPE_SEND_PTP: /* Ignore for now */ break; } @@ -1306,12 +1369,28 @@ int nicvf_stop(struct net_device *netdev) nicvf_free_cq_poll(nic); + /* Free any pending SKB saved to receive timestamp */ + if (nic->ptp_skb) { + dev_kfree_skb_any(nic->ptp_skb); + nic->ptp_skb = NULL; + } + /* Clear multiqset info */ nic->pnicvf = nic; return 0; } +static int nicvf_config_hw_rx_tstamp(struct nicvf *nic, bool enable) +{ + union nic_mbx mbx = {}; + + mbx.ptp.msg = NIC_MBOX_MSG_PTP_CFG; + mbx.ptp.enable = enable; + + return nicvf_send_msg_to_pf(nic, &mbx); +} + static int nicvf_update_hw_max_frs(struct nicvf *nic, int mtu) { union nic_mbx mbx = {}; @@ -1381,6 +1460,12 @@ int nicvf_open(struct net_device *netdev) if (nic->sqs_mode) nicvf_get_primary_vf_struct(nic); + /* Configure PTP timestamp */ + if (nic->ptp_clock) + nicvf_config_hw_rx_tstamp(nic, nic->hw_rx_tstamp); + atomic_set(&nic->tx_ptp_skbs, 0); + nic->ptp_skb = NULL; + /* Configure receive side scaling and MTU */ if (!nic->sqs_mode) { nicvf_rss_init(nic); @@ -1763,6 +1848,77 @@ static int nicvf_xdp(struct net_device *netdev, struct netdev_xdp *xdp) } } +int nicvf_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr) +{ + struct hwtstamp_config config; + struct nicvf *nic = netdev_priv(netdev); + + if (!nic->ptp_clock) + return -ENODEV; + + if (copy_from_user(&config, ifr->ifr_data, sizeof(config))) + return -EFAULT; + + /* reserved for future extensions */ + if (config.flags) + return -EINVAL; + + switch (config.tx_type) { + case HWTSTAMP_TX_OFF: + case HWTSTAMP_TX_ON: + break; + default: + return -ERANGE; + } + + switch (config.rx_filter) { + case HWTSTAMP_FILTER_NONE: + nic->hw_rx_tstamp = false; + break; + case HWTSTAMP_FILTER_ALL: + case HWTSTAMP_FILTER_SOME: + case HWTSTAMP_FILTER_PTP_V1_L4_EVENT: + case HWTSTAMP_FILTER_PTP_V1_L4_SYNC: + case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ: + case HWTSTAMP_FILTER_PTP_V2_L4_EVENT: + case HWTSTAMP_FILTER_PTP_V2_L4_SYNC: + case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ: + case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: + case HWTSTAMP_FILTER_PTP_V2_L2_SYNC: + case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ: + case HWTSTAMP_FILTER_PTP_V2_EVENT: + case HWTSTAMP_FILTER_PTP_V2_SYNC: + case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ: + nic->hw_rx_tstamp = true; + config.rx_filter = HWTSTAMP_FILTER_ALL; + break; + default: + return -ERANGE; + } + + if (netif_running(netdev)) { + if (nic->hw_rx_tstamp) + nicvf_config_hw_rx_tstamp(nic, true); + else + nicvf_config_hw_rx_tstamp(nic, false); + } + + if (copy_to_user(ifr->ifr_data, &config, sizeof(config))) + return -EFAULT; + + return 0; +} + +static int nicvf_ioctl(struct net_device *netdev, struct ifreq *req, int cmd) +{ + switch (cmd) { + case SIOCSHWTSTAMP: + return nicvf_config_hwtstamp(netdev, req); + default: + return -EOPNOTSUPP; + } +} + static const struct net_device_ops nicvf_netdev_ops = { .ndo_open = nicvf_open, .ndo_stop = nicvf_stop, @@ -1774,6 +1930,7 @@ static const struct net_device_ops nicvf_netdev_ops = { .ndo_fix_features = nicvf_fix_features, .ndo_set_features = nicvf_set_features, .ndo_xdp = nicvf_xdp, + .ndo_do_ioctl = nicvf_ioctl, }; static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -1783,6 +1940,16 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) struct nicvf *nic; int err, qcount; u16 sdevid; + struct cavium_ptp *ptp_clock; + + ptp_clock = cavium_ptp_get(); + if (IS_ERR(ptp_clock)) { + if (PTR_ERR(ptp_clock) == -ENODEV) + /* In virtualized environment we proceed without ptp */ + ptp_clock = NULL; + else + return PTR_ERR(ptp_clock); + } err = pci_enable_device(pdev); if (err) { @@ -1832,6 +1999,7 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) nic->pdev = pdev; nic->pnicvf = nic; nic->max_queues = qcount; + nic->ptp_clock = ptp_clock; /* MAP VF's configuration registers */ nic->reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0); @@ -1945,6 +2113,7 @@ static void nicvf_remove(struct pci_dev *pdev) pci_set_drvdata(pdev, NULL); if (nic->drv_stats) free_percpu(nic->drv_stats); + cavium_ptp_put(nic->ptp_clock); free_netdev(netdev); pci_release_regions(pdev); pci_disable_device(pdev); diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index d4496e9afcdf..b68c1c90844d 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -977,6 +977,9 @@ void nicvf_qset_config(struct nicvf *nic, bool enable) qs_cfg->be = 1; #endif qs_cfg->vnic = qs->vnic_id; + /* Enable Tx timestamping capability */ + if (nic->ptp_clock) + qs_cfg->send_tstmp_ena = 1; } nicvf_send_msg_to_pf(nic, &mbx); } @@ -1383,6 +1386,29 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry, hdr->inner_l3_offset = skb_network_offset(skb) - 2; this_cpu_inc(nic->pnicvf->drv_stats->tx_tso); } + + /* Check if timestamp is requested */ + if (!(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { + skb_tx_timestamp(skb); + return; + } + + /* Tx timestamping not supported along with TSO, so ignore request */ + if (skb_shinfo(skb)->gso_size) + return; + + /* HW supports only a single outstanding packet to timestamp */ + if (!atomic_add_unless(&nic->pnicvf->tx_ptp_skbs, 1, 1)) + return; + + /* Mark the SKB for later reference */ + skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; + + /* Finally enable timestamp generation + * Since 'post_cqe' is also set, two CQEs will be posted + * for this packet i.e CQE_TYPE_SEND and CQE_TYPE_SEND_PTP. + */ + hdr->tstmp = 1; } /* SQ GATHER subdescriptor diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 5e5c4d7796b8..0f23999c5bcf 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -245,6 +245,35 @@ void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable) } EXPORT_SYMBOL(bgx_lmac_rx_tx_enable); +/* Enables or disables timestamp insertion by BGX for Rx packets */ +void bgx_config_timestamping(int node, int bgx_idx, int lmacid, bool enable) +{ + struct bgx *bgx = get_bgx(node, bgx_idx); + struct lmac *lmac; + u64 csr_offset, cfg; + + if (!bgx) + return; + + lmac = &bgx->lmac[lmacid]; + + if (lmac->lmac_type == BGX_MODE_SGMII || + lmac->lmac_type == BGX_MODE_QSGMII || + lmac->lmac_type == BGX_MODE_RGMII) + csr_offset = BGX_GMP_GMI_RXX_FRM_CTL; + else + csr_offset = BGX_SMUX_RX_FRM_CTL; + + cfg = bgx_reg_read(bgx, lmacid, csr_offset); + + if (enable) + cfg |= BGX_PKT_RX_PTP_EN; + else + cfg &= ~BGX_PKT_RX_PTP_EN; + bgx_reg_write(bgx, lmacid, csr_offset, cfg); +} +EXPORT_SYMBOL(bgx_config_timestamping); + void bgx_lmac_get_pfc(int node, int bgx_idx, int lmacid, void *pause) { struct pfc *pfc = (struct pfc *)pause; diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index 23acdc5ab896..5a7567d31138 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -122,6 +122,8 @@ #define SPU_DBG_CTL_AN_NONCE_MCT_DIS BIT_ULL(29) #define BGX_SMUX_RX_INT 0x20000 +#define BGX_SMUX_RX_FRM_CTL 0x20020 +#define BGX_PKT_RX_PTP_EN BIT_ULL(12) #define BGX_SMUX_RX_JABBER 0x20030 #define BGX_SMUX_RX_CTL 0x20048 #define SMU_RX_CTL_STATUS (3ull << 0) @@ -172,6 +174,7 @@ #define GMI_PORT_CFG_SPEED_MSB BIT_ULL(8) #define GMI_PORT_CFG_RX_IDLE BIT_ULL(12) #define GMI_PORT_CFG_TX_IDLE BIT_ULL(13) +#define BGX_GMP_GMI_RXX_FRM_CTL 0x38028 #define BGX_GMP_GMI_RXX_JABBER 0x38038 #define BGX_GMP_GMI_TXX_THRESH 0x38210 #define BGX_GMP_GMI_TXX_APPEND 0x38218 @@ -223,6 +226,7 @@ void bgx_set_lmac_mac(int node, int bgx_idx, int lmacid, const u8 *mac); void bgx_get_lmac_link_state(int node, int bgx_idx, int lmacid, void *status); void bgx_lmac_internal_loopback(int node, int bgx_idx, int lmac_idx, bool enable); +void bgx_config_timestamping(int node, int bgx_idx, int lmacid, bool enable); void bgx_lmac_get_pfc(int node, int bgx_idx, int lmacid, void *pause); void bgx_lmac_set_pfc(int node, int bgx_idx, int lmacid, void *pause); -- 2.15.0 From 1583485379044794966@xxx Wed Nov 08 08:22:16 +0000 2017 X-GM-THRID: 1583292751366420590 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread