From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] igc: Remove convert_art_ns_to_tsc()
Date: Mon, 03 Jun 2024 09:30:08 -0000 [thread overview]
Message-ID: <171740700897.10875.5949504634520577280.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240513103813.5666-5-lakshmi.sowjanya.d@intel.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: fcb05911e5832364c5f154b519a471225b34855e
Gitweb: https://git.kernel.org/tip/fcb05911e5832364c5f154b519a471225b34855e
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Mon, 13 May 2024 16:08:05 +05:30
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 03 Jun 2024 11:18:50 +02:00
igc: Remove convert_art_ns_to_tsc()
The core code now provides a mechanism to convert the ART base clock to the
corresponding TSC value without requiring an architecture specific
function.
Replace the direct conversion by filling in the required data.
No functional change intended.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240513103813.5666-5-lakshmi.sowjanya.d@intel.com
---
drivers/net/ethernet/intel/igc/igc_ptp.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 1bb0262..946edba 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -938,7 +938,11 @@ static bool igc_is_crosststamp_supported(struct igc_adapter *adapter)
static struct system_counterval_t igc_device_tstamp_to_system(u64 tstamp)
{
#if IS_ENABLED(CONFIG_X86_TSC) && !defined(CONFIG_UML)
- return convert_art_ns_to_tsc(tstamp);
+ return (struct system_counterval_t) {
+ .cs_id = CSID_X86_ART,
+ .cycles = tstamp,
+ .use_nsecs = true,
+ };
#else
return (struct system_counterval_t) { };
#endif
next prev parent reply other threads:[~2024-06-03 9:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 10:38 [PATCH v8 00/12] Add support for Intel PPS Generator lakshmi.sowjanya.d
2024-05-13 10:38 ` [PATCH v8 01/12] timekeeping: Add base clock properties in clocksource structure lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] timekeeping: Provide infrastructure for converting to/from a base clock tip-bot2 for Lakshmi Sowjanya D
2024-05-13 10:38 ` [PATCH v8 02/12] x86/tsc: Update tsc/art values in the base clock structure lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] x86/tsc: Provide ART base clock information for TSC tip-bot2 for Lakshmi Sowjanya D
2024-05-13 10:38 ` [PATCH v8 03/12] e1000e: remove convert_art_to_tsc() lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] e1000e: Replace convert_art_to_tsc() tip-bot2 for Thomas Gleixner
2024-05-13 10:38 ` [PATCH v8 04/12] igc: remove convert_art_ns_to_tsc() lakshmi.sowjanya.d
2024-06-03 9:30 ` tip-bot2 for Thomas Gleixner [this message]
2024-05-13 10:38 ` [PATCH v8 05/12] stmmac: intel: remove convert_art_to_tsc() lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] stmmac: intel: Remove convert_art_to_tsc() tip-bot2 for Thomas Gleixner
2024-05-13 10:38 ` [PATCH v8 06/12] ALSA: hda: remove convert_art_to_tsc() lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] ALSA: hda: Remove convert_art_to_tsc() tip-bot2 for Thomas Gleixner
2024-05-13 10:38 ` [PATCH v8 07/12] ice/ptp: remove convert_art_to_tsc() lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] ice/ptp: Remove convert_art_to_tsc() tip-bot2 for Thomas Gleixner
2024-05-13 10:38 ` [PATCH v8 08/12] x86/tsc: Remove art to tsc conversion functions which are obsolete lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] x86/tsc: Remove obsolete ART to TSC conversion functions tip-bot2 for Lakshmi Sowjanya D
2024-05-13 10:38 ` [PATCH v8 09/12] timekeeping: Add function to convert realtime to base clock lakshmi.sowjanya.d
2024-06-03 9:30 ` [tip: timers/core] " tip-bot2 for Lakshmi Sowjanya D
2024-05-13 10:38 ` [PATCH v8 10/12] pps: generators: Add PPS Generator TIO Driver lakshmi.sowjanya.d
2024-05-13 11:18 ` Andy Shevchenko
2024-05-13 11:20 ` Andy Shevchenko
2024-05-27 11:48 ` D, Lakshmi Sowjanya
2024-05-27 14:34 ` Andy Shevchenko
2024-05-30 5:52 ` D, Lakshmi Sowjanya
2024-05-30 8:38 ` Andy Shevchenko
2024-05-13 10:38 ` [PATCH v8 11/12] Documentation: driver-api: pps: Add Intel Timed I/O PPS generator lakshmi.sowjanya.d
2024-05-15 11:16 ` Bagas Sanjaya
2024-05-13 10:38 ` [PATCH v8 12/12] ABI: pps: Add ABI documentation for Intel TIO lakshmi.sowjanya.d
2024-05-13 11:22 ` Andy Shevchenko
2024-05-27 11:53 ` D, Lakshmi Sowjanya
2024-05-27 14:37 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=171740700897.10875.5949504634520577280.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=lakshmi.sowjanya.d@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®