Skip to content

S
Simple PCIe FMC carrier SPEC
Commit 400caf56 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch '22-spec-add-a-timeout-for-ddr-calibration' into 'master' 

Resolve "SPEC add a timeout for DDR calibration"

Closes #22

See merge request be-cem-edl/fec/hardware-modules/spec!11
parents e4987acf 15f9aa0a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 9 deletions
software/kernel/spec-core-fpga.c
View file @ 400caf56
......@@ -544,6 +544,37 @@ static struct resource spec_fpga_dma_res[] = {
},
};
static int spec_fpga_ddr_wait_calibration(struct spec_fpga *spec_fpga,
unsigned int timeout_us)
{
unsigned long timeout;
uint32_t ddr_status;
timeout = jiffies + usecs_to_jiffies(timeout_us);
do {
cpu_relax();
if (time_after(jiffies, timeout))
return -ETIMEDOUT;
ddr_status = ioread32(spec_fpga->fpga + SPEC_FPGA_CSR_DDR_STATUS);
} while (!(ddr_status & SPEC_FPGA_CSR_DDR_STATUS_DONE));
return 0;
}
static int spec_fpga_ddr_init(struct spec_fpga *spec_fpga)
{
int err;
err = spec_fpga_ddr_wait_calibration(spec_fpga, 1000000);
if (err) {
dev_err(&spec_fpga->dev,
"DDR controller calibration timeout\n");
return err;
}
return 0;
}
static int spec_fpga_dma_init(struct spec_fpga *spec_fpga)
{
struct pci_dev *pcidev = to_pci_dev(spec_fpga->dev.parent);
......@@ -552,19 +583,15 @@ static int spec_fpga_dma_init(struct spec_fpga *spec_fpga)
struct resource res[ARRAY_SIZE(spec_fpga_dma_res)];
struct platform_device *pdev;
struct irq_domain *vic_domain;
uint32_t ddr_status;
int err;
if (!(spec_fpga->meta->cap & SPEC_META_CAP_DMA))
return 0;
mdelay(1);
ddr_status = ioread32(spec_fpga->fpga + SPEC_FPGA_CSR_DDR_STATUS);
if (!(ddr_status & SPEC_FPGA_CSR_DDR_STATUS_DONE)) {
dev_err(&spec_fpga->dev,
"Failed to load DMA engine: DDR controller not calibrated - 0x%x.\n",
ddr_status);
return -ENODEV;
}
err = spec_fpga_ddr_init(spec_fpga);
if (err)
return err;
vic_domain = spec_fpga_irq_find_host(&spec_fpga->vic_pdev->dev);
if (!vic_domain) {
dev_err(&spec_fpga->dev,
......
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