Merge branch 'release/v1.4.12'

030ac0fe · Federico Vaga · b5348bb5 · d70eafc6 · 030ac0fe · 030ac0fe
Commit 030ac0fe authored May 12, 2020 by Federico Vaga
5 changed files
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog
 =========
+[1.4.12] 2020-05-12
+===================
+Added
+-----
+- [hdl] metadata source-id automatic assignment
+Changed
+-----
+- [sw] do not double remap memory
 [1.4.11] 2020-05-04
 ===================

--- a/hdl/rtl/Manifest.py
+++ b/hdl/rtl/Manifest.py
-files = ["spec_base_regs.vhd", "spec_base_wr.vhd"]
+files = [
+    "spec_base_regs.vhd",
+    "spec_base_wr.vhd",
+    "sourceid_spec_base_pkg.vhd",
+]
+try:
+    # Assume this module is in fact a git submodule of a main project that
+    # is in the same directory as general-cores...
+    exec(open("../../../" + "/general-cores/tools/gen_sourceid.py").read(),
+         None, {'project': 'spec_base'})
+except Exception as e:
+    print("Error: cannot generate source id file")
+    raise
--- a/hdl/rtl/spec_base_wr.vhd
+++ b/hdl/rtl/spec_base_wr.vhd
@@ -36,6 +36,7 @@ use work.wr_spec_pkg.all;
 use work.buildinfo_pkg.all;
 use work.wr_fabric_pkg.all;
 use work.streamers_pkg.all;
+use work.sourceid_spec_base_pkg;
 library unisim;
 use unisim.vcomponents.all;
@@ -595,13 +596,22 @@ begin  -- architecture top
          metadata_data <= x"53504543";
        when x"2" =>
          -- Version
-          metadata_data <= x"01040000";
+          metadata_data <= x"01040012";
        when x"3" =>
          -- BOM
          metadata_data <= x"fffe0000";
-        when x"4" | x"5" | x"6" | x"7" =>
+        when x"4" =>
          -- source id
-          metadata_data <= x"00000000";
+          metadata_data <= sourceid_spec_base_pkg.sourceid(127 downto 96);
+        when x"5" =>
+          -- source id
+          metadata_data <= sourceid_spec_base_pkg.sourceid(95 downto 64);
+        when x"6" =>
+          -- source id
+          metadata_data <= sourceid_spec_base_pkg.sourceid(63 downto 32);
+        when x"7" =>
+          -- source id
+          metadata_data <= sourceid_spec_base_pkg.sourceid(31 downto 0);
        when x"8" =>
          -- capability mask
          metadata_data <= x"00000000";

--- a/software/kernel/gn412x-gpio.c
+++ b/software/kernel/gn412x-gpio.c
@@ -174,8 +174,6 @@ static void gn412x_gpio_int_cfg_enable(struct gn412x_gpio_dev *gn412x)
 /**
 * Disable GPIO interrupts from a single configuration space
 * @gn412x gn412x device
- *
- * Return: 0 on success, otherwise a negative error number
 */
 static void gn412x_gpio_int_cfg_disable(struct gn412x_gpio_dev *gn412x)
 {

--- a/software/kernel/spec-core.c
+++ b/software/kernel/spec-core.c
@@ -132,17 +132,24 @@ static int spec_dbg_meta(struct seq_file *s, void *offset)
 	void *iomem;
 	uint32_t app_offset;
-	iomem =  ioremap(r0->start, resource_size(r0));
+	if (!spec_gn412x->spec_fpga) {
+		iomem =  ioremap(r0->start, resource_size(r0));
+	} else {
+		iomem = spec_gn412x->spec_fpga->fpga;
+	}
 	if (!iomem) {
 		dev_warn(&spec_gn412x->pdev->dev, "%s: Mapping failed\n",
 			 __func__);
 		return -ENOMEM;
 	}
 	app_offset = ioread32(iomem + 0x40);
 	seq_printf_meta(s, "", iomem + SPEC_META_BASE);
 	seq_puts(s, "Application:\n");
 	seq_printf_meta(s, "  ", iomem + app_offset);
-	iounmap(iomem);
+	if (!spec_gn412x->spec_fpga)
+		iounmap(iomem);
 	return 0;
 }