Skip to content

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

sw:drv: do not support vendor UUID 

Due to a Linux limitation we cannot support the vendor UUID in this
version (the platform_device_id->name is limited to 20 characters, while
only the vendor UUID needs 32).
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 1a72bcbc
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
software/kernel/spec-core-fpga.c
View file @ 3bb69c00
......@@ -605,25 +605,22 @@ static int spec_fmc_exit(struct spec_fpga *spec_fpga)
}
/* FPGA Application */
static void spec_fpga_app_id_build(struct spec_fpga *spec_fpga,
unsigned long app_off,
char *id, unsigned int size)
static int spec_fpga_app_id_build(struct spec_fpga *spec_fpga,
unsigned long app_off,
char *id, unsigned int size)
{
uint32_t vendor = ioread32(spec_fpga->fpga + app_off);
uint32_t device = ioread32(spec_fpga->fpga + app_off);
memset(id, 0, size);
if (vendor == 0xFF000000) {
uint32_t vendor_uuid[4];
vendor_uuid[0] = ioread32(spec_fpga->fpga + app_off + FPGA_META_UUID + 0x0);
vendor_uuid[1] = ioread32(spec_fpga->fpga + app_off + FPGA_META_UUID + 0x4);
vendor_uuid[2] = ioread32(spec_fpga->fpga + app_off + FPGA_META_UUID + 0x8);
vendor_uuid[3] = ioread32(spec_fpga->fpga + app_off + FPGA_META_UUID + 0xC);
snprintf(id, size, "%16phN%4phN", &vendor_uuid, &device);
dev_warn(&spec_fpga->dev, "Vendor UUID not supported yet\n");
return -ENODEV;
} else {
snprintf(id, size, "id:%4phN%4phN", &vendor, &device);
}
return 0;
}
static int spec_fpga_app_init(struct spec_fpga *spec_fpga)
......@@ -643,6 +640,7 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga)
struct irq_domain *vic_domain;
char app_name[SPEC_FPGA_APP_NAME_MAX];
unsigned long app_offset;
int err;
app_offset = spec_fpga_csr_app_offset(spec_fpga);
if (!app_offset) {
......@@ -673,8 +671,11 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga)
res_n = 1;
}
spec_fpga_app_id_build(spec_fpga, SPEC_FPGA_CSR_APP_OFF,
app_name, SPEC_FPGA_APP_NAME_MAX);
err = spec_fpga_app_id_build(spec_fpga, SPEC_FPGA_CSR_APP_OFF,
app_name, SPEC_FPGA_APP_NAME_MAX);
if (err)
return err;
pdev = platform_device_register_resndata(&spec_fpga->dev,
app_name, PLATFORM_DEVID_AUTO,
res, res_n,
......
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