Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp9928121ybi; Wed, 24 Jul 2019 12:29:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzfT7xNCpoxoDGsNegrUjNgbp1xK7b0Z6FbW7RtTO/kc/J1JOGk57RZBQivhqH8kqOpfTXe X-Received: by 2002:a63:d90f:: with SMTP id r15mr62885177pgg.259.1563996576428; Wed, 24 Jul 2019 12:29:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563996576; cv=none; d=google.com; s=arc-20160816; b=bJUznNILK5UznP3ScnPhJeV6G5IlZWwO5d0s/SkXA0q1VjryQFFDPrv4E8hirPXN5q kioSYaeWxAujMLlpCW7b0MjhizuZZjneHVqBDXkX/3on6tmS6X23eMDDJP4KRdFpPrpJ /fFr93PqyLyfsPXaoMD7ZHLhImoXuuwu7fHkGdMjZ6lr/9akpR+oSJVTs2EIET0/RIkP P1y4Z1arbOM3+Z7fRGHptDAA8JBA7qYeiKlE3ayadDBH1OnGUDsPzL4moa7wMRyYUWmK ZIJAHpP1oRaw4+XUMU1clbZuKf37fRehS/x6wtn0WkafN6EQCh02MVhd5STJPQw+IanH ewGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fjvBY0GGttcOpDzQB8H/qX/yDsoPMpafEXbnVFB1A6g=; b=b3Hw7wx1+Vifvyaas98js6p5rOj6wR6q6/LHzm1JM2BX6pPZa2czMutxIxoi6xOIKV wt1pQcLfbtzSH/I/CrTE8oFPVhCd03ulZ+nP17ZRjOkBtXLG0mU4Gxq+p/uXzuUXvWEI RfGKpJb8jPZJ3enh2H51+hJldM5falbE6wwbhUKhNinpCoo5fyXF0GxQPtSgLc1Vsc3P txfHysERMuvFeUwm4nCDoG2tI6FV0M4niW09prTa9P+1/CX6u7bUPdJiDWqJOkoyFDEO Eal0cdYH6Qy7s2i9r+ITJEQvgiMJpBCwxJ9u3SYf71nlXC4t5DjqCdUOAOQtTEBpxTC6 7B1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ILw7qa4u; 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 d1si676092pgn.512.2019.07.24.12.29.22; Wed, 24 Jul 2019 12:29:36 -0700 (PDT) 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=@kernel.org header.s=default header.b=ILw7qa4u; 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 S1728518AbfGXT0K (ORCPT + 99 others); Wed, 24 Jul 2019 15:26:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:43026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729237AbfGXT0F (ORCPT ); Wed, 24 Jul 2019 15:26:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 00FB9229F3; Wed, 24 Jul 2019 19:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996364; bh=MuhfelxcmbCiTTD2VipqvDgEGlVm0CqNvPtkciZU6mo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ILw7qa4uvFNDV/ShvVpoPtWhhfOrZ9PwzGWyjZyEB3HZYBdb92LUrMeePafpifXy8 G5RKsgw+b0OvAJ32qCZyCS3HkvUwHOCP2dQwR7kmrN6SrvZSGwTJxk72db6dkwGYUW 1b20Ic2+Imst76NOXP9EOcm3i1B4hUcyzErz14hs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Biao Huang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.2 070/413] net: stmmac: modify default value of tx-frames Date: Wed, 24 Jul 2019 21:16:01 +0200 Message-Id: <20190724191740.130758883@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit d2facb4b3983425f6776c24dd678a82dbe673773 ] the default value of tx-frames is 25, it's too late when passing tstamp to stack, then the ptp4l will fail: ptp4l -i eth0 -f gPTP.cfg -m ptp4l: selected /dev/ptp0 as PTP clock ptp4l: port 1: INITIALIZING to LISTENING on INITIALIZE ptp4l: port 0: INITIALIZING to LISTENING on INITIALIZE ptp4l: port 1: link up ptp4l: timed out while polling for tx timestamp ptp4l: increasing tx_timestamp_timeout may correct this issue, but it is likely caused by a driver bug ptp4l: port 1: send peer delay response failed ptp4l: port 1: LISTENING to FAULTY on FAULT_DETECTED (FT_UNSPECIFIED) ptp4l tests pass when changing the tx-frames from 25 to 1 with ethtool -C option. It should be fine to set tx-frames default value to 1, so ptp4l will pass by default. Signed-off-by: Biao Huang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index ceb0d23f5041..c265cc5770e8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -251,7 +251,7 @@ struct stmmac_safety_stats { #define STMMAC_COAL_TX_TIMER 1000 #define STMMAC_MAX_COAL_TX_TICK 100000 #define STMMAC_TX_MAX_FRAMES 256 -#define STMMAC_TX_FRAMES 25 +#define STMMAC_TX_FRAMES 1 /* Packets types */ enum packets_types { -- 2.20.1