mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ptp: Move from simple ida to xarray 

Move from simple ida to xarray for storing and loading the ptp_clock
pointer. This prepares support for future hardware timestamp selection by
being able to link the ptp clock index to its pointer.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://lore.kernel.org/r/20240311144730.1239594-1-kory.maincent@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Kory Maincent 2024-03-11 15:47:29 +01:00 committed by Jakub Kicinski
parent 195f88c577
commit f095fefacd
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/ptp/ptp_clock.c
View File

@ -4,7 +4,6 @@
* *
* Copyright (C) 2010 OMICRON electronics GmbH * Copyright (C) 2010 OMICRON electronics GmbH
*/ */
#include <linux/idr.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
@ -16,6 +15,7 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/xarray.h>
#include <uapi/linux/sched/types.h> #include <uapi/linux/sched/types.h>
#include "ptp_private.h" #include "ptp_private.h"
@ -34,7 +34,7 @@ const struct class ptp_class = {
static dev_t ptp_devt; static dev_t ptp_devt;
static DEFINE_IDA(ptp_clocks_map); static DEFINE_XARRAY_ALLOC(ptp_clocks_map);
/* time stamp event queue operations */ /* time stamp event queue operations */
@ -204,7 +204,7 @@ static void ptp_clock_release(struct device *dev)
bitmap_free(tsevq->mask); bitmap_free(tsevq->mask);
kfree(tsevq); kfree(tsevq);
debugfs_remove(ptp->debugfs_root); debugfs_remove(ptp->debugfs_root);
ida_free(&ptp_clocks_map, ptp->index); xa_erase(&ptp_clocks_map, ptp->index);
kfree(ptp); kfree(ptp);
} }
@ -236,7 +236,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
{ {
struct ptp_clock *ptp; struct ptp_clock *ptp;
struct timestamp_event_queue *queue = NULL; struct timestamp_event_queue *queue = NULL;
int err = 0, index, major = MAJOR(ptp_devt); int err, index, major = MAJOR(ptp_devt);
char debugfsname[16]; char debugfsname[16];
size_t size; size_t size;
@ -244,30 +244,34 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
/* Initialize a clock structure. */ /* Initialize a clock structure. */
err = -ENOMEM;
ptp = kzalloc(sizeof(struct ptp_clock), GFP_KERNEL); ptp = kzalloc(sizeof(struct ptp_clock), GFP_KERNEL);
if (ptp == NULL) if (!ptp) {
err = -ENOMEM;
goto no_memory; goto no_memory;
index = ida_alloc_max(&ptp_clocks_map, MINORMASK, GFP_KERNEL);
if (index < 0) {
err = index;
goto no_slot;
} }
err = xa_alloc(&ptp_clocks_map, &index, ptp, xa_limit_31b,
GFP_KERNEL);
if (err)
goto no_slot;
ptp->clock.ops = ptp_clock_ops; ptp->clock.ops = ptp_clock_ops;
ptp->info = info; ptp->info = info;
ptp->devid = MKDEV(major, index); ptp->devid = MKDEV(major, index);
ptp->index = index; ptp->index = index;
INIT_LIST_HEAD(&ptp->tsevqs); INIT_LIST_HEAD(&ptp->tsevqs);
queue = kzalloc(sizeof(*queue), GFP_KERNEL); queue = kzalloc(sizeof(*queue), GFP_KERNEL);
if (!queue) if (!queue) {
err = -ENOMEM;
goto no_memory_queue; goto no_memory_queue;
}
list_add_tail(&queue->qlist, &ptp->tsevqs); list_add_tail(&queue->qlist, &ptp->tsevqs);
spin_lock_init(&ptp->tsevqs_lock); spin_lock_init(&ptp->tsevqs_lock);
queue->mask = bitmap_alloc(PTP_MAX_CHANNELS, GFP_KERNEL); queue->mask = bitmap_alloc(PTP_MAX_CHANNELS, GFP_KERNEL);
if (!queue->mask) if (!queue->mask) {
err = -ENOMEM;
goto no_memory_bitmap; goto no_memory_bitmap;
}
bitmap_set(queue->mask, 0, PTP_MAX_CHANNELS); bitmap_set(queue->mask, 0, PTP_MAX_CHANNELS);
spin_lock_init(&queue->lock); spin_lock_init(&queue->lock);
mutex_init(&ptp->pincfg_mux); mutex_init(&ptp->pincfg_mux);
@ -381,7 +385,7 @@ no_memory_bitmap:
list_del(&queue->qlist); list_del(&queue->qlist);
kfree(queue); kfree(queue);
no_memory_queue: no_memory_queue:
ida_free(&ptp_clocks_map, index); xa_erase(&ptp_clocks_map, index);
no_slot: no_slot:
kfree(ptp); kfree(ptp);
no_memory: no_memory:
@ -514,7 +518,7 @@ static void __exit ptp_exit(void)
{ {
class_unregister(&ptp_class); class_unregister(&ptp_class);
unregister_chrdev_region(ptp_devt, MINORMASK + 1); unregister_chrdev_region(ptp_devt, MINORMASK + 1);
ida_destroy(&ptp_clocks_map); xa_destroy(&ptp_clocks_map);
} }
static int __init ptp_init(void) static int __init ptp_init(void)