From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 281928837; Mon, 28 Oct 2024 06:48:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730098111; cv=none; b=mQrCk9HaDCSf8Svvw/z6xe6zb2Oxec92ZbPOKVaqmjntCdjiBCMDsWR255yyhZPSw+rdLimBMpfzIbNqqhqtUH9aTXDutB1y9bJzSvTLUe1eGh3oBlqoglbyM2vex3HXfLRcqt7IHPKYdpi5Mw9KOBaE1quq7cQdcWLckQ+l+GI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730098111; c=relaxed/simple; bh=OHOaxog6dkf0xUTWSTu57vK/ElyZkN83v8NBolTFx+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cavTzN0epjMmr0uDSmYvaK+kOxkh1U+fLQzK3kC67xy6QC/kX4vOnNpui73zprQFbvBL+k4x3sjXKNby8vteiYzOQ4JL19hn2C6vcqM4gEqYhjsQJDddWjNHUaqaTQpPBBNupR1ACQzpR4KmkAervUEcYxXS0tvSaK8zD6Tnpls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EfpgTa68; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EfpgTa68" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 696C1C4CEC3; Mon, 28 Oct 2024 06:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730098110; bh=OHOaxog6dkf0xUTWSTu57vK/ElyZkN83v8NBolTFx+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EfpgTa68K3leMy5BnAOUP6mgQuY6wN13ghAnptiAFGNI8ixp3905JlQYYI4xpwNH4 jeX0/+BsuBh6XEi32iYuDy9jO86xWIHY5LBv7paRl2baBoCHucRz/IsSItxcDiodbA wtb106s7+bGkdcS/l74DGlii7q18LS1T0lRgulaQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Carolina Jubran , Rahul Rameshbabu , Gal Pressman , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Sergey Shtylyov , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.11 081/261] ravb: Remove setting of RX software timestamp Date: Mon, 28 Oct 2024 07:23:43 +0100 Message-ID: <20241028062314.059756867@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062312.001273460@linuxfoundation.org> References: <20241028062312.001273460@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gal Pressman [ Upstream commit 277901ee3a2620679e2c8797377d2a72f4358068 ] The responsibility for reporting of RX software timestamp has moved to the core layer (see __ethtool_get_ts_info()), remove usage from the device drivers. Reviewed-by: Carolina Jubran Reviewed-by: Rahul Rameshbabu Signed-off-by: Gal Pressman Reviewed-by: Niklas Söderlund Reviewed-by: Sergey Shtylyov Link: https://patch.msgid.link/20240901112803.212753-8-gal@nvidia.com Signed-off-by: Jakub Kicinski Stable-dep-of: 126e799602f4 ("net: ravb: Only advertise Rx/Tx timestamps if hardware supports it") Signed-off-by: Sasha Levin --- drivers/net/ethernet/renesas/ravb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 6b82df11fe8d0..d2a6518532f37 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1752,8 +1752,6 @@ static int ravb_get_ts_info(struct net_device *ndev, info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE | - SOF_TIMESTAMPING_RX_SOFTWARE | - SOF_TIMESTAMPING_SOFTWARE | SOF_TIMESTAMPING_TX_HARDWARE | SOF_TIMESTAMPING_RX_HARDWARE | SOF_TIMESTAMPING_RAW_HARDWARE; @@ -1764,6 +1762,8 @@ static int ravb_get_ts_info(struct net_device *ndev, (1 << HWTSTAMP_FILTER_ALL); if (hw_info->gptp || hw_info->ccc_gac) info->phc_index = ptp_clock_index(priv->ptp.clock); + else + info->phc_index = 0; return 0; } -- 2.43.0