libpciaccess: Changes to 'debian-unstable'
ChangeLog | 120 ++++++
README.cygwin | 25 +
configure.ac | 13
debian/changelog | 9
debian/patches/Include-config.h-before-anything-else-in-.c.diff | 186 ++++++++++
debian/patches/series | 2
debian/upstream/signing-key.asc | 60 +++
debian/watch | 1
include/pciaccess.h | 2
src/Makefile.am | 5
src/common_init.c | 2
src/common_interface.c | 2
src/freebsd_pci.c | 2
src/linux_sysfs.c | 62 ++-
src/netbsd_pci.c | 26 +
src/openbsd_pci.c | 34 +
src/pciaccess_private.h | 1
src/solx_devfs.c | 4
src/x86_pci.c | 176 +++++++++
19 files changed, 698 insertions(+), 34 deletions(-)
New commits:
commit 0106427f08f1369dd4cbea8fbb3ac0a1d0259751
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 15:28:32 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6448f70..400754e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libpciaccess (0.13.3-1) UNRELEASED; urgency=medium
+libpciaccess (0.13.3-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
* Include config.h in all C files (closes: #749008). Thanks, Michael
Tautschnig!
- -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 14:59:28 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:25:45 +0200
libpciaccess (0.13.2-3) unstable; urgency=medium
commit 5e37f7daa03945a76db61ded75c9cf88b3ea3643
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 15:25:23 2015 +0200
Include config.h in all C files (closes: #749008).
Thanks, Michael Tautschnig!
diff --git a/debian/changelog b/debian/changelog
index 27f20b5..6448f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libpciaccess (0.13.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
+ * Include config.h in all C files (closes: #749008). Thanks, Michael
+ Tautschnig!
-- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 14:59:28 +0200
diff --git a/debian/patches/Include-config.h-before-anything-else-in-.c.diff b/debian/patches/Include-config.h-before-anything-else-in-.c.diff
new file mode 100644
index 0000000..e4326af
--- /dev/null
+++ b/debian/patches/Include-config.h-before-anything-else-in-.c.diff
@@ -0,0 +1,186 @@
+From 6010d6f8cef92993f28e15c73f59eddc17ad1464 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 26 Apr 2015 15:20:57 +0200
+Subject: [PATCH libpciaccess] Include config.h before anything else in *.c
+
+Drop _GNU_SOURCE defines that are redundant with AC_USE_SYSTEM_EXTENSIONS.
+
+Debian bug#749008 <https://bugs.debian.org/749008>
+
+Reported-by: Michael Tautschnig <mt@debian.org>
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ src/common_capability.c | 3 +++
+ src/common_init.c | 3 +++
+ src/common_interface.c | 3 +++
+ src/common_io.c | 3 +++
+ src/common_iterator.c | 3 +++
+ src/common_map.c | 3 +++
+ src/common_vgaarb_stub.c | 3 +++
+ src/linux_devmem.c | 5 +++--
+ src/openbsd_pci.c | 3 +++
+ src/solx_devfs.c | 3 +++
+ src/x86_pci.c | 4 +++-
+ 11 files changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/src/common_capability.c b/src/common_capability.c
+index 488743d..15d395d 100644
+--- a/src/common_capability.c
++++ b/src/common_capability.c
+@@ -31,6 +31,9 @@
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git a/src/common_init.c b/src/common_init.c
+index b1c0c3e..f7b59bd 100644
+--- a/src/common_init.c
++++ b/src/common_init.c
+@@ -28,6 +28,9 @@
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <errno.h>
+diff --git a/src/common_interface.c b/src/common_interface.c
+index 59778cf..cb95e90 100644
+--- a/src/common_interface.c
++++ b/src/common_interface.c
+@@ -28,6 +28,9 @@
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/common_io.c b/src/common_io.c
+index f5c9e45..e9586ad 100644
+--- a/src/common_io.c
++++ b/src/common_io.c
+@@ -22,6 +22,9 @@
+ * Author:
+ * Adam Jackson <ajax@redhat.com>
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/common_iterator.c b/src/common_iterator.c
+index ccf656d..2beb180 100644
+--- a/src/common_iterator.c
++++ b/src/common_iterator.c
+@@ -28,6 +28,9 @@
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/common_map.c b/src/common_map.c
+index 8757151..f1854bb 100644
+--- a/src/common_map.c
++++ b/src/common_map.c
+@@ -21,6 +21,9 @@
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <sys/types.h>
+ #include <sys/mman.h>
+diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c
+index 9394273..c1708f6 100644
+--- a/src/common_vgaarb_stub.c
++++ b/src/common_vgaarb_stub.c
+@@ -23,6 +23,9 @@
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdio.h>
+ #include "pciaccess.h"
+diff --git a/src/linux_devmem.c b/src/linux_devmem.c
+index 10e3bde..0d0567c 100644
+--- a/src/linux_devmem.c
++++ b/src/linux_devmem.c
+@@ -32,8 +32,9 @@
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+-
+-#define _GNU_SOURCE
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
+index 4d1b5cd..b8ce318 100644
+--- a/src/openbsd_pci.c
++++ b/src/openbsd_pci.c
+@@ -13,6 +13,9 @@
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+diff --git a/src/solx_devfs.c b/src/solx_devfs.c
+index f572393..cf96467 100644
+--- a/src/solx_devfs.c
++++ b/src/solx_devfs.c
+@@ -25,6 +25,9 @@
+ /*
+ * Solaris devfs interfaces
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #include <stdlib.h>
+ #include <strings.h>
+diff --git a/src/x86_pci.c b/src/x86_pci.c
+index 49c1cab..32daa04 100644
+--- a/src/x86_pci.c
++++ b/src/x86_pci.c
+@@ -18,8 +18,10 @@
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+-#define _GNU_SOURCE
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f93c570..6f01b4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# nothing to see here
+Include-config.h-before-anything-else-in-.c.diff
commit 1b054fac84bcdeff2923b26a19cf6de87b98a53a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 14:59:33 2015 +0200
Bump to 0.13.3
diff --git a/ChangeLog b/ChangeLog
index 830bb1d..10f1632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,123 @@
+commit f99c2e4199ce37f6f94428df504427f67c3ec543
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Feb 3 15:59:10 2015 -0800
+
+ libpciaccess 0.13.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9b1bf11c81881c9cc6e6145011cf229978f109f4
+Author: Mark Kettenis <kettenis@openbsd.org>
+Date: Mon Sep 29 22:34:25 2014 +0200
+
+ Use PCIOCREADMASK on OpenBSD.
+
+ If the machdep.allowaperture sysctl(8) variable is set to 0, writing to PCI
+ config space is not allowed. So instead of writing 0xffffffff to the BARs
+ in order to determine their size, use the PCIOCREADMASK ioctl(2) which
+ returns the mask of changeable bits that was saved by the kernel when the
+ devices was initially probed.
+
+ Reviewed-by: Matthieu Herrb <matthieu@herbb.eu>
+ Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
+
+commit b7e42643d2ee6521cf23e6dfe49a8369ba4bf9bb
+Author: Matthew Green <mrg@NetBSD.org>
+Date: Sat Jul 26 22:09:30 2014 +0200
+
+ Implement the kernel_has_driver() method for NetBSD.
+
+ This has the benefit of stopping the "vesa" driver from loading on
+ hardware that has been claimed by a kernel driver and thus shouldn't
+ be using "vesa".
+
+ Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+
+commit 1654a0462723b3b75d7a4a20bedfc653cc3e1f1a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jul 2 16:41:10 2014 -0700
+
+ Solaris: Fix fd leak in pci_device_solx_devfs_map_range()
+
+ Caching fd's for reuse is most effective when you actually stick the
+ newly opened fd in the cache, instead of letting it leak at the end
+ of the function.
+
+ Regression introduced by yours truly in commit 9f2d95e61896f41adb.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Randy Fishel <randy.fishel@oracle.com>
+
+commit ee4e253a3f1a62e2f3f89f5339590fd4e6cde7c4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 9 19:25:10 2014 -0700
+
+ Enable use of __attribute__((deprecated)) with Solaris Studio 12.4 compiler
+
+ Support for this attribute is added in the 12.4 beta release.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b9c068896914b4132a24839c9ef7f9fcd6282d88
+Author: Marcin Ko?cielnicki <koriakin@0x04.net>
+Date: Wed Feb 5 09:01:25 2014 +0100
+
+ Fix IO access functions on linux+sysfs.
+
+ The offsets on the resourceX files are relative to BAR base - don't add
+ the base address ourselves.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit b29e9be9aff5c5a9ec5e2bcfc48044081b82742b
+Author: Samuel Pitoiset <samuel.pitoiset@gmail.com>
+Date: Wed Jan 29 18:44:40 2014 +0100
+
+ Fix a compilation error on GNU Hurd platforms.
+
+ This fixes a typo (unAMp instead of unMAp) introduced in the Windows/Cygwin
+ support patch.
+
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit 6bfccc7ec4f0705595385f6684b6849663f781b4
+Author: Samuel Pitoiset <samuel.pitoiset@gmail.com>
+Date: Sat Jan 18 17:19:14 2014 +0100
+
+ Windows/Cygwin: Add support through the WinIo library
+
+ V2:
+ - Add support for unmapping
+ - Add a README.cygwin
+
+ Reviewed-by: Martin Peres <martin.peres@free.fr>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit 06f562584a885eff7366dca82caf746e62b5a21f
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Wed Aug 14 19:45:46 2013 +0200
+
+ Improve NetBSD i386 detection.
+
+ Sometimes, other values are reported for the CPU part, like
+ "i486--netbsdelf").
+
+ From: Mark Davies <markd@NetBSD.org>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-By: Matt Dew <marcoz@osource.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4427be3de93f359ab106a649a43e41319625e1e7
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sun Jul 21 11:44:14 2013 +0200
+
+ Fix zlib handling on NetBSD.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit aa7925c4a798b9ed2cd43bd3c99c2df2a1824311
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 20 15:53:42 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index 5df3feb..27f20b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libpciaccess (0.13.2-4) UNRELEASED; urgency=medium
+libpciaccess (0.13.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
+ * New upstream release.
- -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 14:58:46 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 14:59:28 +0200
libpciaccess (0.13.2-3) unstable; urgency=medium
commit d647b271b7639888d6d4f18b33f9804c25c0e0b0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 14:59:04 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 6af168c..5df3feb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpciaccess (0.13.2-4) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 14:58:46 +0200
+
libpciaccess (0.13.2-3) unstable; urgency=medium
* Remove David and Cyril from Uploaders.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..863981f
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,60 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
+Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
+EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
+a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
+8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
+Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
+xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
+CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
+TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
+ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP
+cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g
+Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO
+6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu
+QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
+BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY
+eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS
+Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
+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
+=tc6G
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 95e7380..dd21383 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/lib/libpciaccess
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/lib/ libpciaccess-(.*)\.tar\.gz
commit f99c2e4199ce37f6f94428df504427f67c3ec543
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Feb 3 15:59:10 2015 -0800
libpciaccess 0.13.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index e3f7d8b..f11204f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libpciaccess],[0.13.2],
+AC_INIT([libpciaccess],[0.13.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess],[libpciaccess])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 9b1bf11c81881c9cc6e6145011cf229978f109f4
Author: Mark Kettenis <kettenis@openbsd.org>
Date: Mon Sep 29 22:34:25 2014 +0200
Use PCIOCREADMASK on OpenBSD.
If the machdep.allowaperture sysctl(8) variable is set to 0, writing to PCI
config space is not allowed. So instead of writing 0xffffffff to the BARs
in order to determine their size, use the PCIOCREADMASK ioctl(2) which
returns the mask of changeable bits that was saved by the kernel when the
devices was initially probed.
Reviewed-by: Matthieu Herrb <matthieu@herbb.eu>
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
index fe034f3..4d1b5cd 100644
--- a/src/openbsd_pci.c
+++ b/src/openbsd_pci.c
@@ -81,6 +81,29 @@ pci_write(int domain, int bus, int dev, int func, uint32_t reg, uint32_t val)
return ioctl(pcifd[domain], PCIOCWRITE, &io);
}
+static int
+pci_readmask(int domain, int bus, int dev, int func, uint32_t reg,
+ uint32_t *val)
+{
+ struct pci_io io;
+ int err;
+
+ bzero(&io, sizeof(io));
+ io.pi_sel.pc_bus = bus;
+ io.pi_sel.pc_dev = dev;
+ io.pi_sel.pc_func = func;
+ io.pi_reg = reg;
+ io.pi_width = 4;
+
+ err = ioctl(pcifd[domain], PCIOCREADMASK, &io);
+ if (err)
+ return (err);
+
+ *val = io.pi_data;
+
+ return 0;
+}
+
/**
* Read a VGA ROM
*
@@ -328,11 +351,9 @@ pci_device_openbsd_probe(struct pci_device *device)
return err;
/* Probe the size of the region. */
- err = pci_write(domain, bus, dev, func, bar, ~0);
+ err = pci_readmask(domain, bus, dev, func, bar, &size);
if (err)
return err;
- pci_read(domain, bus, dev, func, bar, &size);
- pci_write(domain, bus, dev, func, bar, reg);
if (PCI_MAPREG_TYPE(reg) == PCI_MAPREG_TYPE_IO) {
region->is_IO = 1;
@@ -360,11 +381,9 @@ pci_device_openbsd_probe(struct pci_device *device)
return err;
reg64 |= (uint64_t)reg << 32;
- err = pci_write(domain, bus, dev, func, bar, ~0);
+ err = pci_readmask(domain, bus, dev, func, bar, &size);
if (err)
return err;
- pci_read(domain, bus, dev, func, bar, &size);
- pci_write(domain, bus, dev, func, bar, reg64 >> 32);
size64 |= (uint64_t)size << 32;
region->base_addr = PCI_MAPREG_MEM64_ADDR(reg64);
commit b7e42643d2ee6521cf23e6dfe49a8369ba4bf9bb
Author: Matthew Green <mrg@NetBSD.org>
Date: Sat Jul 26 22:09:30 2014 +0200
Implement the kernel_has_driver() method for NetBSD.
This has the benefit of stopping the "vesa" driver from loading on
hardware that has been claimed by a kernel driver and thus shouldn't
be using "vesa".
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
diff --git a/src/netbsd_pci.c b/src/netbsd_pci.c
index e6dae4c..52591b0 100644
--- a/src/netbsd_pci.c
+++ b/src/netbsd_pci.c
@@ -843,6 +843,29 @@ pci_device_netbsd_unmap_legacy(struct pci_device *dev, void *addr,
return pci_device_netbsd_unmap_range(dev, &map);
}
+static int
+pci_device_netbsd_has_kernel_driver(struct pci_device *dev)
+{
+#ifdef PCI_IOC_DRVNAME
+ /*
+ * NetBSD PCI_IOC_DRVNAME appears at the same time as pci_drvname(3)
+ */
+ char drvname[16];
+
+ if (dev->bus >= nbuses)
+ return 0;
+
+ /*
+ * vga(4) should be considered "not bound".
+ */
+ if (pci_drvname(buses[dev->bus].fd, dev->dev, dev->func,
+ drvname, sizeof drvname) == 0 &&
+ strncmp(drvname, "vga", 3) != 0)
+ return 1;
+#endif
+ return 0;
+}
+
static const struct pci_system_methods netbsd_pci_methods = {
.destroy = pci_system_netbsd_destroy,
.destroy_device = NULL,
@@ -867,6 +890,7 @@ static const struct pci_system_methods netbsd_pci_methods = {
.write8 = pci_device_netbsd_write8,
.map_legacy = pci_device_netbsd_map_legacy,
.unmap_legacy = pci_device_netbsd_unmap_legacy,
+ .has_kernel_driver = pci_device_netbsd_has_kernel_driver,
};
int
commit 1654a0462723b3b75d7a4a20bedfc653cc3e1f1a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jul 2 16:41:10 2014 -0700
Solaris: Fix fd leak in pci_device_solx_devfs_map_range()
Caching fd's for reuse is most effective when you actually stick the
newly opened fd in the cache, instead of letting it leak at the end
of the function.
Regression introduced by yours truly in commit 9f2d95e61896f41adb.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Randy Fishel <randy.fishel@oracle.com>
diff --git a/src/solx_devfs.c b/src/solx_devfs.c
index 8e7ea9b..f572393 100644
--- a/src/solx_devfs.c
+++ b/src/solx_devfs.c
@@ -724,6 +724,9 @@ pci_device_solx_devfs_map_range(struct pci_device *dev,
strerror(errno));
return err;
}
+#ifndef __sparc
+ xsvc_fd = map_fd;
+#endif
}
map->memory = mmap(NULL, map->size, prot, MAP_SHARED, map_fd, map->base);
commit ee4e253a3f1a62e2f3f89f5339590fd4e6cde7c4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 9 19:25:10 2014 -0700
Enable use of __attribute__((deprecated)) with Solaris Studio 12.4 compiler
Support for this attribute is added in the 12.4 beta release.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/pciaccess.h b/include/pciaccess.h
index 22faf89..1d7aa4b 100644
--- a/include/pciaccess.h
+++ b/include/pciaccess.h
@@ -59,7 +59,7 @@
#include <inttypes.h>
-#if __GNUC__ >= 3
+#if (__GNUC__ >= 3) || (__SUNPRO_C >= 0x5130)
#define __deprecated __attribute__((deprecated))
#else
#define __deprecated
commit b9c068896914b4132a24839c9ef7f9fcd6282d88
Author: Marcin Ko?cielnicki <koriakin@0x04.net>
Date: Wed Feb 5 09:01:25 2014 +0100
Fix IO access functions on linux+sysfs.
The offsets on the resourceX files are relative to BAR base - don't add
the base address ourselves.
Reviewed-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/freebsd_pci.c b/src/freebsd_pci.c
index 14ec3bc..7f5f56b 100644
--- a/src/freebsd_pci.c
+++ b/src/freebsd_pci.c
@@ -579,6 +579,7 @@ pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#elif defined(PCI_MAGIC_IO_RANGE)
ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -588,6 +589,7 @@ pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#else
return NULL;
diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
index 97fcf36..8fca65e 100644
--- a/src/linux_sysfs.c
+++ b/src/linux_sysfs.c
@@ -759,6 +759,7 @@ pci_device_linux_sysfs_open_device_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 0;
return ret;
}
@@ -796,6 +797,7 @@ pci_device_linux_sysfs_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
}
@@ -813,10 +815,14 @@ pci_device_linux_sysfs_read32(struct pci_io_handle *handle, uint32_t port)
{
uint32_t ret;
- if (handle->fd > -1)
- pread(handle->fd, &ret, 4, port + handle->base);
- else
+ if (handle->fd > -1) {
+ if (handle->is_legacy)
+ pread(handle->fd, &ret, 4, port + handle->base);
+ else
+ pread(handle->fd, &ret, 4, port);
+ } else {
ret = inl(port + handle->base);
+ }
return ret;
}
@@ -826,10 +832,14 @@ pci_device_linux_sysfs_read16(struct pci_io_handle *handle, uint32_t port)
{
uint16_t ret;
- if (handle->fd > -1)
- pread(handle->fd, &ret, 2, port + handle->base);
- else
+ if (handle->fd > -1) {
+ if (handle->is_legacy)
+ pread(handle->fd, &ret, 2, port + handle->base);
+ else
+ pread(handle->fd, &ret, 2, port);
+ } else {
ret = inw(port + handle->base);
+ }
return ret;
}
@@ -839,10 +849,14 @@ pci_device_linux_sysfs_read8(struct pci_io_handle *handle, uint32_t port)
{
uint8_t ret;
- if (handle->fd > -1)
- pread(handle->fd, &ret, 1, port + handle->base);
- else
+ if (handle->fd > -1) {
+ if (handle->is_legacy)
+ pread(handle->fd, &ret, 1, port + handle->base);
+ else
+ pread(handle->fd, &ret, 1, port);
+ } else {
ret = inb(port + handle->base);
+ }
return ret;
}
@@ -851,30 +865,42 @@ static void
pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port,
uint32_t data)
{
- if (handle->fd > -1)
- pwrite(handle->fd, &data, 4, port + handle->base);
- else
+ if (handle->fd > -1) {
+ if (handle->is_legacy)
+ pwrite(handle->fd, &data, 4, port + handle->base);
+ else
+ pwrite(handle->fd, &data, 4, port);
+ } else {
outl(data, port + handle->base);
+ }
}
static void
pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port,
uint16_t data)
{
- if (handle->fd > -1)
- pwrite(handle->fd, &data, 2, port + handle->base);
- else
+ if (handle->fd > -1) {
+ if (handle->is_legacy)
+ pwrite(handle->fd, &data, 2, port + handle->base);
+ else
+ pwrite(handle->fd, &data, 2, port);
+ } else {
outw(data, port + handle->base);
+ }
}
static void
pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port,
uint8_t data)
{
- if (handle->fd > -1)
- pwrite(handle->fd, &data, 1, port + handle->base);
- else
+ if (handle->fd > -1) {
+ if (handle->is_legacy)
+ pwrite(handle->fd, &data, 1, port + handle->base);
+ else
+ pwrite(handle->fd, &data, 1, port);
+ } else {
outb(data, port + handle->base);
+ }
}
static int
diff --git a/src/netbsd_pci.c b/src/netbsd_pci.c
index b3f7f2d..e6dae4c 100644
--- a/src/netbsd_pci.c
+++ b/src/netbsd_pci.c
@@ -733,6 +733,7 @@ pci_device_netbsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#elif defined(__amd64__)
struct x86_64_iopl_args ia;
@@ -743,6 +744,7 @@ pci_device_netbsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#else
return NULL;
diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
index 73c68f4..fe034f3 100644
--- a/src/openbsd_pci.c
+++ b/src/openbsd_pci.c
@@ -412,6 +412,7 @@ pci_device_openbsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#elif defined(__amd64__)
struct amd64_iopl_args ia;
@@ -422,6 +423,7 @@ pci_device_openbsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#elif defined(PCI_MAGIC_IO_RANGE)
ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -431,6 +433,7 @@ pci_device_openbsd_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
#else
return NULL;
diff --git a/src/pciaccess_private.h b/src/pciaccess_private.h
index 339ec0f..9f4e8f9 100644
--- a/src/pciaccess_private.h
+++ b/src/pciaccess_private.h
@@ -109,6 +109,7 @@ struct pci_io_handle {
pciaddr_t size;
void *memory;
int fd;
+ int is_legacy;
};
struct pci_device_private {
diff --git a/src/solx_devfs.c b/src/solx_devfs.c
index 41f5c19..8e7ea9b 100644
--- a/src/solx_devfs.c
+++ b/src/solx_devfs.c
@@ -911,6 +911,7 @@ pci_device_solx_devfs_open_legacy_io(struct pci_io_handle *ret,
if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) == 0) {
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
}
#endif
diff --git a/src/x86_pci.c b/src/x86_pci.c
index 1075367..49c1cab 100644
--- a/src/x86_pci.c
+++ b/src/x86_pci.c
@@ -729,6 +729,7 @@ pci_device_x86_open_legacy_io(struct pci_io_handle *ret,
ret->base = base;
ret->size = size;
+ ret->is_legacy = 1;
return ret;
}
commit b29e9be9aff5c5a9ec5e2bcfc48044081b82742b
Author: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed Jan 29 18:44:40 2014 +0100
Fix a compilation error on GNU Hurd platforms.
This fixes a typo (unAMp instead of unMAp) introduced in the Windows/Cygwin
support patch.
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
diff --git a/src/x86_pci.c b/src/x86_pci.c
index b938068..1075367 100644
--- a/src/x86_pci.c
+++ b/src/x86_pci.c
@@ -658,7 +658,7 @@ static int
pci_device_x86_unmap_range(struct pci_device *dev,
struct pci_device_mapping *map)
{
- return pci_device_generic_unamp_range(dev, map);
+ return pci_device_generic_unmap_range(dev, map);
}
#endif
commit 6bfccc7ec4f0705595385f6684b6849663f781b4
Author: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Sat Jan 18 17:19:14 2014 +0100
Windows/Cygwin: Add support through the WinIo library
V2:
- Add support for unmapping
- Add a README.cygwin
Reply to: