Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1709089imu; Thu, 17 Jan 2019 01:52:11 -0800 (PST) X-Google-Smtp-Source: ALg8bN6TmzOmzMEQFrlsvPyYyrBgNj1GTaGxhtJIrRmyqcJvw6FuvaEysFl9mvzfkkWHgLmbHp9o X-Received: by 2002:a63:6782:: with SMTP id b124mr12974821pgc.151.1547718731226; Thu, 17 Jan 2019 01:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547718731; cv=none; d=google.com; s=arc-20160816; b=iCJ5FlZg3HbhqD6Qs5/nQsd2tOOEJ0uQ3i+WHaqcIxAb4mPZi/2e4y/8KJ6aZpw9Lv 3uIi4h9FVrjBMRrDiTKTTadfh3zQFLwz9rnS3YFeQoW04Fzr5kRG68pXkXLVTEoD3Gb7 e9KnacVkXiYlyPDSAtKOxqlPrIFAD733O1fnMoKBV+0GYy7J3WZzuyf4jHMOL+NZ7ms2 3zzpnmXkN1hp3Q9cytdZbZI3ou6UKx/zRx+TsUnCPAsgm7IZEGDwPCnCFHv2KEoSV9fy wsIKQfJ5JXLbawlUEerMMFvHstFrty52cf5+CnLzg6BiIQsq1n3SugciWiUpcuqRm9Mn DPWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:reply-to:message-id:date:subject:cc:to :from; bh=q5Lv5rPXim08EgLGRfbHcV32ONMNe4Gukegmd/1jNJY=; b=x498zQmvNzZAlnQoeghCFeluaZWxTSZXxTaI6U+PLeWYkDmazjF78zgl2CitS3Rxz/ fllLTWR5WHquMoYfBmAaE48Ir6/F5mPwOSL7WgmHcaoI7lgPGxwJBoBQNQQcHLNudr8M gTxNwgy38KtJhSgo7Trz01bjHXkM7hEdWcU/BF5erN6A1EjMx/XwmFzfYCBqjuCVgq78 i7Q73qeMcwFAPF5rK7HZOIhLUMpRaXw5jgkYaI3Bz+twQo8Qq4khh1fGgA5epbHaDzvJ 5+7pdHF72Ghb3TpLtG4l5wo0XSpHOq6Uy+33/1E9FE5HNTJfPmQFIQ6KDwadlbhMfozw euTQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b11si1076971pgt.289.2019.01.17.01.51.55; Thu, 17 Jan 2019 01:52:11 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728784AbfAQJmc (ORCPT + 99 others); Thu, 17 Jan 2019 04:42:32 -0500 Received: from inva020.nxp.com ([92.121.34.13]:58622 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726008AbfAQJmb (ORCPT ); Thu, 17 Jan 2019 04:42:31 -0500 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 3C21E1A0296; Thu, 17 Jan 2019 10:42:30 +0100 (CET) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 2FDEA1A021F; Thu, 17 Jan 2019 10:42:30 +0100 (CET) Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.82.91]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id ECA63205DE; Thu, 17 Jan 2019 10:42:29 +0100 (CET) From: Madalin Bucur To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Madalin Bucur Subject: [PATCH] dpaa_eth: NETIF_F_LLTX requires to do our own update of trans_start Date: Thu, 17 Jan 2019 11:42:27 +0200 Message-Id: <1547718147-5040-1-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 Reply-to: madalin.bucur@nxp.com X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As txq_trans_update() only updates trans_start when the lock is held, trans_start does not get updated if NETIF_F_LLTX is declared. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index f53090cde041..dfebc30c4841 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2051,6 +2051,7 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) bool nonlinear = skb_is_nonlinear(skb); struct rtnl_link_stats64 *percpu_stats; struct dpaa_percpu_priv *percpu_priv; + struct netdev_queue *txq; struct dpaa_priv *priv; struct qm_fd fd; int offset = 0; @@ -2100,6 +2101,11 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) if (unlikely(err < 0)) goto skb_to_fd_failed; + txq = netdev_get_tx_queue(net_dev, queue_mapping); + + /* LLTX requires to do our own update of trans_start */ + txq->trans_start = jiffies; + if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) { fd.cmd |= cpu_to_be32(FM_FD_CMD_UPD); skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; -- 2.1.0