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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 267ABC43141 for ; Mon, 2 Dec 2019 10:04:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EAE86217D9 for ; Mon, 2 Dec 2019 10:04:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="r59hMrsF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726087AbfLBKED (ORCPT ); Mon, 2 Dec 2019 05:04:03 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36525 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727312AbfLBKED (ORCPT ); Mon, 2 Dec 2019 05:04:03 -0500 Received: by mail-wm1-f65.google.com with SMTP id p17so16575321wma.1 for ; Mon, 02 Dec 2019 02:04:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5ZVa6kq1mJCk2ugA3PttYrwn9cQp3DBRKWj2cZpAQC4=; b=r59hMrsFxVfzeFoTz55x4dEZj/jaxCJ6PqtUrFgBI+Thwk+qA96TIB/fDPS+MshGcJ yHBCKM6lZcVaS9DpjZ6/6RYFfBD8cPvQnrJaPKtlkUWRBsCdHve7S0szJupAd6drknA0 So4K7p1mgWucq1tDg3+phTF27WpmySKSCQYRD8kaqoL7UbCVOpB6cvHoWCRfXF7RCbMQ vVKClLa0p2Uor9lJJKVuNw6bL6Esjq4ctNCJizp5ExG89EzEFSwJbmSh8au/L4jkv228 xm4WsEF2cm+/r2kRf0WHBatanLa2TLg87wO33cCUITqIeMRO/UlxigWPTYVbpNCIzGJi wkZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5ZVa6kq1mJCk2ugA3PttYrwn9cQp3DBRKWj2cZpAQC4=; b=Fy2+F4/y6BFYVSbHSgK9MmlPry1t8olByqXSVrVUi79Pbm0BdwY0pnhHCU2oNux5hX W9VjEbuIPoOpCnGt8WG7HYUl3d7yU8xXoGewZPNRbvM9fVRzDMfXP3k+mlUfRDpA3H0N G3Yhy6+9nNqQS7hA/bdEZNhb79WBHucm8FYIp5zq+355Xn8cNmYfaiEuAtckZ14yQjJ4 OLYlmozpZfCc4pX6vPP1UjMKZD0a8eJSV2lOWfnfDFslOZyIMoxBsxPWOzuSrflamanD /hZgGuXgELxk6HO6mbBgJjBpgeM6OTPp6AkwL4/zQKfsjHgarQ4ZLCZBQ3XhRTumVakX qlOg== X-Gm-Message-State: APjAAAUz63e/BXdFsRY9GMu76cGq4H9i+nmFGhB98iHGIn5zTDIYscGw JrZOxwPBGPhJ9oleWhhHLD/lGAC7YLQ= X-Google-Smtp-Source: APXvYqwJiYaZucUMtM53bVJ/ZYIiuujIwZQG+uBYt7zrbdIQ6k3V51jmt2DFuCrVjj2yiBqbklFwuw== X-Received: by 2002:a7b:c955:: with SMTP id i21mr15275918wml.172.1575281040806; Mon, 02 Dec 2019 02:04:00 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:59 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 11/14] net: macb driver, check for SKBTX_HW_TSTAMP Date: Mon, 2 Dec 2019 10:03:09 +0000 Message-Id: <20191202100312.1397-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Thomas [ Upstream commit a62520473f15750cd1432d36b377a06cd7cff8d2 ] Make sure SKBTX_HW_TSTAMP (i.e. SOF_TIMESTAMPING_TX_HARDWARE) has been enabled for this skb. It does fix the issue where normal socks that aren't expecting a timestamp will not wake up on select, but when a user does want a SOF_TIMESTAMPING_TX_HARDWARE it does work. Signed-off-by: Paul Thomas Signed-off-by: David S. Miller Signed-off-by: Lee Jones --- drivers/net/ethernet/cadence/macb_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index bc9ab227d055..5aff1b460151 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -852,7 +852,9 @@ static void macb_tx_interrupt(struct macb_queue *queue) /* First, update TX stats if needed */ if (skb) { - if (gem_ptp_do_txstamp(queue, skb, desc) == 0) { + if (unlikely(skb_shinfo(skb)->tx_flags & + SKBTX_HW_TSTAMP) && + gem_ptp_do_txstamp(queue, skb, desc) == 0) { /* skb now belongs to timestamp buffer * and will be removed later */ -- 2.24.0