Merge branch 'master' into tom-fmclib

7c73b052 · Tomasz Wlostowski · 51117413 · 3457f310 · 7c73b052 · 7c73b052
Commit 7c73b052 authored May 12, 2014 by Tomasz Wlostowski
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

svec-drv.c kernel/svec-drv.c +9 -0

svec-wrc-loader tools/svec-wrc-loader +2 -0

No files found.
--- a/kernel/svec-drv.c
+++ b/kernel/svec-drv.c
@@ -498,6 +498,15 @@ int svec_setup_csr(struct svec_dev *svec)

 	memset(ader, 0, sizeof(ader));

+	/* Below is a hack to keep the VME core function disabling work on bitstreams
+	   containing a buggy VME core (commit b2fc3ce7): set bit 0 (XAM_MODE) to 1
+	   to disable given function (because neither function 0 nor 1 have anything 
+	   in their extended capability sets, setting XAM_MODE = 1 effectively disables 
+	   the function. */
+
+	ader[0][3] = 1; 
+	ader[1][3] = 1;
+
 	/* do address relocation for FUN0/1 */
 	ader[func][0] = (svec->cfg_cur.vme_base >> 24) & 0xFF;
 	ader[func][1] = (svec->cfg_cur.vme_base >> 16) & 0xFF;

--- a/tools/svec-wrc-loader
+++ b/tools/svec-wrc-loader
@@ -50,6 +50,8 @@ class CSvec:
    	    self.path = vme_dir + subdir;
    	    m = re.match("svec\.(\d+)", subdir)
    	    if m:
+    		if not os.path.isfile(self.path + "/slot"):
+    		    continue
    		self.slot = sysfs_read(self.path + "/slot")
    		self.lun = int(m.group(1))