From patchwork Mon Dec 2 10:03:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180574 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982591ile; Mon, 2 Dec 2019 02:04:07 -0800 (PST) X-Google-Smtp-Source: APXvYqw8TruEZ2/7kaHY4SXAcfBS09uabDvEeL9upbU5BmeWQaCSZgmQUQo1mpukCbbza/hHCALQ X-Received: by 2002:a17:906:7e4b:: with SMTP id z11mr8566674ejr.73.1575281047798; Mon, 02 Dec 2019 02:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281047; cv=none; d=google.com; s=arc-20160816; b=RtJq+2Tpy08118IqDpwCHinW6eQMX2dUOHxWDY0iELFfVmIQvdmoES+fQ6iQDL8CYm SkyMhj/O0ZqR1RY7YCP0QZfI6Hk62azB08yLr01m0P12DUO/lWnw4gPt5GFK6BvHOy6y rK8tRiz1C05lyvZGrTkjJZ/8XvUxGtCfwos0fVRzVvr8uKuOf/xGg7OYQ4BRZmu0/3eb jVKF+N2ibTA/uh2+n7O0/RmS9JyVNTPnzQOIAROGe4CyjkzlOSVH1vPEM9eawLghFWCK 7XHxBmUiN3siRoxAAR/lld6OohA8E7owp3ws2HHh6Eualo+itcJQ+Qjv+f+3FIQFc4YQ Y5HA== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5ZVa6kq1mJCk2ugA3PttYrwn9cQp3DBRKWj2cZpAQC4=; b=AVITpqfHxqehy9h1mn0GUuqAgaGksTxaCqFZBzUfbNSaKy871f45jQG0pUidjfLwgC oG+VfysfQPFkMoDjSuzvhYnLfICAkLXTziWM9zwFnnlvCeFTfQ9g8mfoP/pgUbLOVkl0 4IP/N3+4p5S5s57UFNlKY87ZWPKYK2j4JxlqBX/rPEoR7/hleYiEdAOli8lTafrlrgWt mWI2BwBTIsntECJu0ELYJoM7VQK77IUalbx0cHzV01DO2Dy2hEp3oWz7zsOzjYdjtluP vmGrEKf1iwg3nMaUKmcWz5QC0USrGVGXiEoM3qdQH1izOFCq7JzxIS3FXDOR7HUjpn/1 L8Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r59hMrsF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p21si21018960ejz.196.2019.12.02.02.04.07; Mon, 02 Dec 2019 02:04:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org header.s=google header.b=r59hMrsF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726087AbfLBKED (ORCPT + 15 others); 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-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 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(-) -- 2.24.0 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 */