Received: by 2002:a05:7412:3b8b:b0:fc:a2b0:25d7 with SMTP id nd11csp2993627rdb; Tue, 13 Feb 2024 03:54:46 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXXtAZZBW68k8q7egIWqgKY+qzGhbizUj/nc70WuAFGo1iiN30SzxX6jJf8ZYLvpUKYuZcX1A6RSNLnrJVtZpFeTpzZgM6QC5j9+VTtNg== X-Google-Smtp-Source: AGHT+IGMamXeU0xRG2zubR+1mutPl+KvTlzK6ZXVx6Rv3XVql2S7zVqCQEBvKOJbvTu+UzMRUITw X-Received: by 2002:a17:906:680d:b0:a3d:232f:a4f7 with SMTP id k13-20020a170906680d00b00a3d232fa4f7mr10298ejr.16.1707825286770; Tue, 13 Feb 2024 03:54:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707825286; cv=pass; d=google.com; s=arc-20160816; b=r1P1WUm4WVLjBkIhyE14gCRCSml17gs2WM4QE1OMY8QRLISBBxmRekI9KkNgrmmBuB SLNCNN1JxZ0JV65wiHmn/cO0/G8AU5EbTpt3mYwmSSrNfUwyNnYGuf0TKbzOz1y5idJQ FCBbplcpg83zPG8qqjI3ENeQ7vo1XBE3Eas2Ap5OgXoZdai8MpEPaDO4UhV9Y0Y9ntfw c5zWillbK2MhcgePz7e6MntskG0Iw5P1f5tKTsdafXfTSmF/dnGpwMzUtx0SkraXl6bO Q+tPZkRKvKZSvdFSOSYCJ9Ir4On9kNbyCe5BHiQcxNS6sHt+tX1a8Omd60c9chLGjwcV A0sg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=G6E1c5a70uX5WskRb30AYCKyrJuyjaP4ln0W8y14wHk=; fh=2h5NVjPo3f/Yj6cP5t5vdhlcc0dymX4Br7L2v52KrdY=; b=m62sAa1ltzswIqGKxlMWBGOSjBAH+EtBUxr8lG/zQHnVe1XG0cgwuy5TxTd/xuYc0P IDdzIbgiXwL9ZffcPsJS1Iq/6rsidiJ3vYOtg/BvG1K0sWPa/QqusTzQB7NNpw2Y3Qxt ZVwv/D6vpr7JzSxsb5Vpe5thFDtNOUsgeZ3M4nMtqOqGbbTDvv9JmLmfiNJ4FG2Iz7YI cml61WuVokPUH//vzwpt05Cg4UxinxW1oVn8ea1vD8t/Zr6c8Pz7k9njGaDzsJFXrXGh DmL+FDNNzz5W379/yvn2kKJGtLqYBqKsA0fuJpjvjpHWJEskd9C5FtdftCrxtlIclsUi K4+w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-63468-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63468-linux.lists.archive=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCWujxnuFQqhwPCyk6ikFPZ9CP9IxZQusgSE4DQtBBdy/Rd2OKN5IgU34P+goxbEEi+VF3zBPj0zod4M0PFaxJe4AtvrWxfe84TgoyJEyA== Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id w18-20020a170906481200b00a3d20c73b70si45338ejq.478.2024.02.13.03.54.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 03:54:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63468-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-63468-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63468-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 84DD51F22EA5 for ; Tue, 13 Feb 2024 11:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CBDDB38FB9; Tue, 13 Feb 2024 11:54:35 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 7DF6F38DD5 for ; Tue, 13 Feb 2024 11:54:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707825275; cv=none; b=k2xDk36krfMkTe5yQQiPLM2tfXXdnn6yxPjHIdRTGuqqaajTYFQmtbqjfgZBEY7PnkzUt4Rlir8+M+W0cH1a/wVMObDDangXnhUIWeuAlyNT18OJR3SMYKI5QJa5DTcezdC+2c01laECwytQ4w3RHG2qUVccMFZdd11cnbrwRl0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707825275; c=relaxed/simple; bh=Ni7xNNrORfQyk4//WfrA8+aD1m/BPMiC7sdc0udhltU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=MMyhJ4ajQAtAmWpJwDx/mim+pOw4c3Eo0BbTqSlQmCpPNpazz6y6EfpNF84t7CoZd90PG4YiwTfDMW0sjBHdmGsrtmzuV1Q8dv9x1tEy8fZwggxii6megPnFndG/kLYcwNgXkU30TOlNioYruOS5Q0fI/HUNzCLvPtIfwxoUsIE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rZrMc-0004OR-HU; Tue, 13 Feb 2024 12:54:14 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rZrMa-000TeD-46; Tue, 13 Feb 2024 12:54:12 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rZrMa-001k76-0B; Tue, 13 Feb 2024 12:54:12 +0100 From: Oleksij Rempel To: Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran Cc: Oleksij Rempel , kernel@pengutronix.de, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v1 1/1] igb: extend PTP timestamp adjustments to i211 Date: Tue, 13 Feb 2024 12:54:10 +0100 Message-Id: <20240213115410.415573-1-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org The i211 requires the same PTP timestamp adjustments as the i210, according to its datasheet. To ensure consistent timestamping across different platforms, this change extends the existing adjustments to include the i211. The adjustment result are tested and comparable for i210 and i211 based systems. Fixes: 3f544d2a4d5c ("igb: adjust PTP timestamps for Tx/Rx latency") Signed-off-by: Oleksij Rempel --- drivers/net/ethernet/intel/igb/igb_ptp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index 319c544b9f04..f94570556120 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -957,7 +957,7 @@ static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter) igb_ptp_systim_to_hwtstamp(adapter, &shhwtstamps, regval); /* adjust timestamp for the TX latency based on link speed */ - if (adapter->hw.mac.type == e1000_i210) { + if (hw->mac.type == e1000_i210 || hw->mac.type == e1000_i211) { switch (adapter->link_speed) { case SPEED_10: adjust = IGB_I210_TX_LATENCY_10; @@ -1003,6 +1003,7 @@ int igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va, ktime_t *timestamp) { struct igb_adapter *adapter = q_vector->adapter; + struct e1000_hw *hw = &adapter->hw; struct skb_shared_hwtstamps ts; __le64 *regval = (__le64 *)va; int adjust = 0; @@ -1022,7 +1023,7 @@ int igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va, igb_ptp_systim_to_hwtstamp(adapter, &ts, le64_to_cpu(regval[1])); /* adjust timestamp for the RX latency based on link speed */ - if (adapter->hw.mac.type == e1000_i210) { + if (hw->mac.type == e1000_i210 || hw->mac.type == e1000_i211) { switch (adapter->link_speed) { case SPEED_10: adjust = IGB_I210_RX_LATENCY_10; -- 2.39.2