summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-20libpciaccess 0.13.2libpciaccess-0.13.2upstream-gitAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-20Fix Sun bug #7035791: scanpci should report 64 bit registersJohn Martin1-2/+4
On a system which has allocated 64-bit device addresses scanpci -v will show entries such as: [...] BASE0 0xce000000 SIZE 16777216 MEM BASE1 0x00000fc1f8000000 SIZE 134217728 MEM64 PREFETCHABLE BASE3 0x00000fc1f6000000 SIZE 33554432 MEM64 PREFETCHABLE [...] instead of: [...] BASE0 0xce000000 SIZE 16777216 MEM BASE1 0xf8000000 SIZE 134217728 MEM PREFETCHABLE BASE3 0xf6000000 SIZE 33554432 MEM PREFETCHABLE [...] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-20Resync COPYING file with copyrights/licenses from codeAlan Coopersmith1-3/+33
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-06pci_device_solx_devfs_probe: implicit conversion changes signedness warningsAlan Coopersmith1-1/+1
solx_devfs.c:615:32: warning: implicit conversion changes signedness: 'unsigned long' to 'int' [-Wsign-conversion] for (i = 0; i < len; i = i + CELL_NUMS_1275) { ~ ~~^~~~~~~~~~~~~~~~ solx_devfs.c:615:30: warning: implicit conversion changes signedness: 'int' to 'unsigned long' [-Wsign-conversion] for (i = 0; i < len; i = i + CELL_NUMS_1275) { ^ ~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-06Solaris: Remove #defines for Ultra 45 southbridge device idsAlan Coopersmith1-20/+0
Workaround for these chipsets was removed in commit d76fb36d9c28be0f7c with the switch of probing methods from the PCI address poking that upset them to using the already collected data from the kernel via devinfo, but the #define to identify them was left behind unused - remove it too. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-06pci_device_solx_devfs_read: fix sign conversion/comparison warningsAlan Coopersmith1-1/+1
Fixes: solx_devfs.c:824:19: warning: comparison of integers of different signs: 'int' and 'pciaddr_t' (aka 'unsigned long') [-Wsign-compare] for (i = 0; i < size; i += PCITOOL_ACC_ATTR_SIZE(PCITOOL_ACC_ATTR_SIZE_1)) ~ ^ ~~~~ solx_devfs.c:826:28: warning: implicit conversion changes signedness: 'int' to 'unsigned long' [-Wsign-conversion] cfg_prg.offset = offset + i; ~ ^ solx_devfs.c:844:19: warning: implicit conversion changes signedness: 'int' to 'pciaddr_t' (aka 'unsigned long') [-Wsign-conversion] *bytes_read = i; ~ ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-06Support more pci functions on NetBSD.Thomas Klausner1-0/+325
Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-06Fix build on NetBSD-4.Thomas Klausner2-0/+25
Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-06Enable boot_vga support only if WSDISPLAYIO_GET_BUSID is defined.Thomas Klausner1-0/+6
Fixes build on NetBSD-5. Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-24pci_id_file_open: move variable inside the #ifndef that uses itAlan Coopersmith1-1/+1
Clears up gcc warning on Solaris: common_device_name.c: In function 'pci_id_file_open': common_device_name.c:83:17: warning: unused variable 'result' [-Wunused-variable] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-24Define PCI_MATCH_ANY as an unsigned intAlan Coopersmith1-1/+1
Clears a bunch of clang warnings of the forms: common_device_name.c:345:23: warning: comparison of integers of different signs: 'const uint32_t' (aka 'const unsigned int') and 'int' [-Wsign-compare] if ( m->vendor_id == PCI_MATCH_ANY ) { ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~ common_device_name.c:498:19: warning: implicit conversion changes signedness: 'int' to 'uint32_t' (aka 'unsigned int') [-Wsign-conversion] m.device_id = PCI_MATCH_ANY; ~ ^~~~~~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-11Update NetBSD support.Thomas Klausner2-133/+342
Signed-off-by: Michael Lorenz <macallan@NetBSD.org> Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-11Move 'const' to correct place, so it has meaning.Thomas Klausner1-1/+1
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-07Protect config.h like usual.Thomas Klausner2-0/+6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-07Bug 63583 - add legacy IO routines for FreeBSDAlan Coopersmith1-0/+146
https://bugs.freedesktop.org/show_bug.cgi?id=63583 Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-03-09Solaris: probe improvementHenry Zhao1-292/+128
Remove pcitool dependency in probing phase. Use the data collected from devinfo tree instead in creating pci file system. Signed-off-by: Henry Zhao <henzhao@glory3.(none)> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-15Solaris: Add domain support for sparc platformHenry Zhao2-88/+29
As a result the code of finding nexus node for a device in sparc is simplified and made the same as x86. Signed-off-by: Henry Zhao <henry.zhao@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-15autogen.sh: Implement GNOME Build APIColin Walters1-1/+3
http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-01-15configure: Remove AM_MAINTAINER_MODEAdam Jackson1-1/+0
Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-01-03PCI: set correct mask value when matching for bridges.Egbert Eich1-1/+3
The mask must not be zero otherwise the matching condition will never be true: ((val & mask) == set). Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Guillem Jover <guillem@hadrons.org>
2012-10-21scanpci: print meaningful info on BASEROMHenry Zhao2-3/+7
Signed-off-by: Henry Zhao <henry.zhao@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-10-21libpciaccess: sparc rom read fixHenry Zhao1-63/+58
Get rom address and size from device's "assigned-addresses" property if they exist. Signed-off-by: Henry Zhao <henry.zhao@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-10-21libpciaccess: implementation of boot_vga in SolarisHenry Zhao2-0/+22
Signed-off-by: Henry Zhao <henry.zhao@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-10-12libpciaccess: fix memory usage errorsMark Logan2-11/+21
This patch fixes memory usage errors that only occur on large SPARC machines with more than 256 PCI devices. In this case, memory is being used after it has been freed by calls to both free() and realloc(). This error was introduced by a previous patch: 2011-03-30 Solaris support for multiple PCI segments (domains) Signed-off-by: Mark Logan <mark.logan@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-31Implement legacy io & map for x86 backendSamuel Thibault1-1/+99
Add the legacy io and map methods for the x86 backend, using ioperm, in/out, and the existing mmap method. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
2012-04-23Solaris: refactor pci_device_solx_devfs_map_range to reduce code duplicationAlan Coopersmith1-20/+21
The sparc & x86 cases were doing essentially the same things with different paths, so make the path setup be inside the platform specific #ifdefs, make the open, mmap, & error handling common code. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-04-23Solaris: Implement map_legacy & legacy_io functionsAlan Coopersmith1-2/+135
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jay Cotton <jay.cotton@oracle.com>
2012-04-09Bump to 0.13.1libpciaccess-0.13.1Julien Cristau2-2/+2
Signed-off-by: Julien Cristau <jcristau@debian.org>
2012-04-04Fix pci_io_handle allocation routines.Matthieu Herrb1-35/+4
The previous version of new_io_handle() would invalidate all previous allocations when realloc moves the base pointer of the ios array. Since I cannot figure out where this array is useful, just get rid of it, providing sound stable memory allocation. Fixes vgaHWSaveFonts() in 1.12 xserver on OpenBSD, but other sub-systems relaying on pci_io could be affected too. Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Tested-by: Tormod Volden <debian.tormod@gmail.com>
2012-03-14Fix openbsd_pci.c:pci_device_vgaarb_set_target();Thordur Bjornsson1-0/+1
A return (0) got lost, add it back. Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Reviewed-by: Mark Kettenis <mark.kettenis@xs4all.nl>
2012-03-05linux: Fix out[bwl] macros on non-I/O architecturesAdam Jackson1-3/+3
Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-03-05Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libpciaccessAdam Jackson1-1/+1
2012-03-03configure.ac: Bump to 0.13libpciaccess-0.13Jeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-27Use O_CLOEXEC for internal file descriptorsAdam Jackson10-28/+60
Well, almost all of them. zlib doesn't support "e" in the mode string in gzopen() though it will silently accept and ignore it, and Solaris appears not to support "e" in the mode string at all. Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-02-27linux: Don't use /dev/portAdam Jackson1-13/+50
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-02-24Use correct type for pci_id file accessor functionsMathias Krause1-2/+2
This fixes the compiler warning of using the wrong type for gzgets() and gzclose() as they want a gzFile argument, not a pointer to gzFile. The abstraction layer pci_id_file should just abstract the full type. Signed-off-by: Mathias Krause <mathias.krause@secunet.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-08solx_devfs.c: fix gcc warnings about casting away const when reading dataAlan Coopersmith1-4/+4
solx_devfs.c: In function `pci_device_solx_devfs_write': solx_devfs.c:1085: warning: cast discards qualifiers from pointer target type solx_devfs.c:1089: warning: cast discards qualifiers from pointer target type solx_devfs.c:1093: warning: cast discards qualifiers from pointer target type solx_devfs.c:1097: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-02-08Close pci.ids file when bailing out because realloc failedAlan Coopersmith1-1/+2
Error: File Leak Leaked File f at line 272 of src/common_device_name.c in function 'populate_vendor'. f initialized at line 204 with fopen("/usr/share/hwdata/pci.ids", "r"). [ This bug was found by the Parfait 0.5.0 bug checking tool. For more information see http://labs.oracle.com/projects/parfait/ ] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-02-08Solaris: reorder functions to remove need for lots of static prototypesAlan Coopersmith1-201/+174
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-01-03OpenBSD: Implement map_legacy and legacy_ioMark Kettenis2-2/+152
Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
2011-11-28delete_io_handle: fix deletion of last handleDaniel Drake1-3/+8
When num_ios goes from 1 to 0, a realloc(ios, 0); call is made. This is equivalent to free(ios) and NULL is returned. However, the previous logic in the code incorrectly discards this NULL return value. When we next call new_io_handle(), realloc(ios, X) is called with "ios" pointing to freed memory. This causes glibc to abort. Correct this logic to detect the 1-to-0 case and handle it correctly. Other cases are unchanged; there is still value in checking the return value from realloc() as it also returns NULL on error. Signed-off-by: Daniel Drake <dsd@laptop.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-19Add VGA Arbiter support for OpenBSD.Mark Kettenis2-5/+139
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
2011-11-19OpenBSD: Indicate that devices need access to legacy VGA resources.Mark Kettenis1-0/+4
Makes sure xserver disables DRI if the VGA arbiter is in use. Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
2011-11-17Solaris: improve support for sparc platformHenry Zhao1-48/+217
(1) added prom property retrieval on sparc (2) added multiple domain support on sparc (3) use kernel device as mapping device (4) performance improvements by removing redundant ioctl Signed-off-by: Henry Zhao <henry.zhao@oracle.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-09configure.ac: Bump to 0.12.902libpciaccess-0.12.902Jeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-09Fix some -Wformat errors in scanpciJeremy Huddleston1-6/+7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-24libpciaccess: close mtrr fd on pci_cleanupNithin Nayak Sujir1-1/+11
Since the fd is not closed, calling pci_system_init and pci_system_cleanup more than 1024 times results in "too many files open" error. Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-14Solaris: Give better error on realloc failureAlan Coopersmith1-2/+3
commit a18460b385ae03 converted from a fixed maximum number of devices to dynamically growing the list via realloc, but didn't update the error message shown on failure. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2011-10-11linux sysfs: Fix read-write access in map_legacyJeremy Huddleston1-1/+1
O_RDONLY | O_WRONLY != O_RDWR >< Reported-by: Javier Pello <javier.pello@urjc.es> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-09scanpci: Build fix for systems without <err.h>Jeremy Huddleston2-1/+21
https://bugs.freedesktop.org/show_bug.cgi?id=31133 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>