Merge branch 'release/v2.0.1' into master

f63c5572 · Federico Vaga · f78d447e · 55a623db · f63c5572 · f63c5572
Commit f63c5572 authored Aug 20, 2020 by Federico Vaga
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

CHANGELOG.rst CHANGELOG.rst +8 -0

spec-core.c software/kernel/spec-core.c +4 -0

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,14 @@
 Changelog
 =========

+2.0.0 - 2020-08-20
+==================
+Fixed
+-----
+- program 2 or more SPEC FPGAs in parallel. There is a bug in the
+  GN412x chip that we fixed in software by serializing any attempt of
+  parallel programming
+
 2.0.0 - 2020-07-30
 ==================
 Added

--- a/software/kernel/spec-core.c
+++ b/software/kernel/spec-core.c
@@ -29,6 +29,8 @@ static char *spec_fw_name_45t = "spec-golden-45T.bin";
 static char *spec_fw_name_100t = "spec-golden-100T.bin";
 static char *spec_fw_name_150t = "spec-golden-150T.bin";

+static DEFINE_MUTEX(gn412x_fcl_lock);
+
 char *spec_fw_name = "";
 module_param_named(fw_name, spec_fw_name, charp, 0444);

@@ -577,7 +579,9 @@ static int spec_fw_load(struct spec_gn412x *spec_gn412x, const char *name)

 	spec_bootsel_set(spec_gn412x, SPEC_FPGA_SELECT_GN4124_FPGA);

+	mutex_lock(&gn412x_fcl_lock);
 	err = compat_spec_fw_load(spec_gn412x, name);
+	mutex_unlock(&gn412x_fcl_lock);
 	if (err)
 		goto out;