libpciaccess/libpciaccess-fd-cache.patch

144 lines
3.7 KiB
Diff
Raw Normal View History

2009-04-21 14:40:06 +00:00
diff -up libpciaccess-0.10.5/src/linux_sysfs.c.cache libpciaccess-0.10.5/src/linux_sysfs.c
--- libpciaccess-0.10.5/src/linux_sysfs.c.cache 2008-10-31 11:40:09.000000000 -0400
+++ libpciaccess-0.10.5/src/linux_sysfs.c 2009-04-21 09:36:38.000000000 -0400
2008-08-28 17:58:59 +00:00
@@ -57,6 +57,8 @@
static void pci_device_linux_sysfs_enable(struct pci_device *dev);
+static void pci_device_linux_sysfs_destroy( void );
+
static int pci_device_linux_sysfs_read_rom( struct pci_device * dev,
void * buffer );
2008-08-28 17:58:59 +00:00
@@ -76,7 +78,7 @@ static int pci_device_linux_sysfs_write(
2009-04-21 14:40:06 +00:00
pciaddr_t * bytes_written );
static const struct pci_system_methods linux_sysfs_methods = {
- .destroy = NULL,
+ .destroy = pci_device_linux_sysfs_destroy,
.destroy_device = NULL,
.read_rom = pci_device_linux_sysfs_read_rom,
.probe = pci_device_linux_sysfs_probe,
2008-08-28 17:58:59 +00:00
@@ -368,6 +370,53 @@ pci_device_linux_sysfs_read_rom( struct
return err;
}
+static struct pci_device *last_config_dev = NULL;
+static int config_fd = -1;
+
+static void
+pci_device_linux_sysfs_destroy( void )
+{
+ if (config_fd != -1)
+ close( config_fd );
+}
+
+static int
+open_config_fd( struct pci_device * dev, int flags )
+{
+ int fd;
+ char name[256];
+
+ /* Each device has a directory under sysfs. Within that directory there
+ * is a file named "config". This file used to access the PCI config
+ * space. It is used here to obtain most of the information about the
+ * device.
+ */
+
+ if ( last_config_dev != dev ) {
+ if ( config_fd != -1 ) {
+ close( config_fd );
+ last_config_dev = NULL;
+ }
+
+ snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/config",
+ SYS_BUS_PCI,
+ dev->domain,
+ dev->bus,
+ dev->dev,
+ dev->func );
+
+ fd = open( name, flags );
+ if ( fd == -1 ) {
+ return -1;
+ }
+ config_fd = fd;
+ last_config_dev = dev;
+ } else {
+ fd = config_fd;
+ }
+
+ return fd;
+}
static int
pci_device_linux_sysfs_read( struct pci_device * dev, void * data,
2008-08-28 17:58:59 +00:00
@@ -384,23 +433,9 @@ pci_device_linux_sysfs_read( struct pci_
*bytes_read = 0;
}
- /* Each device has a directory under sysfs. Within that directory there
- * is a file named "config". This file used to access the PCI config
- * space. It is used here to obtain most of the information about the
- * device.
- */
- snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/config",
- SYS_BUS_PCI,
- dev->domain,
- dev->bus,
- dev->dev,
- dev->func );
-
- fd = open( name, O_RDONLY );
- if ( fd == -1 ) {
2008-08-28 17:58:59 +00:00
+ fd = open_config_fd( dev, O_RDWR );
+ if ( fd == -1 )
return errno;
- }
-
while ( temp_size > 0 ) {
const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset );
2008-08-28 17:58:59 +00:00
@@ -422,7 +457,6 @@ pci_device_linux_sysfs_read( struct pci_
*bytes_read = size - temp_size;
}
- close( fd );
return err;
}
2008-08-28 17:58:59 +00:00
@@ -442,23 +476,9 @@ pci_device_linux_sysfs_write( struct pci
*bytes_written = 0;
}
- /* Each device has a directory under sysfs. Within that directory there
- * is a file named "config". This file used to access the PCI config
- * space. It is used here to obtain most of the information about the
- * device.
- */
- snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/config",
- SYS_BUS_PCI,
- dev->domain,
- dev->bus,
- dev->dev,
- dev->func );
-
- fd = open( name, O_WRONLY );
- if ( fd == -1 ) {
2008-08-28 17:58:59 +00:00
+ fd = open_config_fd( dev, O_RDWR );
+ if ( fd == -1 )
return errno;
- }
-
while ( temp_size > 0 ) {
const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset );
2008-08-28 17:58:59 +00:00
@@ -480,7 +500,6 @@ pci_device_linux_sysfs_write( struct pci
*bytes_written = size - temp_size;
}
- close( fd );
return err;
}