nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

drivers:nvpps:deprecate older kernel support

Browse Source 
deprecate older kernel support as current kernel
version used is > K5.15

bug 5175333

Signed-off-by: Sheetal Tigadoli <stigadoli@nvidia.com>
Change-Id: I97a5ec274ec28c457e0ffbd2729376f65f5bbd7b
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3337807
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Sumeet Gupta <sumeetg@nvidia.com>
Reviewed-by: Kiran Kumar Bobbu <kbobbu@nvidia.com>
This commit is contained in:
Sheetal Tigadoli
2025-04-10 05:37:04 +00:00
committed by Jon Hunter
parent 73cba718fb
commit e2af8ee563
3 changed files with 3 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/nvpps/nvpps_main.c
View File

@@ -289,15 +289,9 @@ static irqreturn_t nvpps_gpio_isr(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
static void tsc_timer_callback(unsigned long data)
{
struct nvpps_device_data *pdev_data = (struct nvpps_device_data *)data;
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) */
static void tsc_timer_callback(struct timer_list *t) static void tsc_timer_callback(struct timer_list *t)
{ {
struct nvpps_device_data *pdev_data = (struct nvpps_device_data *)from_timer(pdev_data, t, tsc_timer); struct nvpps_device_data *pdev_data = (struct nvpps_device_data *)from_timer(pdev_data, t, tsc_timer);
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) */
if (pdev_data->soc_data.ops->ptp_tsc_get_is_locked_fn) { if (pdev_data->soc_data.ops->ptp_tsc_get_is_locked_fn) {
/* check and trigger sync if PTP-TSC is unlocked */ /* check and trigger sync if PTP-TSC is unlocked */
@@ -313,15 +307,10 @@ static void tsc_timer_callback(struct timer_list *t)
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
static void nvpps_timer_callback(unsigned long data)
{
struct nvpps_device_data *pdev_data = (struct nvpps_device_data *)data;
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) */
static void nvpps_timer_callback(struct timer_list *t) static void nvpps_timer_callback(struct timer_list *t)
{ {
struct nvpps_device_data *pdev_data = (struct nvpps_device_data *)from_timer(pdev_data, t, timer); struct nvpps_device_data *pdev_data = (struct nvpps_device_data *)from_timer(pdev_data, t, timer);
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) */
/* get timestamps for this event */ /* get timestamps for this event */
nvpps_get_ts(pdev_data, 0); nvpps_get_ts(pdev_data, 0);
@@ -335,15 +324,10 @@ static void nvpps_timer_callback(struct timer_list *t)
locking process if its not locked in the handler */ locking process if its not locked in the handler */
static int set_mode_tsc(struct nvpps_device_data *pdev_data) static int set_mode_tsc(struct nvpps_device_data *pdev_data)
{ {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
setup_timer(&pdev_data->tsc_timer,
tsc_timer_callback,
(unsigned long)pdev_data);
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) */
timer_setup(&pdev_data->tsc_timer, timer_setup(&pdev_data->tsc_timer,
tsc_timer_callback, tsc_timer_callback,
0); 0);
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) */
mod_timer(&pdev_data->tsc_timer, jiffies + msecs_to_jiffies(1000)); mod_timer(&pdev_data->tsc_timer, jiffies + msecs_to_jiffies(1000));
return 0; return 0;
@@ -410,15 +394,9 @@ static int set_mode(struct nvpps_device_data *pdev_data, u32 mode)
* already then initialize it * already then initialize it
*/ */
if (!pdev_data->timer_inited) { if (!pdev_data->timer_inited) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
setup_timer(&pdev_data->timer,
nvpps_timer_callback,
(unsigned long)pdev_data);
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) */
timer_setup(&pdev_data->timer, timer_setup(&pdev_data->timer,
nvpps_timer_callback, nvpps_timer_callback,
0); 0);
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) */
pdev_data->timer_inited = true; pdev_data->timer_inited = true;
/* setup timer interval to 1000 msecs */ /* setup timer interval to 1000 msecs */
mod_timer(&pdev_data->timer, jiffies + msecs_to_jiffies(pdev_data->ts_capture_interval_ms)); mod_timer(&pdev_data->timer, jiffies + msecs_to_jiffies(pdev_data->ts_capture_interval_ms));
@@ -435,13 +413,8 @@ static int set_mode(struct nvpps_device_data *pdev_data, u32 mode)
/* Character device stuff */ /* Character device stuff */
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
static unsigned int nvpps_poll(struct file *file, poll_table *wait)
{
#else
static __poll_t nvpps_poll(struct file *file, poll_table *wait) static __poll_t nvpps_poll(struct file *file, poll_table *wait)
{ {
#endif
struct nvpps_file_data *pfile_data = (struct nvpps_file_data *)file->private_data; struct nvpps_file_data *pfile_data = (struct nvpps_file_data *)file->private_data;
struct nvpps_device_data *pdev_data = pfile_data->pdev_data; struct nvpps_device_data *pdev_data = pfile_data->pdev_data;
@@ -591,18 +564,10 @@ static long nvpps_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
mutex_lock(&pdev_data->ts_lock); mutex_lock(&pdev_data->ts_lock);
switch (time_stamp.clockid) { switch (time_stamp.clockid) {
case CLOCK_REALTIME: case CLOCK_REALTIME:
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
ktime_get_real_ts(&time_stamp.kernel_ts);
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) */
ktime_get_real_ts64(&time_stamp.kernel_ts); ktime_get_real_ts64(&time_stamp.kernel_ts);
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) */
break; break;
case CLOCK_MONOTONIC: case CLOCK_MONOTONIC:
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
ktime_get_ts(&time_stamp.kernel_ts);
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) */
/* read TSC counter value */ /* read TSC counter value */
err = pdev_data->soc_data.ops->get_monotonic_tsc_ts_fn(&pdev_data->soc_data, &tsc_ts); err = pdev_data->soc_data.ops->get_monotonic_tsc_ts_fn(&pdev_data->soc_data, &tsc_ts);
if (err != 0) { if (err != 0) {
@@ -616,7 +581,6 @@ static long nvpps_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
/* split TSC TS in seconds & nanoseconds */ /* split TSC TS in seconds & nanoseconds */
time_stamp.kernel_ts.tv_sec = tsc_ts / _NANO_SECS; time_stamp.kernel_ts.tv_sec = tsc_ts / _NANO_SECS;
time_stamp.kernel_ts.tv_nsec = (tsc_ts - (time_stamp.kernel_ts.tv_sec * _NANO_SECS)); time_stamp.kernel_ts.tv_nsec = (tsc_ts - (time_stamp.kernel_ts.tv_sec * _NANO_SECS));
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) */
break; break;
default: default:

11
drivers/nvpps/nvpps_t23x.c
View File

@@ -215,17 +215,6 @@ fail:
return ret; return ret;
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
static inline u64 __arch_counter_get_cntvct(void)
{
u64 cval;
asm volatile("mrs %0, cntvct_el0" : "=r" (cval));
return cval;
}
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) */
static int32_t nvpps_t23x_get_monotonic_tsc_ts(struct soc_dev_data *soc_data, uint64_t *tsc_ts) static int32_t nvpps_t23x_get_monotonic_tsc_ts(struct soc_dev_data *soc_data, uint64_t *tsc_ts)
{ {
int32_t ret = -EINVAL; int32_t ret = -EINVAL;

11
drivers/nvpps/nvpps_t26x.c
View File

@@ -255,17 +255,6 @@ fail:
return ret; return ret;
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
static inline u64 __arch_counter_get_cntvct(void)
{
u64 cval;
asm volatile("mrs %0, cntvct_el0" : "=r" (cval));
return cval;
}
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) */
static int32_t nvpps_t26x_get_monotonic_tsc_ts(struct soc_dev_data *soc_data, uint64_t *tsc_ts) static int32_t nvpps_t26x_get_monotonic_tsc_ts(struct soc_dev_data *soc_data, uint64_t *tsc_ts)
{ {
int32_t ret = -EINVAL; int32_t ret = -EINVAL;