Skip to content

F
FMC DEL 1ns 4cha - Software
Commit 7181879a authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

input cser: add raw_tdc support 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent e5459f60
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 24 deletions
kernel/fd-irq.c
View file @ 7181879a
......@@ -78,14 +78,31 @@ static void fd_ts_add(struct fd_time *t, int64_t pico)
}
}
static inline void fd_normalize_time(struct fd_dev *fd, struct fd_time *t)
{
/* The coarse count may be negative, because of how it works */
if (t->coarse & (1<<27)) { // coarse is 28 bits
/* we may get 0xfff.ffef..0xffff.ffff -- 125M == 0x773.5940 */
t->coarse += 125000000;
t->coarse &= 0xfffffff;
t->utc--;
} else if(t->coarse >= 125000000) {
t->coarse -= 125000000;
t->utc++;
}
fd_ts_add(t, fd->calib.tdc_zero_offset);
}
/* This is called from outside, too */
int fd_read_sw_fifo(struct fd_dev *fd, struct zio_channel *chan)
{
struct zio_control *ctrl;
struct zio_ti *ti = chan->cset->ti;
uint32_t *v;
int i;
struct fd_time t;
int i, j;
struct fd_time t, *tp;
unsigned long flags;
if (fd->sw_fifo.tail == fd->sw_fifo.head)
......@@ -104,18 +121,7 @@ int fd_read_sw_fifo(struct fd_dev *fd, struct zio_channel *chan)
fd->sw_fifo.tail++;
spin_unlock_irqrestore(&fd->lock, flags);
/* The coarse count may be negative, because of how it works */
if (t.coarse & (1<<27)) { // coarse is 28 bits
/* we may get 0xfff.ffef..0xffff.ffff -- 125M == 0x773.5940 */
t.coarse += 125000000;
t.coarse &= 0xfffffff;
t.utc--;
} else if(t.coarse >= 125000000) {
t.coarse -= 125000000;
t.utc++;
}
fd_ts_add(&t, fd->calib.tdc_zero_offset);
fd_normalize_time(fd, &t);
/* Write the timestamp in the trigger, it will reach the control */
ti->tstamp.tv_sec = t.utc;
......@@ -145,6 +151,33 @@ int fd_read_sw_fifo(struct fd_dev *fd, struct zio_channel *chan)
/* We also need a copy within the device, so sysfs can read it */
memcpy(fd->tdc_attrs, v + FD_ATTR_DEV__LAST, sizeof(fd->tdc_attrs));
if (ctrl->ssize == 0) /* normal TDC device: no data */
return 0;
/*
* If we are returning raw data in the payload, cluster as many
* samples as they fit, or as many as the fifo has. If a block is there.
*/
if (!chan->active_block)
return 0;
tp = chan->active_block->data;
*tp++ = t; /* already normalized, above */
for (j = 1; j < ctrl->nsamples; j++, tp++) {
spin_lock_irqsave(&fd->lock, flags);
if (fd->sw_fifo.tail == fd->sw_fifo.head) {
spin_unlock_irqrestore(&fd->lock, flags);
break;
}
i = fd->sw_fifo.tail % fd_sw_fifo_len;
*tp = fd->sw_fifo.t[i];
fd->sw_fifo.tail++;
spin_unlock_irqrestore(&fd->lock, flags);
fd_normalize_time(fd, tp);
}
ctrl->nsamples = j;
chan->active_block->datalen = j * ctrl->ssize;
return 0;
}
......
kernel/fd-zio.c
View file @ 7181879a
......@@ -31,6 +31,10 @@
#define _RW_ (S_IRUGO | S_IWUGO) /* I want 80-col lines so this lazy thing */
static int fd_use_raw_tdc;
/* The user may want to use raw TDC registers for faster input */
module_param_named(raw_tdc, fd_use_raw_tdc, int, 0444);
/* The sample size. Mandatory, device-wide */
ZIO_ATTR_DEFINE_STD(ZIO_DEV, fd_zattr_dev_std) = {
......@@ -715,6 +719,12 @@ int fd_zio_register(void)
{
int err;
if (fd_use_raw_tdc) {
/* Hack: change the input channel to return raw registers */
fd_cset[0].ssize = sizeof(struct fd_time);
fd_cset[0].flags = ZIO_DIR_INPUT | ZIO_CSET_TYPE_RAW;
}
err = zio_register_driver(&fd_zdrv);
if (err)
return err;
......
kernel/fine-delay.h
View file @ 7181879a
......@@ -96,6 +96,18 @@ enum fd_output_mode {
*/
#define FD_CSET_INDEX(i) ((i) - FD_ATTR_DEV__LAST)
/*
* Internal time: the first three fields should be converted to zio time.
* This is exported to user space if raw_tdc is selected.
*/
struct fd_time {
uint64_t utc;
uint32_t coarse;
uint32_t frac;
uint32_t channel;
uint32_t seq_id;
};
#ifdef __KERNEL__ /* All the rest is only of kernel users */
......@@ -163,16 +175,7 @@ struct fd_ch {
uint32_t frr_cur;
};
/* Internal time: the first three fields should be converted to zio time */
struct fd_time {
uint64_t utc;
uint32_t coarse;
uint32_t frac;
uint32_t channel;
uint32_t seq_id;
};
/* The software fifo is a circular buffer */
/* The software fifo is a circular buffer of fd_time structures */
struct fd_sw_fifo {
unsigned long head, tail;
struct fd_time *t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment