Skip to content

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

hdl|sw: update spec-base version for next release 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent decbfd2d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
hdl/rtl/spec_base_wr.vhd
View file @ 94bf3e4e
...@@ -604,7 +604,7 @@ begin -- architecture top ...@@ -604,7 +604,7 @@ begin -- architecture top
metadata_data <= x"53504543"; metadata_data <= x"53504543";
when x"2" => when x"2" =>
-- Version -- Version
metadata_data <= x"0104000d"; metadata_data <= x"02000000";
when x"3" => when x"3" =>
-- BOM -- BOM
metadata_data <= x"fffe0000"; metadata_data <= x"fffe0000";
......
software/kernel/spec-core-fpga.c
View file @ 94bf3e4e
...@@ -1128,6 +1128,7 @@ static void spec_fpga_app_exit(struct spec_fpga *spec_fpga) ...@@ -1128,6 +1128,7 @@ static void spec_fpga_app_exit(struct spec_fpga *spec_fpga)
static bool spec_fpga_is_valid(struct spec_gn412x *spec_gn412x, static bool spec_fpga_is_valid(struct spec_gn412x *spec_gn412x,
struct spec_meta_id *meta) struct spec_meta_id *meta)
{ {
if ((meta->bom & SPEC_META_BOM_END_MASK) != SPEC_META_BOM_LE) { if ((meta->bom & SPEC_META_BOM_END_MASK) != SPEC_META_BOM_LE) {
dev_err(&spec_gn412x->pdev->dev, dev_err(&spec_gn412x->pdev->dev,
"Expected Little Endian devices BOM: 0x%x\n", "Expected Little Endian devices BOM: 0x%x\n",
...@@ -1150,7 +1151,7 @@ static bool spec_fpga_is_valid(struct spec_gn412x *spec_gn412x, ...@@ -1150,7 +1151,7 @@ static bool spec_fpga_is_valid(struct spec_gn412x *spec_gn412x,
return false; return false;
} }
if ((meta->version & SPEC_META_VERSION_MASK) != SPEC_META_VERSION_1_4) { if ((meta->version & SPEC_META_VERSION_MASK) != SPEC_META_VERSION_2_0) {
dev_err(&spec_gn412x->pdev->dev, dev_err(&spec_gn412x->pdev->dev,
"Unknow version: %08x\n", meta->version); "Unknow version: %08x\n", meta->version);
return false; return false;
......
software/kernel/spec.h
View file @ 94bf3e4e
...@@ -85,7 +85,7 @@ enum { ...@@ -85,7 +85,7 @@ enum {
#define SPEC_META_BOM_END_MASK 0xFFFF0000 #define SPEC_META_BOM_END_MASK 0xFFFF0000
#define SPEC_META_BOM_VER_MASK 0x0000FFFF #define SPEC_META_BOM_VER_MASK 0x0000FFFF
#define SPEC_META_VERSION_MASK 0xFFFF0000 #define SPEC_META_VERSION_MASK 0xFFFF0000
#define SPEC_META_VERSION_1_4 0x01040000 #define SPEC_META_VERSION_2_0 0x02000000
/** /**
* struct spec_meta_id Metadata * struct spec_meta_id Metadata
......
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