Skip to content

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

sw:drv: load FMC together with other cores 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent a0e1e311
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 13 deletions
software/kernel/spec-core-fpga.c
View file @ a9dd94e9
......@@ -358,6 +358,9 @@ int spec_core_fpga_init(struct spec_dev *spec)
err = spec_core_fpga_i2c_init(spec);
if (err)
goto err_i2c;
err = spec_fmc_init(spec);
if (err)
goto err_fmc;
err = spec_core_fpga_therm_init(spec);
if (err)
goto err_therm;
......@@ -370,6 +373,8 @@ int spec_core_fpga_init(struct spec_dev *spec)
err_app:
spec_core_fpga_therm_exit(spec);
err_therm:
spec_fmc_exit(spec);
err_fmc:
spec_core_fpga_i2c_exit(spec);
err_i2c:
spec_core_fpga_vic_exit(spec);
......@@ -377,10 +382,13 @@ err_vic:
return err;
}
void spec_core_fpga_exit(struct spec_dev *spec)
int spec_core_fpga_exit(struct spec_dev *spec)
{
spec_core_fpga_app_exit(spec);
spec_core_fpga_therm_exit(spec);
spec_fmc_exit(spec);
spec_core_fpga_i2c_exit(spec);
spec_core_fpga_vic_exit(spec);
return 0;
}
software/kernel/spec-core.c
View file @ a9dd94e9
......@@ -203,21 +203,12 @@ static int spec_probe(struct pci_dev *pdev,
err = spec_core_fpga_init(spec);
if (err)
goto err_core_fpga;
err = spec_fmc_init(spec);
if (err)
goto err_fmc;
dev_info(spec->dev.parent, "Spec registered devptr=0x%p\n", spec->dev.parent);
dev_warn(&spec->dev, "FPGA incorrectly programmed or empty\n");
spec_dbg_init(spec);
return 0;
err_fmc:
spec_core_fpga_exit(spec);
err_core_fpga:
err_fw:
spec_fpga_exit(spec);
err_fpga:
......@@ -246,7 +237,6 @@ static void spec_remove(struct pci_dev *pdev)
int i;
spec_dbg_exit(spec);
spec_fmc_exit(spec);
spec_core_fpga_exit(spec);
spec_fpga_exit(spec);
spec_gpio_exit(spec);
......
software/kernel/spec.h
View file @ a9dd94e9
......@@ -199,6 +199,6 @@ extern int spec_gpio_init(struct spec_dev *spec);
extern void spec_gpio_exit(struct spec_dev *spec);
extern int spec_core_fpga_init(struct spec_dev *spec);
extern void spec_core_fpga_exit(struct spec_dev *spec);
extern int spec_core_fpga_exit(struct spec_dev *spec);
#endif /* __SPEC_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