Merge branch 'jdgl-140206'

    Note by Federico Vaga <federico.vaga@cern.ch>
        This is not exactly the same set of patches from
        garcialasheras <javier@garcialasheras.com>. I did few modification
        in order to:

        - do not introduce new dependecies. Vendor and Device ID are constant
          for life, so we can safely write them two times and avoid a file
          dependencies between kernel and userspace code.

        - squash FIX patches in 1d8bb157. There were consecutive patches where
          the FIX patch just fix the previous patch, so squash them. This will
          produce an useful git-blame and bit-bisect

        - una patch for each behavioral modification

doc/spec-sw.in

@@ -52,7 +52,7 @@
 @contents
 @end iftex
 
-@paragraphindent 3mm
+@paragraphindent 1
 
 @c ##########################################################################
 @node Top

tools/.gitignore

 libspec.a
+libspec.so
 spec-cl
 specmem
 spec-fwloader

tools/Makefile

 
-CFLAGS = -ggdb -Wall -I../kernel $(EXTRACFLAGS)
-LDFLAGS = -L. -lspec
+CFLAGS = -ggdb -Wall -fPIC -I../kernel $(EXTRACFLAGS)
+LDFLAGS = -L. -lspec 
 
 LIB = libspec.a
 LIBOBJ = speclib.o loader-ll.o
 
+LIBSHARED = libspec.so
+
 PROGS = spec-cl spec-fwloader spec-vuart specmem
 PROGS += wr-dio-cmd wr-dio-pps wr-dio-agent wr-dio-ruler
 PROGS += stamp-frame
 
-
-all: $(LIB) $(PROGS)
+all: $(LIB) $(PROGS) $(LIBSHARED)
 
 $(PROGS): $(LIB)
 
@@ -20,8 +21,12 @@ $(LIB): $(LIBOBJ)
 loader-ll.o:	../kernel/loader-ll.c
 		${CC} $(CFLAGS) -c $^ -I .
 
+$(LIBSHARED): $(LIB)
+	${CC} -shared -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive
+
+
 clean:
-	rm -f *.o $(LIB) $(PROGS) *~
+	rm -f *.o $(LIB) $(PROGS) $(LIBSHARED) *~
 
 # add the other unused targets, so the rule in ../Makefile works
 modules install modules_install:

tools/speclib.c

@@ -27,6 +27,54 @@ struct spec_private {
 	uint32_t vuart_base;
 };
 
+
+/*
+ * Check if the PCI device at bus/def_fn is a SPEC board.
+ * Return 1 if the device is a SPEC and 0 if it is not.
+ * If there is an error accessing the files, return -1
+ */
+static int spec_check_id(int bus, int dev)
+{
+	unsigned int vendor, device;
+	char buf[128];
+	FILE *f;
+
+	// check device
+	snprintf(buf, sizeof buf,
+		"/sys/bus/pci/devices/0000:%02x:%02x.0/device",
+		bus, dev);
+
+	f=fopen(buf,"r");
+	if (f==NULL){
+		fprintf(stderr,"error accessing to file\n");
+		return -1;
+	}
+	fscanf(f, "%x", &device);
+	fclose(f);
+
+	// check vendor
+	snprintf(buf, sizeof buf,
+		"/sys/bus/pci/devices/0000:%02x:%02x.0/vendor",
+		bus, dev);
+
+	f=fopen(buf,"r");
+	if (f==NULL){
+		fprintf(stderr,"error accessing to file\n");
+		return -1;
+	}
+	fscanf(f, "%x", &vendor);
+	fclose(f);
+
+	if (device== PCI_DEVICE_ID_SPEC && vendor== PCI_VENDOR_ID_CERN)
+		return 1;
+
+	if (device== PCI_DEVICE_ID_GN4124 && vendor== PCI_VENDOR_ID_GENNUM)
+		return 1;
+
+	return 0;
+}
+
+
 /*
  * Checks if there's a SPEC card at bus/def_fn.
  * If one (or both) parameters are < 0, takes first available card
@@ -35,30 +83,37 @@ struct spec_private {
 static int spec_scan(int *bus, int *devfn)
 {
 	struct dirent **namelist;
-	int n, found = 0;
+	int n, i, found = 0, ret;
 	int my_bus, my_devfn;
 
-	n = scandir("/sys/bus/pci/drivers/spec", &namelist, 0, 0);
+	// Automatic search for the first availabe card
+	n = scandir("/sys/bus/pci/devices/", &namelist, 0, 0);
 	if (n < 0)
 	{
 		perror("scandir");
 		exit(-1);
-	} else {
-		while (n--)
+	}
+
+	for (i = 0; i < n; i++)
+	{
+		ret = sscanf(namelist[i]->d_name, "0000:%02x:%02x.0",
+			     &my_bus, &my_devfn);
+		if(!found && ret == 2)
 		{
-			if(!found && sscanf(namelist[n]->d_name,
-					    "0000:%02x:%02x.0",
-					    &my_bus, &my_devfn) == 2)
+			if (*bus >= 0)
+				my_bus = *bus;
+			if (*devfn >= 0)
+				my_devfn = *devfn;
+			if (spec_check_id(my_bus, my_devfn) > 0)
 			{
-				if(*bus < 0) *bus = my_bus;
-				if(*devfn < 0) *devfn = my_devfn;
-				if(*bus == my_bus && *devfn == my_devfn)
-					found = 1;
+				*bus = my_bus;
+				*devfn = my_devfn;
+				found = 1;
 			}
-			free(namelist[n]);
 		}
-		free(namelist);
+		free(namelist[i]);
 	}
+	free(namelist);
 
 	if(!found)
 	{
@@ -79,7 +134,7 @@ static void *spec_map_area(int bus, int dev, int bar, size_t size)
 	int fd;
 	void *ptr;
 
- 	snprintf(path, sizeof(path), "/sys/bus/pci/drivers/spec"
+	snprintf(path, sizeof(path), "/sys/bus/pci/devices/"
 		 "/0000:%02x:%02x.0/resource%d", bus, dev, bar);
 
 	fd = open(path, O_RDWR | O_SYNC);

tools/speclib.h

@@ -3,6 +3,12 @@
 
 #include <stdint.h>
 
+/* Vendor/Device ID to identify the SPEC */
+#define PCI_VENDOR_ID_CERN	0x10dc
+#define PCI_DEVICE_ID_SPEC	0x018d
+#define PCI_VENDOR_ID_GENNUM	0x1a39
+#define PCI_DEVICE_ID_GN4124	0x0004
+
 /* 'Opens' the SPEC card at PCI bus [bus], device/function [dev].
     Returns a handle to the card or NULL in case of failure. */
 void *spec_open(int bus, int dev);