Skip to content

F
FMC TDC 1ns 5cha - Software
Commit cedaf701 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

kernel: interrupt support throuth VIC (SVEC only so far)

parent 3c88accd
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 23 deletions
kernel/fmc-tdc.h
View file @ cedaf701
...@@ -146,7 +146,6 @@ struct fmctdc_dev { ...@@ -146,7 +146,6 @@ struct fmctdc_dev {
int ft_carrier_base; int ft_carrier_base;
int ft_irq_base; int ft_irq_base;
/* IRQ base index (for SVEC) */ /* IRQ base index (for SVEC) */
int irq_shift;
struct fmc_device *fmc; struct fmc_device *fmc;
struct zio_device *zdev, *hwzdev; struct zio_device *zdev, *hwzdev;
/* is acquisition mode active? */ /* is acquisition mode active? */
......
kernel/ft-core.c
View file @ cedaf701
...@@ -281,7 +281,9 @@ int ft_probe(struct fmc_device *fmc) ...@@ -281,7 +281,9 @@ int ft_probe(struct fmc_device *fmc)
NULL); NULL);
ft->ft_carrier_base = ft->ft_carrier_base =
fmc_find_sdb_device(fmc->sdb, 0xce42, 0x603, NULL); fmc_find_sdb_device(fmc->sdb, 0xce42, 0x603, NULL);
ft->ft_irq_base = fmc_find_sdb_device(fmc->sdb, 0xce42, 0x605, NULL);
/* fixme: use SDB */
ft->ft_irq_base = ft->ft_core_base + 0x2000;
/* FIXME/UGLY HACK: enumerate sub-cores via SDB (requires some HDL cleanup: /* FIXME/UGLY HACK: enumerate sub-cores via SDB (requires some HDL cleanup:
at least the whole Wishbone interconnect must be clocked before we proceed at least the whole Wishbone interconnect must be clocked before we proceed
...@@ -293,11 +295,8 @@ int ft_probe(struct fmc_device *fmc) ...@@ -293,11 +295,8 @@ int ft_probe(struct fmc_device *fmc)
ft->ft_dma_base = ft->ft_dma_base =
fmc_find_sdb_device(fmc->sdb, 0xce42, 0x601, NULL); fmc_find_sdb_device(fmc->sdb, 0xce42, 0x601, NULL);
/* FIXME: the HDL uses custom IRQ controller (not the VIC). IRQ lines are hardcoded. */
ft->irq_shift = 0;
} else { } else {
ft->ft_owregs_base = ft->ft_core_base + 0x1000; ft->ft_owregs_base = ft->ft_core_base + 0x1000;
ft->irq_shift = fmc->slot_id * 3;
} }
if (ft_verbose) { if (ft_verbose) {
...@@ -309,6 +308,7 @@ int ft_probe(struct fmc_device *fmc) ...@@ -309,6 +308,7 @@ int ft_probe(struct fmc_device *fmc)
spin_lock_init(&ft->lock); spin_lock_init(&ft->lock);
/* Retrieve calibration from the eeprom, and validate */ /* Retrieve calibration from the eeprom, and validate */
ret = ft_handle_eeprom_calibration(ft); ret = ft_handle_eeprom_calibration(ft);
if (ret < 0) if (ret < 0)
......
kernel/ft-irq.c
View file @ cedaf701
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/zio.h> #include <linux/zio.h>
#include <linux/zio-trigger.h> #include <linux/zio-trigger.h>
#include <linux/zio-buffer.h>
#include "fmc-tdc.h" #include "fmc-tdc.h"
#include "hw/tdc_regs.h" #include "hw/tdc_regs.h"
...@@ -187,8 +188,7 @@ static irqreturn_t ft_irq_handler(int irq, void *dev_id) ...@@ -187,8 +188,7 @@ static irqreturn_t ft_irq_handler(int irq, void *dev_id)
struct fmctdc_dev *ft = fmc->mezzanine_data; struct fmctdc_dev *ft = fmc->mezzanine_data;
uint32_t irq_stat; uint32_t irq_stat;
irq_stat = fmc_readl(ft->fmc, ft->ft_irq_base + TDC_REG_IRQ_STATUS); irq_stat = fmc_readl(ft->fmc, ft->ft_irq_base + TDC_REG_EIC_ISR); /* clear the IRQ */
irq_stat >>= ft->irq_shift;
if( likely (irq_stat & TDC_IRQ_TDC_TSTAMP)) if( likely (irq_stat & TDC_IRQ_TDC_TSTAMP))
{ {
...@@ -288,26 +288,21 @@ static void ft_readout_tasklet(unsigned long arg) ...@@ -288,26 +288,21 @@ static void ft_readout_tasklet(unsigned long arg)
out: out:
/* ack the irq */ /* ack the irq */
fmc_writel(ft->fmc, TDC_IRQ_TDC_TSTAMP << ft->irq_shift, fmc_writel(ft->fmc, TDC_IRQ_TDC_TSTAMP, ft->ft_irq_base + TDC_REG_EIC_ISR);
ft->ft_irq_base + TDC_REG_IRQ_STATUS);
fmc->op->irq_ack(fmc); fmc->op->irq_ack(fmc);
} }
int ft_irq_init(struct fmctdc_dev *ft) int ft_irq_init(struct fmctdc_dev *ft)
{ {
uint32_t irq_en;
tasklet_init(&ft->readout_tasklet, ft_readout_tasklet, tasklet_init(&ft->readout_tasklet, ft_readout_tasklet,
(unsigned long)ft); (unsigned long)ft);
/* disable coalescing, it's currently broken */ /* IRQ coalescing: 40 timestamps or 40 milliseconds */
ft_writel(ft, 1, TDC_REG_IRQ_THRESHOLD); ft_writel(ft, 1, TDC_REG_IRQ_THRESHOLD);
ft_writel(ft, 0, TDC_REG_IRQ_TIMEOUT); ft_writel(ft, 0, TDC_REG_IRQ_TIMEOUT);
/* enable timestamp readout irq */ /* enable timestamp readout irq */
irq_en = fmc_readl(ft->fmc, ft->ft_irq_base + TDC_REG_IRQ_ENABLE); fmc_writel(ft->fmc, TDC_IRQ_TDC_TSTAMP, ft->ft_irq_base + TDC_REG_EIC_IER);
fmc_writel(ft->fmc, irq_en | (TDC_IRQ_TDC_TSTAMP << ft->irq_shift),
ft->ft_irq_base + TDC_REG_IRQ_ENABLE);
/* configure the actual handler via a carrier-specific mechanism */ /* configure the actual handler via a carrier-specific mechanism */
return ft->carrier_specific->setup_irqs(ft, ft_irq_handler); return ft->carrier_specific->setup_irqs(ft, ft_irq_handler);
...@@ -315,7 +310,7 @@ int ft_irq_init(struct fmctdc_dev *ft) ...@@ -315,7 +310,7 @@ int ft_irq_init(struct fmctdc_dev *ft)
void ft_irq_exit(struct fmctdc_dev *ft) void ft_irq_exit(struct fmctdc_dev *ft)
{ {
fmc_writel(ft->fmc, 0, ft->ft_irq_base + TDC_REG_IRQ_ENABLE); fmc_writel(ft->fmc, ~0, ft->ft_irq_base + TDC_REG_EIC_IDR);
ft->carrier_specific->disable_irqs(ft); ft->carrier_specific->disable_irqs(ft);
} }
kernel/ft-spec.c
View file @ cedaf701
...@@ -74,7 +74,7 @@ static int ft_spec_copy_timestamps(struct fmctdc_dev *ft, int base_addr, ...@@ -74,7 +74,7 @@ static int ft_spec_copy_timestamps(struct fmctdc_dev *ft, int base_addr,
{ {
struct ft_spec_data *cspec = ft->carrier_data; struct ft_spec_data *cspec = ft->carrier_data;
uint32_t status; uint32_t status;
int i, ret; int i, ret = 0;
cspec->dma_addr = cspec->dma_addr =
dma_map_single(ft->fmc->hwdev, (char *)dst, size, DMA_FROM_DEVICE); dma_map_single(ft->fmc->hwdev, (char *)dst, size, DMA_FROM_DEVICE);
......
kernel/ft-svec.c
View file @ cedaf701
...@@ -89,7 +89,11 @@ static int ft_svec_setup_irqs(struct fmctdc_dev *ft, irq_handler_t handler) ...@@ -89,7 +89,11 @@ static int ft_svec_setup_irqs(struct fmctdc_dev *ft, irq_handler_t handler)
{ {
int ret; int ret;
ret = ft->fmc->op->irq_request(ft->fmc, handler, "fmc-tdc", IRQF_SHARED); /* pass the core's base addr as the VIC IRQ vector. */
/* fixme: vector table points to the bridge instead of the core's base address */
ft->fmc->irq = ft->ft_core_base - 0x10000;
ret = ft->fmc->op->irq_request(ft->fmc, handler, "fmc-tdc", 0);
if (ret < 0) { if (ret < 0) {
dev_err(&ft->fmc->dev, "Request interrupt failed: %d\n", ret); dev_err(&ft->fmc->dev, "Request interrupt failed: %d\n", ret);
......
kernel/hw/tdc_regs.h
View file @ cedaf701
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
#define TDC_INPUT_ENABLE_FLAG BIT(7) #define TDC_INPUT_ENABLE_FLAG BIT(7)
/* IRQ controler registers */ /* IRQ controler registers */
#define TDC_REG_IRQ_MULTI 0x0 #define TDC_REG_EIC_IDR 0x0
#define TDC_REG_IRQ_STATUS 0x4 #define TDC_REG_EIC_IER 0x4
#define TDC_REG_IRQ_ENABLE 0x8 #define TDC_REG_EIC_IMR 0x8
#define TDC_REG_EIC_ISR 0xc
/* IRQ status/enable bits */ /* IRQ status/enable bits */
#define TDC_IRQ_TDC_TSTAMP BIT(2) #define TDC_IRQ_TDC_TSTAMP BIT(0)
#define TDC_IRQ_TDC_ERROR BIT(4)
#define TDC_EVENT_BUFFER_SIZE 256 #define TDC_EVENT_BUFFER_SIZE 256
#define TDC_EVENT_CHANNEL_MASK 0xF #define TDC_EVENT_CHANNEL_MASK 0xF
......
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