tools: Tools detached from kernel: no modules required

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
@@ -38,7 +86,7 @@ static int spec_scan(int *bus, int *devfn)
 	int n, found = 0;
 	int my_bus, my_devfn;
 
-	n = scandir("/sys/bus/pci/drivers/spec", &namelist, 0, 0);
+	n = scandir("/sys/bus/pci/devices/", &namelist, 0, 0);
 	if (n < 0)
 	{
 		perror("scandir");
@@ -50,10 +98,15 @@ static int spec_scan(int *bus, int *devfn)
 					    "0000:%02x:%02x.0",
 					    &my_bus, &my_devfn) == 2)
 			{
-				if(*bus < 0) *bus = my_bus;
-				if(*devfn < 0) *devfn = my_devfn;
-				if(*bus == my_bus && *devfn == my_devfn)
+				if (*bus >= 0) my_bus = *bus;
+				if (*devfn >= 0) my_devfn = *devfn;
+				if (spec_check_id(my_bus, my_devfn))
+				{
+					*bus = my_bus;
+					*devfn = my_devfn;
 					found = 1;
+				}
+
 			}
 			free(namelist[n]);
 		}
@@ -79,7 +132,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);