Skip to content

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

kernel: split out fd-irq.c (now with the timer) 

This commit has no effect on the code, it just move pieces around (ok,
there are a pair of "inline" that are not inline any more).
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 8bc578a9
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 147 deletions
kernel/Makefile
View file @ dde874f2
......@@ -23,7 +23,7 @@ subdirs-ccflags-y = $(ccflags-y)
obj-m := fmc-fine-delay.o
fmc-fine-delay-objs = fd-zio.o fd-core.o
fmc-fine-delay-objs = fd-zio.o fd-irq.o fd-core.o
fmc-fine-delay-objs += onewire.o spi.o i2c.o gpio.o
fmc-fine-delay-objs += acam.o calibrate.o pll.o time.o
......
kernel/fd-core.c
View file @ dde874f2
......@@ -228,8 +228,10 @@ int fd_probe(struct fmc_device *fmc)
}
}
/* Finally, enable the input */
fd_writel(fd, FD_GCR_INPUT_EN, FD_REG_GCR);
/* Finally, enable the input emgine */
ret = fd_irq_init(fd);
if (ret < 0)
goto err;
if (0) {
struct timespec ts1, ts2, ts3;
......@@ -264,6 +266,7 @@ int fd_remove(struct fmc_device *fmc)
if (!test_bit(FD_FLAG_INITED, &fd->flags)) /* FIXME: ditch this */
return 0; /* No init, no exit */
fd_irq_exit(fd);
while (--i >= 0) {
m = mods + i;
if (m->exit)
......
kernel/fd-irq.c 0 → 100644
View file @ dde874f2
/*
* ZIO interface for the fine-delay driver
*
* Copyright (C) 2012 CERN (www.cern.ch)
* Author: Alessandro Rubini <rubini@gnudd.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* version 2 as published by the Free Software Foundation or, at your
* option, any later version.
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
#include <linux/bitops.h>
#include <linux/io.h>
#include <linux/zio.h>
#include <linux/zio-buffer.h>
#include <linux/zio-trigger.h>
#include <linux/fmc.h>
#include "spec.h"
#include "fine-delay.h"
#include "hw/fd_main_regs.h"
#include "hw/fd_channel_regs.h"
/* Subtract an offset (used for the input timestamp) */
static void fd_ts_sub(struct fd_time *t, uint64_t pico)
{
uint32_t coarse, frac;
/* FIXME: we really need to pre-convert pico to internal repres. */
fd_split_pico(pico, &coarse, &frac);
if (t->frac >= frac) {
t->frac -= frac;
} else {
t->frac = 4096 + t->frac - frac;
coarse++;
}
if (t->coarse >= coarse) {
t->coarse -= coarse;
} else {
t->coarse = 125*1000*1000 + t->coarse - coarse;
t->utc--;
}
}
int fd_read_fifo(struct fd_dev *fd, struct zio_channel *chan)
{
struct zio_control *ctrl;
uint32_t *v, reg;
struct fd_time t;
if ((fd_readl(fd, FD_REG_TSBCR) & FD_TSBCR_EMPTY))
return -EAGAIN;
if (!chan->active_block)
return -EAGAIN;
/* Fecth the fifo entry to registers, so we can read them */
fd_writel(fd, FD_TSBR_ADVANCE_ADV, FD_REG_TSBR_ADVANCE);
/* First, read input data into a local struct to fix the offset */
t.utc = fd_readl(fd, FD_REG_TSBR_SECH) & 0xff;
t.utc <<= 32;
t.utc |= fd_readl(fd, FD_REG_TSBR_SECL);
t.coarse = fd_readl(fd, FD_REG_TSBR_CYCLES) & 0xfffffff;
reg = fd_readl(fd, FD_REG_TSBR_FID);
t.frac = FD_TSBR_FID_FINE_R(reg);
t.channel = FD_TSBR_FID_CHANNEL_R(reg);
t.seq_id = FD_TSBR_FID_SEQID_R(reg);
/* 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_sub(&t, fd->calib.tdc_zero_offset);
/* The input data is written to attribute values in the active block. */
ctrl = zio_get_ctrl(chan->active_block);
v = ctrl->attr_channel.ext_val;
v[FD_ATTR_TDC_UTC_H] = t.utc >> 32;
v[FD_ATTR_TDC_UTC_L] = t.utc;
v[FD_ATTR_TDC_COARSE] = t.coarse;
v[FD_ATTR_TDC_FRAC] = t.frac;
v[FD_ATTR_TDC_SEQ] = t.seq_id;
v[FD_ATTR_TDC_CHAN] = t.channel;
v[FD_ATTR_TDC_FLAGS] = fd->calib.tdc_flags;
v[FD_ATTR_TDC_OFFSET] = fd->calib.tdc_zero_offset;
v[FD_ATTR_TDC_USER_OFF] = fd->calib.tdc_user_offset;
fd_apply_offset(v + FD_ATTR_TDC_UTC_H, fd->calib.tdc_user_offset);
/* 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));
return 0;
}
/*
* We have a timer, used to poll for input samples, until the interrupt
* is there. A timer duration of 0 selects the interrupt.
*/
static int fd_timer_period_ms = 10;
module_param_named(timer_ms, fd_timer_period_ms, int, 0444);
static int fd_timer_period_jiffies; /* converted from ms at init time */
static void fd_timer_fn(unsigned long arg)
{
struct fd_dev *fd = (void *)arg;
struct zio_channel *chan = NULL;
struct zio_device *zdev = fd->zdev;
int i;
if (zdev) {
chan = zdev->cset[0].chan;
} else {
/* nobody read the device so far: we lack the information */
goto out;
}
/* FIXME: manage an array of input samples */
if (!test_bit(FD_FLAG_INPUT_READY, &fd->flags))
goto out;
/* there is an active block, try reading fifo */
if (fd_read_fifo(fd, chan) == 0) {
clear_bit(FD_FLAG_INPUT_READY, &fd->flags);
chan->cset->trig->t_op->data_done(chan->cset);
}
out:
/* Check all output channels with a pending block (FIXME: bad) */
for (i = 1; i < 5; i++)
if (test_and_clear_bit(FD_FLAG_DO_OUTPUT + i, &fd->flags)) {
struct zio_cset *cset = fd->zdev->cset + i;
cset->ti->t_op->data_done(cset);
pr_debug("called data_done\n");
}
mod_timer(&fd->fifo_timer, jiffies + fd_timer_period_jiffies);
}
int fd_irq_init(struct fd_dev *fd)
{
/* This is not per-device, but it works anyways */
fd_timer_period_jiffies = msecs_to_jiffies(fd_timer_period_ms);
if (fd_timer_period_ms) {
pr_info("%s: using a timer for input stamps (%i ms)\n",
KBUILD_MODNAME, fd_timer_period_ms);
} else {
pr_info("%s: NOT using interrupt (not implemented)\n",
KBUILD_MODNAME);
return -EINVAL;
}
setup_timer(&fd->fifo_timer, fd_timer_fn, (unsigned long)fd);
if (fd_timer_period_ms)
mod_timer(&fd->fifo_timer, jiffies + fd_timer_period_jiffies);
fd_writel(fd, FD_GCR_INPUT_EN, FD_REG_GCR);
return 0;
}
void fd_irq_exit(struct fd_dev *fd)
{
del_timer_sync(&fd->fifo_timer);
}
kernel/fd-zio.c
View file @ dde874f2
......@@ -359,30 +359,9 @@ static int fd_zio_conf_set(struct device *dev, struct zio_attribute *zattr,
}
/*
* We are over with attributes, now there's real I/O
* We are over with attributes, now there's real I/O (part is in fd-irq.c)
*/
/* Subtract an offset (used for the input timestamp) */
static void fd_ts_sub(struct fd_time *t, uint64_t pico)
{
uint32_t coarse, frac;
/* FIXME: we really need to pre-convert pico to internal repres. */
fd_split_pico(pico, &coarse, &frac);
if (t->frac >= frac) {
t->frac -= frac;
} else {
t->frac = 4096 + t->frac - frac;
coarse++;
}
if (t->coarse >= coarse) {
t->coarse -= coarse;
} else {
t->coarse = 125*1000*1000 + t->coarse - coarse;
t->utc--;
}
}
/* We need to change the time in attribute tuples, so here it is */
enum attrs {__UTC_H, __UTC_L, __COARSE, __FRAC}; /* the order of our attrs */
......@@ -431,7 +410,7 @@ static void fd_attr_add(uint32_t *a, uint32_t pico)
}
}
static inline void __fd_apply_offset(uint32_t *a, int32_t off_pico)
void fd_apply_offset(uint32_t *a, int32_t off_pico)
{
if (off_pico) {
if (off_pico > 0)
......@@ -441,109 +420,6 @@ static inline void __fd_apply_offset(uint32_t *a, int32_t off_pico)
}
}
static int fd_read_fifo(struct fd_dev *fd, struct zio_channel *chan)
{
struct zio_control *ctrl;
uint32_t *v, reg;
struct fd_time t;
if ((fd_readl(fd, FD_REG_TSBCR) & FD_TSBCR_EMPTY))
return -EAGAIN;
if (!chan->active_block)
return -EAGAIN;
/* Fecth the fifo entry to registers, so we can read them */
fd_writel(fd, FD_TSBR_ADVANCE_ADV, FD_REG_TSBR_ADVANCE);
/* First, read input data into a local struct to fix the offset */
t.utc = fd_readl(fd, FD_REG_TSBR_SECH) & 0xff;
t.utc <<= 32;
t.utc |= fd_readl(fd, FD_REG_TSBR_SECL);
t.coarse = fd_readl(fd, FD_REG_TSBR_CYCLES) & 0xfffffff;
reg = fd_readl(fd, FD_REG_TSBR_FID);
t.frac = FD_TSBR_FID_FINE_R(reg);
t.channel = FD_TSBR_FID_CHANNEL_R(reg);
t.seq_id = FD_TSBR_FID_SEQID_R(reg);
/* 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_sub(&t, fd->calib.tdc_zero_offset);
/* The input data is written to attribute values in the active block. */
ctrl = zio_get_ctrl(chan->active_block);
v = ctrl->attr_channel.ext_val;
v[FD_ATTR_TDC_UTC_H] = t.utc >> 32;
v[FD_ATTR_TDC_UTC_L] = t.utc;
v[FD_ATTR_TDC_COARSE] = t.coarse;
v[FD_ATTR_TDC_FRAC] = t.frac;
v[FD_ATTR_TDC_SEQ] = t.seq_id;
v[FD_ATTR_TDC_CHAN] = t.channel;
v[FD_ATTR_TDC_FLAGS] = fd->calib.tdc_flags;
v[FD_ATTR_TDC_OFFSET] = fd->calib.tdc_zero_offset;
v[FD_ATTR_TDC_USER_OFF] = fd->calib.tdc_user_offset;
__fd_apply_offset(v + FD_ATTR_TDC_UTC_H, fd->calib.tdc_user_offset);
/* 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));
return 0;
}
/*
* We have a timer, used to poll for input samples, until the interrupt
* is there. A timer duration of 0 selects the interrupt.
*/
static int fd_timer_period_ms = 10;
module_param_named(timer_ms, fd_timer_period_ms, int, 0444);
static int fd_timer_period_jiffies; /* converted from ms at init time */
static void fd_timer_fn(unsigned long arg)
{
struct fd_dev *fd = (void *)arg;
struct zio_channel *chan = NULL;
struct zio_device *zdev = fd->zdev;
int i;
if (zdev) {
chan = zdev->cset[0].chan;
} else {
/* nobody read the device so far: we lack the information */
goto out;
}
/* FIXME: manage an array of input samples */
if (!test_bit(FD_FLAG_INPUT_READY, &fd->flags))
goto out;
/* there is an active block, try reading fifo */
if (fd_read_fifo(fd, chan) == 0) {
clear_bit(FD_FLAG_INPUT_READY, &fd->flags);
chan->cset->trig->t_op->data_done(chan->cset);
}
out:
/* Check all output channels with a pending block (FIXME: bad) */
for (i = 1; i < 5; i++)
if (test_and_clear_bit(FD_FLAG_DO_OUTPUT + i, &fd->flags)) {
struct zio_cset *cset = fd->zdev->cset + i;
cset->ti->t_op->data_done(cset);
pr_debug("called data_done\n");
}
mod_timer(&fd->fifo_timer, jiffies + fd_timer_period_jiffies);
}
/* Internal output engine */
static void __fd_zio_output(struct fd_dev *fd, int index1_4, uint32_t *attrs)
{
......@@ -562,7 +438,7 @@ static void __fd_zio_output(struct fd_dev *fd, int index1_4, uint32_t *attrs)
fd->calib.zero_offset[ch]);
}
__fd_apply_offset(attrs + FD_ATTR_OUT_START_H,
fd_apply_offset(attrs + FD_ATTR_OUT_START_H,
fd->calib.ch_user_offset[ch]);
fd_ch_writel(fd, ch, fd->ch[ch].frr_cur, FD_REG_FRR);
......@@ -785,16 +661,6 @@ int fd_zio_register(void)
if (err)
return err;
fd_timer_period_jiffies = msecs_to_jiffies(fd_timer_period_ms);
if (fd_timer_period_ms) {
pr_info("%s: using a timer for input stamps (%i ms)\n",
KBUILD_MODNAME, fd_timer_period_ms);
} else {
pr_info("%s: NOT using interrupt (not implemented)\n",
KBUILD_MODNAME);
return -EINVAL;
}
return 0;
}
......@@ -840,15 +706,11 @@ int fd_zio_init(struct fd_dev *fd)
return err;
}
setup_timer(&fd->fifo_timer, fd_timer_fn, (unsigned long)fd);
if (fd_timer_period_ms)
mod_timer(&fd->fifo_timer, jiffies + fd_timer_period_jiffies);
return 0;
}
void fd_zio_exit(struct fd_dev *fd)
{
del_timer_sync(&fd->fifo_timer);
zio_unregister_device(fd->hwzdev);
zio_free_device(fd->hwzdev);
}
kernel/fine-delay.h
View file @ dde874f2
......@@ -324,7 +324,6 @@ extern int fd_calibrate_outputs(struct fd_dev *fd);
extern void fd_update_calibration(unsigned long arg);
extern int fd_calib_period_s;
/* Functions exported by gpio.c */
extern int fd_gpio_init(struct fd_dev *fd);
extern void fd_gpio_exit(struct fd_dev *fd);
......@@ -348,6 +347,13 @@ extern int fd_zio_register(void);
extern void fd_zio_unregister(void);
extern int fd_zio_init(struct fd_dev *fd);
extern void fd_zio_exit(struct fd_dev *fd);
extern void fd_apply_offset(uint32_t *a, int32_t off_pico);
/* Functions exported by fd-irq.c */
struct zio_channel;
extern int fd_read_fifo(struct fd_dev *fd, struct zio_channel *chan);
extern int fd_irq_init(struct fd_dev *fd);
extern void fd_irq_exit(struct fd_dev *fd);
/* Functions exported by fd-spec.c */
extern int fd_spec_init(void);
......@@ -361,7 +367,5 @@ extern int fd_eerom_read(struct fd_dev *fd, int i2c_addr, uint32_t offset,
extern int fd_eeprom_write(struct fd_dev *fd, int i2c_addr, uint32_t offset,
void *buf, size_t size);
#endif /* __KERNEL__ */
#endif /* __FINE_DELAY_H__ */
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