From patchwork Fri Dec 9 07:24:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Ramadoss X-Patchwork-Id: 31670 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp628756wrr; Thu, 8 Dec 2022 23:30:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf5bEUiLNOaJGJ2PLAEeIeqS1n2QiH9W/UaQ9lLnYasCWZExHLE++OnXsmLXyfTWSfFNfmhj X-Received: by 2002:a17:90a:2eca:b0:218:fa0b:b225 with SMTP id h10-20020a17090a2eca00b00218fa0bb225mr4954159pjs.24.1670571029537; Thu, 08 Dec 2022 23:30:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670571029; cv=none; d=google.com; s=arc-20160816; b=c8A3SD5ZwDkZTa+/9aP+qrb4ZOp5UOECogwUoXMO6E/3lWWgxtU6aQg9l6nnRlLXpi MdORdqgbbQWmDZ4W+v94w5XPMzOjyrmjYm+rmiiQn+CfP5huXxiSv1WCOlwk5f8POrPX FfvTpw1gnODNV4eXg51SkABZChwceIwt8vqi2N/mwNWt+45EJH8PzAmxOzqdUjK4lKo2 56gyoUJWk5YujH7Xeu5cekffDk8cI6U1kBn03d08h1ORL8uSginH9gzf/EPT3J9F0tAL 0ERxiNhAOmXL2x3ORVuIX1W+G3TRNZBV69Br1WdEgy7EUqULeJNpXFh7IIQrGfnuJbro kJgg== 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=Gd6HD/orJiYkW1EkUuVPaxPv+lwilJlB/lOshu6yg10=; b=p4/v3GGhGb2zg/t6vzIu5t8jYEJ9LRONX0kA++d8dzRovEUieBo2rCccXKkSqXKezb k8l9q50tlvBgqSaRNsXhUGYtHmLOvVwkIZhxgsJWl19rCuSl0H6aGOLtDHPpdIV/Dts9 vuIXl4hoQRprE/jFcHPgbmJnSsW7hkuC+BEJqmkayguqpS/5hPC5r+DhNzwDToDTbmDt sB2YMsbYwkR9nFYKk/AH1GuQje+Q1OuEx0sQTTE/MxkThHgchXEI0sSQnll2bPK8BiMP V99D+XetSMGiNf1OZ3AAFZ1qv98OY0NxFWoUn06GF/hCHkyvOqWjplVejOJNF7GxEaef 9i0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b="z/5LP3nu"; 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 b9-20020a63d809000000b00478d5b7e86bsi822201pgh.539.2022.12.08.23.30.16; Thu, 08 Dec 2022 23:30:29 -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="z/5LP3nu"; 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 S230218AbiLIH2L (ORCPT + 99 others); Fri, 9 Dec 2022 02:28:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230150AbiLIH1I (ORCPT ); Fri, 9 Dec 2022 02:27:08 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E80FD3A2F7; Thu, 8 Dec 2022 23:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1670570816; x=1702106816; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vWMkmMYcsNma6kimM1VIlHPTsflxXEd1eL3jriTHncs=; b=z/5LP3nuAC17EDvQzSxXg/Lgco/8L2qayUb3nneTT2efb7gLCBh7vtU8 JPk2jDRxCDpcQ0gwI1zSs7bTZ0zbapcOlWZ1Ar4fuy7NWBYU9x4jQXOVW 16E7xkitdj890/No4ElSx2qsfR3y6Nr/9XMy4ThTSJH0tTUlQy85uyhZo ZjQ7B0IFUnpAw03VfDN0tihuCZbBtBEcbUMz+YrJz3RGGNIbcTQHUZ1PX NA1ymJ2CVxrvpU8GeIn+zh3XAC971NpxOoMhfyCRNc8DsX4e+OqEvIWzD IgbmqXnubYMbm5OfMJ7UAmr0Mj0G7u9Wc0UjXMYvkUogHVZw5ahqc+84j g==; X-IronPort-AV: E=Sophos;i="5.96,230,1665471600"; d="scan'208";a="192360149" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Dec 2022 00:26:55 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) 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.12; Fri, 9 Dec 2022 00:26:55 -0700 Received: from CHE-LT-I17769U.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Fri, 9 Dec 2022 00:26:49 -0700 From: Arun Ramadoss To: , CC: , , , , , , , , , , , , , Subject: [Patch net-next v3 12/13] net: dsa: microchip: ptp: lan937x: add 2 step timestamping Date: Fri, 9 Dec 2022 12:54:36 +0530 Message-ID: <20221209072437.18373-13-arun.ramadoss@microchip.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221209072437.18373-1-arun.ramadoss@microchip.com> References: <20221209072437.18373-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?1751720688167076367?= X-GMAIL-MSGID: =?utf-8?q?1751720688167076367?= 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 --- 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 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c index 546211ae46a3..ccb635585721 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.c +++ b/drivers/net/dsa/microchip/ksz_ptp.c @@ -331,6 +331,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) | @@ -374,6 +377,15 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev, prt->ptpmsg_irq[KSZ_PDRES_MSG].ts_en = 0; prt->hwts_tx_en = true; 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; + break; default: return -ERANGE; } @@ -460,14 +472,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; @@ -516,6 +534,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: @@ -532,7 +554,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; }