Skip to content

S
Simple PCIe FMC carrier SPEC - Software
Commit 07f45788 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

kernel/wr-nic-dio: change of behaviour with periodic pulses 

The period pulse on a channel was designed as a generic "mirror one channel
to another with a predefined delay".

However, on different boards self-stamping has different delays, so
if we are mirroring to ourselves, add the delay to the previous setpoint
instead of using the timestamp we got, so the 8ns difference doesn't
accumulate over time.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 1a314643
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 17 deletions
kernel/wr-nic-dio.c
View file @ 07f45788
......@@ -101,7 +101,7 @@ struct dio_channel {
wait_queue_head_t q;
/* The input event may fire a new pulse on this or another channel */
struct timespec delay;
struct timespec prevts, delay;
atomic_t count;
int target_channel;
};
......@@ -160,16 +160,6 @@ static int wrn_dio_cmd_pulse(struct wrn_drvdata *drvdata,
writel(ts[1].tv_nsec / 8, base + map->pulse); /* width */
if (cmd->flags & WR_DIO_F_LOOP) {
c->target_channel = ch;
/* c->count is used after the pulse, so remove the first */
if (cmd->value > 0)
cmd->value--;
atomic_set(&c->count, cmd->value);
c->delay = ts[2];
}
if (cmd->flags & WR_DIO_F_NOW) {
/* if "now" we are done */
writel(1 << ch, &dio->PULSE);
......@@ -191,6 +181,17 @@ static int wrn_dio_cmd_pulse(struct wrn_drvdata *drvdata,
ts->tv_sec += now;
}
if (cmd->flags & WR_DIO_F_LOOP) {
c->target_channel = ch;
/* c->count is used after the pulse, so remove the first */
if (cmd->value > 0)
cmd->value--;
atomic_set(&c->count, cmd->value);
c->prevts = ts[0]; /* our current setpoint */
c->delay = ts[2];
}
__wrn_new_pulse(drvdata, ch, ts);
return 0;
}
......@@ -375,6 +376,25 @@ out:
return ret;
}
/* This is called from the interrupt handler to program a new pulse */
static void wrn_trig_next_pulse(struct wrn_drvdata *drvdata,int ch,
struct dio_channel *c, struct timespec *ts)
{
struct timespec newts;
if (c->target_channel == ch) {
c->prevts = timespec_add(c->prevts, c->delay);
newts = c->prevts;
} else {
newts = timespec_add(*ts, c->delay);
}
__wrn_new_pulse(drvdata, c->target_channel, &newts);
/* If the count is not-infinite, decrement it */
if (atomic_read(&c->count) > 0)
atomic_dec(&c->count);
}
irqreturn_t wrn_dio_interrupt(struct fmc_device *fmc)
{
struct platform_device *pdev = fmc->mezzanine_data;
......@@ -430,12 +450,7 @@ irqreturn_t wrn_dio_interrupt(struct fmc_device *fmc)
}
writel(chm, &dio->EIC_ISR); /* ack */
if (ts && atomic_read(&c->count) != 0) {
struct timespec newts;
if (atomic_read(&c->count) > 0)
atomic_dec(&c->count);
newts = timespec_add(*ts, c->delay);
__wrn_new_pulse(drvdata, c->target_channel, &newts);
wrn_trig_next_pulse(drvdata, ch, c, ts);
}
wake_up_interruptible(&c->q);
}
......
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