From patchwork Wed Dec 21 09:46:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Ramadoss X-Patchwork-Id: 35322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3434202wrn; Wed, 21 Dec 2022 01:55:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXviKaXhrRyXZ6Q7g2SWo3boH+EUHnokRTSrKFRJbj+T8Nf2AhJx/Cwecgb1Hmu99QF7F6p8 X-Received: by 2002:a17:906:1410:b0:7c0:eba3:e2e with SMTP id p16-20020a170906141000b007c0eba30e2emr742606ejc.31.1671616559203; Wed, 21 Dec 2022 01:55:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671616559; cv=none; d=google.com; s=arc-20160816; b=CmArp0/J8AJ+8/g6M+GbGOcCTs2Mx03JCl2+DAmUYl8BCqbRdpbz64VayDUB/UkA2v P9ItmtG4Abd1EhYhO12VRJUrtwgNqLjOZ9YLbKbexNzExw9ODdZW1x8cluipQOvfeSJx PTxF2SW5ivcWXQyNd64Ht5Zj4qBGJ9dQNlYhNUH5aMhTv4cDa6SnQxGqejVyWSQLRVJj 8cfnOmhrHVMjG9Kue/siZFYm6QQykJqyNHBflqsguWBR8CxX6B8MZOPlfp5HdN4KBc8n ku+C5bR1KVEpc/CefSJzQ8iL/a2WFagdpGsfio+6oQx4iI7zCG4wdje2g1rmUq9PUJlM 3dhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j+VZDxcCoa15F1S74qhW/t38i5bJ5I2HbMWkh4JpNJo=; b=Iy2D2nux8rDk4jb2LTCHzs4+2CdrSDqtyDcMHo9m9RXN3bxbf/Ovhu7pGc/bV1SRz0 xaID8AGDO4Y1SwG6Tul6Z7oFIJobSA9O0YziLXwmNUwRjrboEsQY5KQY1yngmLOajIJl annyrnIb6djr0lCOVRTUSkjdsaTsAKPRhZdnfYLp7BBWevfYEA7TzJX0Lgcl5M0h2RqJ tU4XHhcMooLHexZm7vpHYLDbmx2gwQ2GaoDpTf/GjKhA7oI8layWMUY+d7egkKzJN7lB IoRbtdM4pXvieBFfLaoZutJt2ne0LXkAlJydAWnMfZZFmPzkcXpOedf4EaQfLW1KTZbd C11Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=1rMfTUjv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ty5-20020a170907c70500b007da4fe085e5si1639435ejc.691.2022.12.21.01.55.35; Wed, 21 Dec 2022 01:55:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=1rMfTUjv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234603AbiLUJvV (ORCPT + 99 others); Wed, 21 Dec 2022 04:51:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234648AbiLUJuI (ORCPT ); Wed, 21 Dec 2022 04:50:08 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1651222BC1; Wed, 21 Dec 2022 01:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1671616091; x=1703152091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BsHOrPq13mxXcu/hutFr3b8J7KhpwyigNExjZ/OZMjk=; b=1rMfTUjvcqoyI2N5eGKvw5OGNTRT7n7AeU1fCowvuvdkPABPRL9I7cwF UHljbwLwMuXDqiumjEqXksPcHDVRA5pOnfjHVSAPSJKGhx2gKK5aAc01t W9Sdi8z+TmaJdpf+eiOY3DTtWtm5TtQODhVJrb21jgea4BRbeukxxGyML 0+FyglDOsodyZ+S2t1uAK0UOXll7HF6Xwunsemm9uMtIpecichEOYXhYL ANvoixhCzFDz5JA2IOwNhfUe6f3PKfdC8z9SMTmxgDq8uRwm8F15d3n6L ptg8FJ2EqbyXwL3nI2M1ROdtUN943EDHIWCmXRAhPeqq6wHVRGcOd08SD Q==; X-IronPort-AV: E=Sophos;i="5.96,262,1665471600"; d="scan'208";a="204893051" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 21 Dec 2022 02:48:11 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 21 Dec 2022 02:48:10 -0700 Received: from CHE-LT-I17769U.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Wed, 21 Dec 2022 02:48:04 -0700 From: Arun Ramadoss To: , CC: , , , , , , , , , , , , , , Subject: [RFC Patch net-next v5 12/13] net: dsa: microchip: ptp: lan937x: add 2 step timestamping Date: Wed, 21 Dec 2022 15:16:11 +0530 Message-ID: <20221221094612.22372-13-arun.ramadoss@microchip.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221221094612.22372-1-arun.ramadoss@microchip.com> References: <20221221094612.22372-1-arun.ramadoss@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752817005377661474?= X-GMAIL-MSGID: =?utf-8?q?1752817005377661474?= LAN937x series of switches support 2 step timestamping mechanism. There are timestamp correction calculation performed in ksz_rcv_timestamp and ksz_xmit_timestamp which are applicable only for p2p1step. To check whether the 2 step is enabled or not in tag_ksz.c introduced the helper function in taggger_data to query it from ksz_ptp.c. Based on whether 2 step is enabled or not, timestamp calculation are performed. Signed-off-by: Arun Ramadoss --- v3 -> v4 - P2P_1step bit is set which is required for P2P. It is missed during patch v3 regression. v2 -> v3 - Reverted setting PTP_1Step bit as we are setting 802_1AS bit v1 -> v2 - declard is_ptp_twostep as macro NULL for ptp disabled case - Moved the patch in series to have continuity for lan937x updates 9/11 to 12/13 - enable PTP_1STEP bit based on tx timestamping Patch v1 - Patch is new. --- drivers/net/dsa/microchip/ksz_ptp.c | 37 ++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c index 2d52a3d4771e..c2d156002ee5 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.c +++ b/drivers/net/dsa/microchip/ksz_ptp.c @@ -283,6 +283,9 @@ int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts) ts->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ONESTEP_P2P); + if (is_lan937x(dev)) + ts->tx_types |= BIT(HWTSTAMP_TX_ON); + ts->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) | BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) | @@ -310,6 +313,8 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev, struct ksz_port *prt, struct hwtstamp_config *config) { + int ret; + if (config->flags) return -EINVAL; @@ -325,6 +330,25 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev, prt->ptpmsg_irq[KSZ_XDREQ_MSG].ts_en = 1; prt->ptpmsg_irq[KSZ_PDRES_MSG].ts_en = 0; prt->hwts_tx_en = true; + + ret = ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_1STEP, PTP_1STEP); + if (ret) + return ret; + + break; + case HWTSTAMP_TX_ON: + if (!is_lan937x(dev)) + return -ERANGE; + + prt->ptpmsg_irq[KSZ_SYNC_MSG].ts_en = 1; + prt->ptpmsg_irq[KSZ_XDREQ_MSG].ts_en = 1; + prt->ptpmsg_irq[KSZ_PDRES_MSG].ts_en = 1; + prt->hwts_tx_en = true; + + ret = ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_1STEP, 0); + if (ret) + return ret; + break; default: return -ERANGE; @@ -412,14 +436,20 @@ bool ksz_port_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb, struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb); struct ksz_device *dev = ds->priv; struct ptp_header *ptp_hdr; + struct ksz_port *prt; u8 ptp_msg_type; ktime_t tstamp; s64 correction; + prt = &dev->ports[port]; + tstamp = KSZ_SKB_CB(skb)->tstamp; memset(hwtstamps, 0, sizeof(*hwtstamps)); hwtstamps->hwtstamp = ksz_tstamp_reconstruct(dev, tstamp); + if (prt->tstamp_config.tx_type != HWTSTAMP_TX_ONESTEP_P2P) + goto out; + ptp_hdr = ptp_parse_header(skb, type); if (!ptp_hdr) goto out; @@ -468,6 +498,10 @@ void ksz_port_txtstamp(struct dsa_switch *ds, int port, ptp_msg_type = ptp_get_msgtype(hdr, type); switch (ptp_msg_type) { + case PTP_MSGTYPE_SYNC: + if (prt->tstamp_config.tx_type == HWTSTAMP_TX_ONESTEP_P2P) + return; + fallthrough; case PTP_MSGTYPE_PDELAY_REQ: fallthrough; case PTP_MSGTYPE_PDELAY_RESP: @@ -484,7 +518,8 @@ void ksz_port_txtstamp(struct dsa_switch *ds, int port, /* caching the value to be used in tag_ksz.c */ KSZ_SKB_CB(skb)->clone = clone; KSZ_SKB_CB(clone)->ptp_type = type; - if (ptp_msg_type == PTP_MSGTYPE_PDELAY_RESP) + if (ptp_msg_type == PTP_MSGTYPE_PDELAY_RESP && + prt->tstamp_config.tx_type == HWTSTAMP_TX_ONESTEP_P2P) KSZ_SKB_CB(clone)->update_correction = true; }