libpciaccess: Changes to 'debian-unstable'
COPYING | 36
ChangeLog | 322 +++
autogen.sh | 4
configure.ac | 17
debian/changelog | 9
debian/copyright | 37
debian/patches/FreeBSD-implement-map_legacy-and-legacy_io.patch | 184 --
debian/patches/series | 2
include/pciaccess.h | 2
scanpci/Makefile.am | 2
scanpci/scanpci.c | 14
src/common_bridge.c | 7
src/common_device_name.c | 5
src/common_init.c | 1
src/common_interface.c | 2
src/freebsd_pci.c | 146 +
src/netbsd_pci.c | 817 ++++++++-
src/pciaccess_private.h | 3
src/solx_devfs.c | 850 ++++------
src/x86_pci.c | 100 +
20 files changed, 1754 insertions(+), 806 deletions(-)
New commits:
commit 7de8d40ac1189797608e2a25f9a70d75a4fed9f0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 12:11:52 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 0a4d48a..5145de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libpciaccess (0.13.2-1) UNRELEASED; urgency=low
+libpciaccess (0.13.2-1) unstable; urgency=low
* New upstream release.
- FreeBSD legacy map and io patch is now upstream
- implements hurd legacy map and io (closes: #675289)
* Update d/copyright from COPYING.
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 12:00:23 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 12:10:47 +0200
libpciaccess (0.13.1-2) unstable; urgency=medium
commit 1762d17149b9cb5a1ffbfa285b9a7f8b0ace23fc
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 12:10:39 2013 +0200
Add bug closure
diff --git a/debian/changelog b/debian/changelog
index ebe7c04..0a4d48a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
libpciaccess (0.13.2-1) UNRELEASED; urgency=low
* New upstream release.
- - FreeBSD map_legacy and legacy_io patch is now upstream
+ - FreeBSD legacy map and io patch is now upstream
+ - implements hurd legacy map and io (closes: #675289)
* Update d/copyright from COPYING.
-- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 12:00:23 +0200
commit 1fd6ee0a311c2c46e43dcddf30fd12b645aad7a6
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 12:03:29 2013 +0200
FreeBSD map_legacy and legacy_io patch is now upstream
diff --git a/debian/changelog b/debian/changelog
index bd0d6fe..ebe7c04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libpciaccess (0.13.2-1) UNRELEASED; urgency=low
* New upstream release.
+ - FreeBSD map_legacy and legacy_io patch is now upstream
* Update d/copyright from COPYING.
-- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 12:00:23 +0200
diff --git a/debian/patches/FreeBSD-implement-map_legacy-and-legacy_io.patch b/debian/patches/FreeBSD-implement-map_legacy-and-legacy_io.patch
deleted file mode 100644
index a66b9b7..0000000
--- a/debian/patches/FreeBSD-implement-map_legacy-and-legacy_io.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 2135716a504ac21f7d024a40e2b1f13c7e479774 Mon Sep 17 00:00:00 2001
-From: Robert Millan <rmh@debian.org>
-Date: Sat, 21 Apr 2012 18:42:46 +0200
-Subject: [libpciaccess PATCH] FreeBSD: implement map_legacy and legacy_io
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- src/freebsd_pci.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 146 insertions(+)
-
-diff --git a/src/freebsd_pci.c b/src/freebsd_pci.c
-index cc50e91..be562a0 100644
---- a/src/freebsd_pci.c
-+++ b/src/freebsd_pci.c
-@@ -1,6 +1,8 @@
- /*
- * (C) Copyright Eric Anholt 2006
- * (C) Copyright IBM Corporation 2006
-+ * (C) Copyright Mark Kettenis 2011
-+ * (C) Copyright Robert Millan 2012
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
-@@ -561,6 +563,138 @@ pci_system_freebsd_destroy(void)
- freebsd_pci_sys = NULL;
- }
-
-+#if defined(__i386__) || defined(__amd64__)
-+#include <machine/bus.h>
-+#endif
-+
-+static struct pci_io_handle *
-+pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
-+ struct pci_device *dev, pciaddr_t base, pciaddr_t size)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC);
-+
-+ if (ret->fd < 0)
-+ return NULL;
-+
-+ ret->base = base;
-+ ret->size = size;
-+ return ret;
-+#elif defined(PCI_MAGIC_IO_RANGE)
-+ ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-+ aperturefd, PCI_MAGIC_IO_RANGE + base);
-+ if (ret->memory == MAP_FAILED)
-+ return NULL;
-+
-+ ret->base = base;
-+ ret->size = size;
-+ return ret;
-+#else
-+ return NULL;
-+#endif
-+}
-+
-+#if defined(__i386__) || defined(__amd64__)
-+static void
-+pci_device_freebsd_close_io(struct pci_device *dev, struct pci_io_handle *handle)
-+{
-+ if (handle->fd > -1)
-+ close(handle->fd);
-+}
-+#endif
-+
-+static uint32_t
-+pci_device_freebsd_read32(struct pci_io_handle *handle, uint32_t reg)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ return bus_space_read_4(X86_BUS_SPACE_IO, handle->base, reg);
-+#else
-+ return *(uint32_t *)((uintptr_t)handle->memory + reg);
-+#endif
-+}
-+
-+static uint16_t
-+pci_device_freebsd_read16(struct pci_io_handle *handle, uint32_t reg)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ return bus_space_read_2(X86_BUS_SPACE_IO, handle->base, reg);
-+#else
-+ return *(uint16_t *)((uintptr_t)handle->memory + reg);
-+#endif
-+}
-+
-+static uint8_t
-+pci_device_freebsd_read8(struct pci_io_handle *handle, uint32_t reg)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ return bus_space_read_1(X86_BUS_SPACE_IO, handle->base, reg);
-+#else
-+ return *(uint8_t *)((uintptr_t)handle->memory + reg);
-+#endif
-+}
-+
-+static void
-+pci_device_freebsd_write32(struct pci_io_handle *handle, uint32_t reg,
-+ uint32_t data)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ bus_space_write_4(X86_BUS_SPACE_IO, handle->base, reg, data);
-+#else
-+ *(uint16_t *)((uintptr_t)handle->memory + reg) = data;
-+#endif
-+}
-+
-+static void
-+pci_device_freebsd_write16(struct pci_io_handle *handle, uint32_t reg,
-+ uint16_t data)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ bus_space_write_2(X86_BUS_SPACE_IO, handle->base, reg, data);
-+#else
-+ *(uint8_t *)((uintptr_t)handle->memory + reg) = data;
-+#endif
-+}
-+
-+static void
-+pci_device_freebsd_write8(struct pci_io_handle *handle, uint32_t reg,
-+ uint8_t data)
-+{
-+#if defined(__i386__) || defined(__amd64__)
-+ bus_space_write_1(X86_BUS_SPACE_IO, handle->base, reg, data);
-+#else
-+ *(uint32_t *)((uintptr_t)handle->memory + reg) = data;
-+#endif
-+}
-+
-+static int
-+pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
-+ pciaddr_t size, unsigned map_flags, void **addr)
-+{
-+ struct pci_device_mapping map;
-+ int err;
-+
-+ map.base = base;
-+ map.size = size;
-+ map.flags = map_flags;
-+ map.memory = NULL;
-+ err = pci_device_freebsd_map_range(dev, &map);
-+ *addr = map.memory;
-+
-+ return err;
-+}
-+
-+static int
-+pci_device_freebsd_unmap_legacy(struct pci_device *dev, void *addr,
-+ pciaddr_t size)
-+{
-+ struct pci_device_mapping map;
-+
-+ map.memory = addr;
-+ map.size = size;
-+ map.flags = 0;
-+ return pci_device_freebsd_unmap_range(dev, &map);
-+}
-+
- static const struct pci_system_methods freebsd_pci_methods = {
- .destroy = pci_system_freebsd_destroy,
- .destroy_device = NULL, /* nothing to do for this */
-@@ -571,6 +705,18 @@ static const struct pci_system_methods freebsd_pci_methods = {
- .read = pci_device_freebsd_read,
- .write = pci_device_freebsd_write,
- .fill_capabilities = pci_fill_capabilities_generic,
-+ .open_legacy_io = pci_device_freebsd_open_legacy_io,
-+#if defined(__i386__) || defined(__amd64__)
-+ .close_io = pci_device_freebsd_close_io,
-+#endif
-+ .read32 = pci_device_freebsd_read32,
-+ .read16 = pci_device_freebsd_read16,
-+ .read8 = pci_device_freebsd_read8,
-+ .write32 = pci_device_freebsd_write32,
-+ .write16 = pci_device_freebsd_write16,
-+ .write8 = pci_device_freebsd_write8,
-+ .map_legacy = pci_device_freebsd_map_legacy,
-+ .unmap_legacy = pci_device_freebsd_unmap_legacy,
- };
-
- /**
---
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index 3907456..f93c570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-FreeBSD-implement-map_legacy-and-legacy_io.patch
+# nothing to see here
commit 3e04e71529d839b6c24b6b5e0c753c8c36a66407
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 12:02:02 2013 +0200
Update d/copyright from COPYING.
diff --git a/debian/changelog b/debian/changelog
index 1a82506..bd0d6fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libpciaccess (0.13.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Update d/copyright from COPYING.
-- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 12:00:23 +0200
diff --git a/debian/copyright b/debian/copyright
index 14487f7..14f9049 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,8 +19,10 @@ Copyright:
(C) Copyright IBM Corporation 2006, 2007
(C) Copyright Eric Anholt 2006
-Copyright (c) 2007, 2008, 2009, Oracle and/or its affiliates.
-Copyright 2009 Red Hat, Inc.
+(C) Copyright Mark Kettenis 2011
+(C) Copyright Robert Millan 2012
+Copyright (c) 2007, 2008, 2009, 2011, 2012, 2013 Oracle and/or its affiliates.
+Copyright 2009, 2012 Red Hat, Inc.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -45,8 +47,9 @@ IN THE SOFTWARE.
------------------------------------------------------------------------------
Copyright (c) 2008 Juan Romero Pardines
-Copyright (c) 2008 Mark Kettenis
-Copyright (c) 2009 Samuel Thibault
+Copyright (c) 2008, 2011 Mark Kettenis
+Copyright (c) 2009 Michael Lorenz
+Copyright (c) 2009, 2012 Samuel Thibault
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
@@ -85,3 +88,29 @@ Except as contained in this notice, the name of the XFree86 Project shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from the
XFree86 Project.
+
+------------------------------------------------------------------------------
+
+Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+Copyright (c) 2009 Tiago Vignatti
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
commit 731dc48ade345770d05f6ddf97bed9ea6051e281
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 12:00:38 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 6ae30ab..830bb1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,325 @@
+commit aa7925c4a798b9ed2cd43bd3c99c2df2a1824311
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 20 15:53:42 2013 -0700
+
+ libpciaccess 0.13.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bdcb46d33c6514278d2209fd00ed58c580da5ff3
+Author: John Martin <John.M.Martin@Oracle.COM>
+Date: Sat Jul 20 15:49:05 2013 -0700
+
+ Fix Sun bug #7035791: scanpci should report 64 bit registers
+
+ 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>
+
+commit f806b95d029d36c977befed4096734f6461efa08
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 20 15:00:40 2013 -0700
+
+ Resync COPYING file with copyrights/licenses from code
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3bf035fcfd0ad55220f484f7fb5d5f18690bdb10
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 6 10:09:31 2013 -0700
+
+ pci_device_solx_devfs_probe: implicit conversion changes signedness warnings
+
+ 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>
+
+commit 883acb4bf30735c7d8f3147341345fa9e3bc76b2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 6 10:00:44 2013 -0700
+
+ Solaris: Remove #defines for Ultra 45 southbridge device ids
+
+ 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>
+
+commit 3773eea8d4e22aaedf675051e5e96af53b925152
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 6 09:56:46 2013 -0700
+
+ pci_device_solx_devfs_read: fix sign conversion/comparison warnings
+
+ 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>
+
+commit 22f4b45056587f5700b87d09e9fe91bbb0eda4c5
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sat Jun 29 20:49:54 2013 +0200
+
+ Support more pci functions on NetBSD.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9a13ecb8f1462efaf741fed293e29ba38757ff70
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sat Jun 29 20:49:53 2013 +0200
+
+ Fix build on NetBSD-4.
+
+ 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>
+
+commit 1d364cb2f5b5cb1b18601735f42bada7a521be19
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sat Jun 29 20:49:52 2013 +0200
+
+ Enable boot_vga support only if WSDISPLAYIO_GET_BUSID is defined.
+
+ 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>
+
+commit 7f388e466bd7fbb7f9eba531e494e7efbd3a65dc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jun 24 21:20:27 2013 -0700
+
+ pci_id_file_open: move variable inside the #ifndef that uses it
+
+ 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>
+
+commit a39f054649e773a4b33bf8f52152f7c5139bb90e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jun 24 21:09:52 2013 -0700
+
+ Define PCI_MATCH_ANY as an unsigned int
+
+ 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>
+
+commit 5aff35d1ef659babd71f44f7963e4e908dcd86c4
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Tue Jun 11 11:46:26 2013 +0200
+
+ Update NetBSD support.
+
+ 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>
+
+commit c10c86e5856596778cb8322aec8ce663b1f1bea5
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Tue Jun 11 11:45:50 2013 +0200
+
+ Move 'const' to correct place, so it has meaning.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 719888a9ec5ef5a45698dea8a9642091c433ff29
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sun Jun 2 22:38:39 2013 +0200
+
+ Protect config.h like usual.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 434cd73d23cf5dc60d2047047378b59cadb0d5bb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jun 7 20:31:37 2013 -0700
+
+ Bug 63583 - add legacy IO routines for FreeBSD
+
+ 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>
+
+commit d76fb36d9c28be0f7c43e0ca1e961c30a7781bd4
+Author: Henry Zhao <henry.zhao@oracle.com>
+Date: Thu Jan 10 17:53:09 2013 -0800
+
+ Solaris: probe improvement
+
+ 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>
+
+commit 3e17f069682a226c14bb29c802e776c6e39f7e8f
+Author: Henry Zhao <henry.zhao@oracle.com>
+Date: Tue Dec 18 15:10:46 2012 -0800
+
+ Solaris: Add domain support for sparc platform
+
+ 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>
+
+commit 897cad2620ffbd6ecbbaea2a67fb973ec7990198
+Author: Colin Walters <walters@verbum.org>
+Date: Wed Jan 4 17:37:06 2012 -0500
+
+ autogen.sh: Implement GNOME Build API
+
+ http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit d69019c5b744348d6e5032ef87f4a743f68cb112
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 15 14:28:48 2013 -0500
+
+ configure: Remove AM_MAINTAINER_MODE
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 0ad7b5c548ecf409a1fdd835bde52a8cf5371b7a
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Mon Jul 4 07:38:33 2011 +0200
+
+ PCI: set correct mask value when matching for bridges.
+
+ 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>
+
+commit 72e0c0b4d4680b7a7b4b42be525d406635dae40f
+Author: Henry Zhao <henry.zhao@oracle.com>
+Date: Fri Apr 6 17:26:59 2012 -0700
+
+ scanpci: print meaningful info on BASEROM
+
+ Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ba53031899611a1653656034a1a3de9b71e5bc85
+Author: Henry Zhao <henry.zhao@oracle.com>
+Date: Fri Apr 6 16:52:42 2012 -0700
+
+ libpciaccess: sparc rom read fix
+
+ 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>
+
+commit 2edddd4c4eb4258f4347c40e76bf0d5f1bcf51a7
+Author: Henry Zhao <henry.zhao@oracle.com>
+Date: Fri Oct 5 12:41:36 2012 -0700
+
+ libpciaccess: implementation of boot_vga in Solaris
+
+ Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 630b00a0847df9acf53391e6415bdfcd13fdae68
+Author: Mark Logan <mark.logan@oracle.com>
+Date: Tue Sep 18 13:28:18 2012 -0700
+
+ libpciaccess: fix memory usage errors
+
+ 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>
+
+commit 09f5b48f559888339450bb4a79d178c94da34638
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Thu May 31 20:00:34 2012 +0200
+
+ Implement legacy io & map for x86 backend
+
+ 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>
+
+commit 9f2d95e61896f41adb8087fb805eb37899cce55f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Apr 18 22:17:54 2012 -0700
+
+ Solaris: refactor pci_device_solx_devfs_map_range to reduce code duplication
+
+ 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>
+
+commit d50292ca8cbbaa5e0c92627f3d7813194c7c83ac
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Apr 18 15:30:30 2012 -0700
+
+ Solaris: Implement map_legacy & legacy_io functions
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jay Cotton <jay.cotton@oracle.com>
+
commit 2ff2996dcb4cfd83da6df4504b68b492b983204b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 19:05:27 2012 +0200
diff --git a/debian/changelog b/debian/changelog
index a84d428..1a82506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpciaccess (0.13.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 12:00:23 +0200
+
libpciaccess (0.13.1-2) unstable; urgency=medium
* FreeBSD: implement map_legacy and legacy_io (closes: #669062). Thanks,
commit aa7925c4a798b9ed2cd43bd3c99c2df2a1824311
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 20 15:53:42 2013 -0700
libpciaccess 0.13.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 537cfe3..9b7cd8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libpciaccess],[0.13.1],
+AC_INIT([libpciaccess],[0.13.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess],[libpciaccess])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit bdcb46d33c6514278d2209fd00ed58c580da5ff3
Author: John Martin <John.M.Martin@Oracle.COM>
Date: Sat Jul 20 15:49:05 2013 -0700
Fix Sun bug #7035791: scanpci should report 64 bit registers
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>
diff --git a/scanpci/scanpci.c b/scanpci/scanpci.c
index a427692..2f86833 100644
--- a/scanpci/scanpci.c
+++ b/scanpci/scanpci.c
@@ -152,11 +152,13 @@ print_pci_device( struct pci_device * dev, int verbose )
pci_device_probe( dev );
for ( i = 0 ; i < 6 ; i++ ) {
if ( dev->regions[i].base_addr != 0 ) {
- printf( " BASE%u 0x%08"PRIxPTR" SIZE %zu %s",
+ printf( " BASE%u 0x%0*"PRIxPTR" SIZE %zu %s",
i,
+ dev->regions[i].is_64 ? 16 : 8,
(intptr_t) dev->regions[i].base_addr,
(size_t) dev->regions[i].size,
- (dev->regions[i].is_IO) ? "I/O" : "MEM" );
+ (dev->regions[i].is_IO) ? "I/O" :
+ ((dev->regions[i].is_64) ? "MEM64" : "MEM"));
if ( ! dev->regions[i].is_IO ) {
if ( dev->regions[i].is_prefetchable ) {
commit f806b95d029d36c977befed4096734f6461efa08
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 20 15:00:40 2013 -0700
Resync COPYING file with copyrights/licenses from code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index b67a2c5..2c39a67 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,9 @@
(C) Copyright IBM Corporation 2006, 2007
(C) Copyright Eric Anholt 2006
-Copyright (c) 2007, 2008, 2009, 2011, Oracle and/or its affiliates.
-Copyright 2009 Red Hat, Inc.
+(C) Copyright Mark Kettenis 2011
+(C) Copyright Robert Millan 2012
+Copyright (c) 2007, 2008, 2009, 2011, 2012, 2013 Oracle and/or its affiliates.
+Copyright 2009, 2012 Red Hat, Inc.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,7 +28,9 @@ IN THE SOFTWARE.
------------------------------------------------------------------------------
Copyright (c) 2008 Juan Romero Pardines
-Copyright (c) 2008 Mark Kettenis
+Copyright (c) 2008, 2011 Mark Kettenis
+Copyright (c) 2009 Michael Lorenz
+Copyright (c) 2009, 2012 Samuel Thibault
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
@@ -65,3 +69,29 @@ Except as contained in this notice, the name of the XFree86 Project shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from the
XFree86 Project.
+
+------------------------------------------------------------------------------
+
+Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+Copyright (c) 2009 Tiago Vignatti
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
commit 3bf035fcfd0ad55220f484f7fb5d5f18690bdb10
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 6 10:09:31 2013 -0700
pci_device_solx_devfs_probe: implicit conversion changes signedness warnings
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>
diff --git a/src/solx_devfs.c b/src/solx_devfs.c
index b365de9..41f5c19 100644
--- a/src/solx_devfs.c
+++ b/src/solx_devfs.c
@@ -612,7 +612,7 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
* slot1 is part of BAR 0x10
* Linux give two region slot for 64 bit address.
*/
- for (i = 0; i < len; i = i + CELL_NUMS_1275) {
+ for (i = 0; i < len; i = i + (int)CELL_NUMS_1275) {
reg = (pci_regspec_t *)®buf[i];
ent = reg->pci_phys_hi & 0xff;
commit 883acb4bf30735c7d8f3147341345fa9e3bc76b2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 6 10:00:44 2013 -0700
Solaris: Remove #defines for Ultra 45 southbridge device ids
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>
diff --git a/src/solx_devfs.c b/src/solx_devfs.c
index df64e71..b365de9 100644
--- a/src/solx_devfs.c
+++ b/src/solx_devfs.c
@@ -113,26 +113,6 @@ static size_t nexus_count = 0;
#define MAPPING_DEV_PATH(dev) (((struct pci_device_private *) dev)->device_string)
#endif
-/*
- * Identify problematic southbridges. These have device id 0x5249 and
- * vendor id 0x10b9. Check for revision ID 0 and class code 060400 as well.
- * Values are little endian, so they are reversed for SPARC.
- *
- * Check for these southbridges on all architectures, as the issue is a
- * southbridge issue, independent of processor.
- *
- * If one of these is found during probing, skip probing other devs/funcs on
- * the rest of the bus, since the southbridge and all devs underneath will
- * otherwise disappear.
- */
-#if (NATIVE_ENDIAN == PCITOOL_ACC_ATTR_ENDN_BIG)
-# define U45_SB_DEVID_VID 0xb9104952
-# define U45_SB_CLASS_RID 0x00000406
-#else
-# define U45_SB_DEVID_VID 0x524910b9
-# define U45_SB_CLASS_RID 0x06040000
-#endif
-
static nexus_t *
find_nexus_for_bus( int domain, int bus )
{
commit 3773eea8d4e22aaedf675051e5e96af53b925152
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 6 09:56:46 2013 -0700
pci_device_solx_devfs_read: fix sign conversion/comparison warnings
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>
diff --git a/src/solx_devfs.c b/src/solx_devfs.c
index 433969f..df64e71 100644
--- a/src/solx_devfs.c
+++ b/src/solx_devfs.c
@@ -802,7 +802,7 @@ pci_device_solx_devfs_read( struct pci_device * dev, void * data,
{
pcitool_reg_t cfg_prg;
int err = 0;
- int i = 0;
+ unsigned int i = 0;
nexus_t *nexus;
nexus = find_nexus_for_bus(dev->domain, dev->bus);
commit 22f4b45056587f5700b87d09e9fe91bbb0eda4c5
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Sat Jun 29 20:49:54 2013 +0200
Support more pci functions on NetBSD.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/netbsd_pci.c b/src/netbsd_pci.c
index 295e927..b3f7f2d 100644
--- a/src/netbsd_pci.c
+++ b/src/netbsd_pci.c
@@ -525,6 +525,322 @@ pci_device_netbsd_read_rom(struct pci_device *dev, void *buffer)
return 0;
}
+#if defined(__i386__) || defined(__amd64__)
+#include <machine/sysarch.h>
+
+/*
+ * Functions to provide access to x86 programmed I/O instructions.
+ *
+ * The in[bwl]() and out[bwl]() functions are split into two varieties: one to
+ * use a small, constant, 8-bit port number, and another to use a large or
+ * variable port number. The former can be compiled as a smaller instruction.
+ */
+
+
+#ifdef __OPTIMIZE__
+
+#define __use_immediate_port(port) \
+ (__builtin_constant_p((port)) && (port) < 0x100)
+
+#else
+
+#define __use_immediate_port(port) 0
+
+#endif
+
+
+#define inb(port) \
+ (/* CONSTCOND */ __use_immediate_port(port) ? __inbc(port) : __inb(port))
+
+static __inline u_int8_t
+__inbc(unsigned port)
Reply to: