From patchwork Mon Dec 2 10:30:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180599 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5012346ile; Mon, 2 Dec 2019 02:31:23 -0800 (PST) X-Google-Smtp-Source: APXvYqwEsfUxwlrRDAvZnnXjnbhrsB4T0TbIj5wdBtl8Jm7eY9XcHxFqLmBXNmdr1btvN1J4efRj X-Received: by 2002:a17:906:3413:: with SMTP id c19mr31107732ejb.44.1575282683668; Mon, 02 Dec 2019 02:31:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282683; cv=none; d=google.com; s=arc-20160816; b=aJhlQw6+SEFrDcKJ3Bn+IiTKD1fSrRQl6lIkDtTI8cHjoU65M+qIp8dHnpBdihMsvu 1wwj3su0a1If7zBfVVdzHyG0L4BqW5KIOTVLbE7E1+nHZ08wuUz8RQYy/dqQpafnsppE uY7T2EyApBgpIyaxLFpM7r5AoXpC9+kGU9hqfjaZaDseS9uiK14YTSwvv4i+unD2+sY+ 8RfE31BzVvplZe789J+NOZ41V84FPQpU35eOOn5xu8dZvrl54sHXxaiSd80ELHBgsI13 DKG0xCJ+sxqfNiVLrkQYOh/VJc/SgqVWu+qRJV7I51ohedN6T+7R0Ve3l2zjefhZAf6I FKGg== 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=Iqx8Ht1ZGNVIIH/KCqKXiFs77tmuv1VNOT/G4PBiB98=; b=eaJ2/JduR1XaGH/rGyTYGvk0mFED0gFs5z/U8moCXFQ2x4s+UrcCEOEtrTYFu0c6dP gzd1LG6U40Lw4JssEobAn7Tljqobizkd5PR150M7d1/gweqdYl3epzMYmdJC4NyBwSwm V1c2GtXMBEIO6i0oDjyO3gMCIf48MeAThKYh259gdvd9RgM65Ic3SmjtfFTjd7oyIsQw elZVurlQZsMAlDq8TliACzSZmsg6Uz23g3d5N2ehg70ZfcHQcMyJtHzK++m+AqX/ZnXz 2n2M9oGPp+TLCW2l9mVtEZ0WhCeBCOzvpguo/YzPJ87Z4m+lTWns6zXugMzQqznqMUdF V/lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AYCVz9Mj; 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 e21si4015152edq.191.2019.12.02.02.31.23; Mon, 02 Dec 2019 02:31:23 -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=AYCVz9Mj; 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 S1727576AbfLBKbX (ORCPT + 15 others); Mon, 2 Dec 2019 05:31:23 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39042 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727388AbfLBKbW (ORCPT ); Mon, 2 Dec 2019 05:31:22 -0500 Received: by mail-wr1-f66.google.com with SMTP id y11so40393564wrt.6 for ; Mon, 02 Dec 2019 02:31:21 -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=Iqx8Ht1ZGNVIIH/KCqKXiFs77tmuv1VNOT/G4PBiB98=; b=AYCVz9Mj70QL0XbsrsU/JZy34sTyR0ekP5Owc8uPqLyT+CYPQasAotsQWiaT/fX6I9 hAD6QOIx1piv6xTI9FEJ2JIaKoEo4W4VeLK1HARFUAzJlmBAlb+n4yXeJPIA1OiE0KKx 1yYdP5/K5WRk19VajM3TAKH2aJljY2hJS4J5WWVAiwISc8L03WXsKYAor/to6gpYXC1b 7260MTEmcZWR9EBHsxfb0Ps3y7OosFoy9JyUmqynwGGtVIG3gJOTYhD4TBziQB1nt8qR vWxGJ4oPUZBKbkpJ2PZYiOHYgrC6y92KjhrkSeK8UbIuS/5QYM4KWDxxhahItsxV5fDI Nd1w== 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=Iqx8Ht1ZGNVIIH/KCqKXiFs77tmuv1VNOT/G4PBiB98=; b=sqlIvjZJjvOvdmnPLTkwi01asNbKBWwN4IbGGyjzsXgOHxEFaHzzWQJ4SZCFsRjMp2 WStIQR+8xLliUvSeHsgAK7Srw7EvFQtOduhsCp1EixUB6I3/qOIAyFmuIypLGNq6fN7f Clr2/Gbt0PvtM3DzChJd/TDqxzSC+ubDm2+rceP7w0+pCLQwkcBTTJg5jZbCLOwvyysm gFUtN5+WFxMcXOz/sXBpC7+SsHV3ZgVTRXUeZbBAPgWiZjncaq4Exn32l3OweQ12k5Df yLbP6Srb7eVWsZLlEwPvTylJQ4zYD8+CqJTF8YZ3IpdwfhdB5WDcknbOKaopSU2IC4fs qNcw== X-Gm-Message-State: APjAAAWrl5AfZn0uh0Yp/JaXygTCjdGKDT68CSOmGoNmzBtDY5IiO9ay 2bZNNFPCFTMPcQo1VLp0KepRvLxqvwo= X-Received: by 2002:a5d:4d8d:: with SMTP id b13mr24599819wru.6.1575282680736; Mon, 02 Dec 2019 02:31:20 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id r6sm26402860wrq.92.2019.12.02.02.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:31:20 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 12/15] net: macb driver, check for SKBTX_HW_TSTAMP Date: Mon, 2 Dec 2019 10:30:47 +0000 Message-Id: <20191202103050.2668-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202103050.2668-1-lee.jones@linaro.org> References: <20191202103050.2668-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 d98077ab306b..005fee2dd0e6 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -860,7 +860,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 */