From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC6B5C433EF for ; Thu, 21 Oct 2021 06:44:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B891261057 for ; Thu, 21 Oct 2021 06:44:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229765AbhJUGrB (ORCPT ); Thu, 21 Oct 2021 02:47:01 -0400 Received: from mga09.intel.com ([134.134.136.24]:40374 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbhJUGrA (ORCPT ); Thu, 21 Oct 2021 02:47:00 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10143"; a="228831032" X-IronPort-AV: E=Sophos;i="5.87,169,1631602800"; d="scan'208";a="228831032" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 23:44:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,169,1631602800"; d="scan'208";a="444666888" Received: from linux.intel.com ([10.54.29.200]) by orsmga006.jf.intel.com with ESMTP; 20 Oct 2021 23:44:44 -0700 Received: from linux.intel.com (vwong3-iLBPG3.png.intel.com [10.88.229.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id 3C397580191; Wed, 20 Oct 2021 23:44:42 -0700 (PDT) Date: Thu, 21 Oct 2021 14:44:38 +0800 From: Wong Vee Khee To: Kurt Kanzenbach Cc: "David S. Miller" , Jakub Kicinski , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Fugang Duan , Sebastian Andrzej Siewior , Ong Boon Leong , netdev@vger.kernel.org Subject: Re: [PATCH net] net: stmmac: Fix E2E delay mechanism Message-ID: <20211021064438.GA11169@linux.intel.com> References: <20211020070433.71398-1-kurt@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211020070433.71398-1-kurt@linutronix.de> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Oct 20, 2021 at 09:04:33AM +0200, Kurt Kanzenbach wrote: > When utilizing End to End delay mechanism, the following error messages show up: > > |root@ehl1:~# ptp4l --tx_timestamp_timeout=50 -H -i eno2 -E -m > |ptp4l[950.573]: selected /dev/ptp3 as PTP clock > |ptp4l[950.586]: port 1: INITIALIZING to LISTENING on INIT_COMPLETE > |ptp4l[950.586]: port 0: INITIALIZING to LISTENING on INIT_COMPLETE > |ptp4l[952.879]: port 1: new foreign master 001395.fffe.4897b4-1 > |ptp4l[956.879]: selected best master clock 001395.fffe.4897b4 > |ptp4l[956.879]: port 1: assuming the grand master role > |ptp4l[956.879]: port 1: LISTENING to GRAND_MASTER on RS_GRAND_MASTER > |ptp4l[962.017]: port 1: received DELAY_REQ without timestamp > |ptp4l[962.273]: port 1: received DELAY_REQ without timestamp > |ptp4l[963.090]: port 1: received DELAY_REQ without timestamp > > Commit f2fb6b6275eb ("net: stmmac: enable timestamp snapshot for required PTP > packets in dwmac v5.10a") already addresses this problem for the dwmac > v5.10. However, same holds true for all dwmacs above version v4.10. Correct the > check accordingly. Afterwards everything works as expected. > > Tested on Intel Atom(R) x6414RE Processor. > > Fixes: 14f347334bf2 ("net: stmmac: Correctly take timestamp for PTPv2") > Fixes: f2fb6b6275eb ("net: stmmac: enable timestamp snapshot for required PTP packets in dwmac v5.10a") > Suggested-by: Ong Boon Leong > Signed-off-by: Kurt Kanzenbach > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index eb3b7bf771d7..3d67d1fa3690 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -736,7 +736,7 @@ static int stmmac_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) > config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT; > ptp_v2 = PTP_TCR_TSVER2ENA; > snap_type_sel = PTP_TCR_SNAPTYPSEL_1; > - if (priv->synopsys_id != DWMAC_CORE_5_10) > + if (priv->synopsys_id < DWMAC_CORE_4_10) > ts_event_en = PTP_TCR_TSEVNTENA; > ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA; > ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA; This fixes PTPv2 E2E issue on EHL-based boards. Can this also be applied to 5.4 and onwards? Thanks, Vee Khee