--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: libpciaccess: Add support for OS without a PCI interface
- From: Samuel Thibault <samuel.thibault@ens-lyon.org>
- Date: Tue, 14 Apr 2009 22:48:58 +0200
- Message-id: <20090414204858.GA3377@const>
Package: libpciaccess
Severity: important
Tags: patch
Hello,
The attached patch adds support for OSes that do not have a PCI
interface, tinkering with I/O ports, and makes use of it on GNU/Hurd.
Samuel
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.29 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--- src/Makefile.am.orig 2009-04-14 17:44:55.000000000 +0200
+++ src/Makefile.am 2009-04-14 17:44:57.000000000 +0200
@@ -45,6 +45,10 @@
OS_SUPPORT = solx_devfs.c pci_tools.h
endif
+if GNU
+OS_SUPPORT = x86_pci.c
+endif
+
libpciaccess_la_SOURCES = common_bridge.c \
common_iterator.c \
common_init.c \
--- configure.ac.orig 2009-04-14 17:45:16.000000000 +0200
+++ configure.ac 2009-04-14 17:45:47.000000000 +0200
@@ -108,6 +108,9 @@
solaris=yes
PCIACCESS_LIBS="$PCIACCESS_LIBS -ldevinfo"
;;
+ gnu*)
+ gnu=yes
+ ;;
esac
AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
@@ -115,6 +118,7 @@
AM_CONDITIONAL(NETBSD, [test "x$netbsd" = xyes])
AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
+AM_CONDITIONAL(GNU, [test "x$gnu" = xyes])
AC_CHECK_HEADER([asm/mtrr.h], [have_mtrr_h="yes"], [have_mtrr_h="no"])
--- src/common_init.c.orig 2009-04-14 17:47:43.000000000 +0200
+++ src/common_init.c 2009-04-14 17:48:00.000000000 +0200
@@ -62,6 +62,8 @@
err = pci_system_openbsd_create();
#elif defined(__sun)
err = pci_system_solx_devfs_create();
+#elif defined(__GNU__)
+ err = pci_system_x86_create();
#endif
return err;
--- src/pciaccess_private.h.orig 2009-04-14 17:57:38.000000000 +0200
+++ src/pciaccess_private.h 2009-04-14 17:57:53.000000000 +0200
@@ -140,3 +140,4 @@
extern int pci_system_openbsd_create( void );
extern void pci_system_openbsd_init_dev_mem( int );
extern int pci_system_solx_devfs_create( void );
+extern int pci_system_x86_create( void );
--- /dev/null 2009-04-14 14:15:04.620007423 +0200
+++ src/x86_pci.c 2009-04-14 21:43:27.000000000 +0200
@@ -0,0 +1,671 @@
+/*
+ * Copyright (c) 2009 Samuel Thibault
+ * Heavily inspired from the freebsd, netbsd, and openbsd backends
+ * (C) Copyright Eric Anholt 2006
+ * (C) Copyright IBM Corporation 2006
+ * Copyright (c) 2008 Juan Romero Pardines
+ * Copyright (c) 2008 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+
+#include "pciaccess.h"
+#include "pciaccess_private.h"
+
+#if defined(__GNU__)
+
+#include <sys/io.h>
+
+static int
+x86_enable_io(void)
+{
+ if (!ioperm(0, 0xffff, 1))
+ return 0;
+ return errno;
+}
+
+static int
+x86_disable_io(void)
+{
+ if (!ioperm(0, 0xffff, 0))
+ return 0;
+ return errno;
+}
+
+#elif defined(__GLIBC__)
+
+#include <sys/io.h>
+
+static int
+x86_enable_io(void)
+{
+ if (!iopl(3))
+ return 0;
+ return errno;
+}
+
+static int
+x86_disable_io(void)
+{
+ if (!iopl(0))
+ return 0;
+ return errno;
+}
+
+#else
+
+#error How to enable IO ports on this system?
+
+#endif
+
+#define PCI_VENDOR(reg) ((reg) & 0xFFFF)
+#define PCI_VENDOR_INVALID 0xFFFF
+
+#define PCI_VENDOR_ID 0x00
+#define PCI_SUB_VENDOR_ID 0x2c
+#define PCI_VENDOR_ID_COMPAQ 0x0e11
+#define PCI_VENDOR_ID_INTEL 0x8086
+
+#define PCI_DEVICE(reg) (((reg) >> 16) & 0xFFFF)
+#define PCI_DEVICE_INVALID 0xFFFF
+
+#define PCI_CLASS 0x08
+#define PCI_CLASS_DEVICE 0x0a
+#define PCI_CLASS_DISPLAY_VGA 0x0300
+#define PCI_CLASS_BRIDGE_HOST 0x0600
+
+#define PCIC_DISPLAY 0x03
+#define PCIS_DISPLAY_VGA 0x00
+
+#define PCI_HDRTYPE 0x0E
+#define PCI_IRQ 0x3C
+
+struct pci_system_x86 {
+ struct pci_system system;
+ int (*read)(unsigned bus, unsigned dev, unsigned func, pciaddr_t reg, void *data, unsigned size);
+ int (*write)(unsigned bus, unsigned dev, unsigned func, pciaddr_t reg, const void *data, unsigned size);
+};
+
+static int
+pci_x86_conf1_probe(void)
+{
+ unsigned long sav;
+ int res = ENODEV;
+
+ outb(0x01, 0xCFB);
+ sav = inl(0xCF8);
+ outl(0x80000000, 0xCF8);
+ if (inl(0xCF8) == 0x80000000)
+ res = 0;
+ outl(sav, 0xCF8);
+
+ return res;
+}
+
+static int
+pci_x86_conf1_read(unsigned bus, unsigned dev, unsigned func, pciaddr_t reg, void *data, unsigned size)
+{
+ unsigned addr = 0xCFC + (reg & 3);
+ unsigned long sav;
+ int ret = 0;
+
+ if (bus >= 0x100 || dev >= 32 || func >= 8 || reg >= 0x100)
+ return EIO;
+
+ sav = inl(0xCF8);
+ outl(0x80000000 | (bus << 16) | (dev << 11) | (func << 8) | (reg & ~3), 0xCF8);
+ /* NOTE: x86 is already LE */
+ switch (size) {
+ case 1: {
+ uint8_t *val = data;
+ *val = inb(addr);
+ break;
+ }
+ case 2: {
+ uint16_t *val = data;
+ *val = inw(addr);
+ break;
+ }
+ case 4: {
+ uint32_t *val = data;
+ *val = inl(addr);
+ break;
+ }
+ default:
+ ret = EIO;
+ break;
+ }
+ outl(sav, 0xCF8);
+
+ return ret;
+}
+
+static int
+pci_x86_conf1_write(unsigned bus, unsigned dev, unsigned func, pciaddr_t reg, const void *data, unsigned size)
+{
+ unsigned addr = 0xCFC + (reg & 3);
+ unsigned long sav;
+ int ret = 0;
+
+ if (bus >= 0x100 || dev >= 32 || func >= 8 || reg >= 0x100)
+ return EIO;
+
+ sav = inl(0xCF8);
+ outl(0x80000000 | (bus << 16) | (dev << 11) | (func << 8) | (reg & ~3), 0xCF8);
+ /* NOTE: x86 is already LE */
+ switch (size) {
+ case 1: {
+ const uint8_t *val = data;
+ outb(*val, addr);
+ break;
+ }
+ case 2: {
+ const uint16_t *val = data;
+ outw(*val, addr);
+ break;
+ }
+ case 4: {
+ const uint16_t *val = data;
+ outl(*val, addr);
+ break;
+ }
+ default:
+ ret = EIO;
+ break;
+ }
+ outl(sav, 0xCF8);
+
+ return ret;
+}
+
+static int
+pci_x86_conf2_probe(void)
+{
+ outb(0, 0xCFB);
+ outb(0, 0xCF8);
+ outb(0, 0xCFA);
+ if (inb(0xCF8) == 0 && inb(0xCFA) == 0)
+ return 0;
+
+ return ENODEV;
+}
+
+static int
+pci_x86_conf2_read(unsigned bus, unsigned dev, unsigned func, pciaddr_t reg, void *data, unsigned size)
+{
+ unsigned addr = 0xC000 | dev << 8 | reg;
+ int ret = 0;
+
+ if (bus >= 0x100 || dev >= 16 || func >= 8 || reg >= 0x100)
+ return EIO;
+
+ outb((func << 1) | 0xF0, 0xCF8);
+ outb(bus, 0xCFA);
+ /* NOTE: x86 is already LE */
+ switch (size) {
+ case 1: {
+ uint8_t *val = data;
+ *val = inb(addr);
+ break;
+ }
+ case 2: {
+ uint16_t *val = data;
+ *val = inw(addr);
+ break;
+ }
+ case 4: {
+ uint32_t *val = data;
+ *val = inl(addr);
+ break;
+ }
+ default:
+ ret = EIO;
+ break;
+ }
+ outb(0, 0xCF8);
+
+ return ret;
+}
+
+static int
+pci_x86_conf2_write(unsigned bus, unsigned dev, unsigned func, pciaddr_t reg, const void *data, unsigned size)
+{
+ unsigned addr = 0xC000 | dev << 8 | reg;
+ int ret = 0;
+
+ if (bus >= 0x100 || dev >= 16 || func >= 8 || reg >= 0x100)
+ return EIO;
+
+ outb((func << 1) | 0xF0, 0xCF8);
+ outb(bus, 0xCFA);
+ /* NOTE: x86 is already LE */
+ switch (size) {
+ case 1: {
+ const uint8_t *val = data;
+ outb(*val, addr);
+ break;
+ }
+ case 2: {
+ const uint16_t *val = data;
+ outw(*val, addr);
+ break;
+ }
+ case 4: {
+ const uint16_t *val = data;
+ outl(*val, addr);
+ break;
+ }
+ default:
+ ret = EIO;
+ break;
+ }
+ outb(0, 0xCF8);
+
+ return ret;
+}
+
+/* Check that this really looks like a PCI configuration. */
+static int
+pci_x86_check(struct pci_system_x86 *pci_sys_x86)
+{
+ int dev;
+ uint16_t class, vendor;
+
+ /* Look on bus 0 for a device that is a host bridge, a VGA card,
+ * or an intel or compaq device. */
+
+ for (dev = 0; dev < 32; dev++) {
+ if (pci_sys_x86->read(0, dev, 0, PCI_CLASS_DEVICE, &class, sizeof(class)))
+ continue;
+ if (class == PCI_CLASS_BRIDGE_HOST || class == PCI_CLASS_DISPLAY_VGA)
+ return 0;
+ if (pci_sys_x86->read(0, dev, 0, PCI_VENDOR_ID, &vendor, sizeof(vendor)))
+ continue;
+ if (vendor == PCI_VENDOR_ID_INTEL || class == PCI_VENDOR_ID_COMPAQ)
+ return 0;
+ }
+
+ return ENODEV;
+}
+
+static int
+pci_nfuncs(struct pci_system_x86 *pci_sys_x86, int bus, int dev)
+{
+ uint8_t hdr;
+ int err;
+
+ err = pci_sys_x86->read(bus, dev, 0, PCI_HDRTYPE, &hdr, sizeof(hdr));
+
+ if (err)
+ return err;
+
+ return hdr & 0x80 ? 8 : 1;
+}
+
+/**
+ * Read a VGA rom using the 0xc0000 mapping.
+ */
+static int
+pci_device_x86_read_rom(struct pci_device *dev, void *buffer)
+{
+ void *bios;
+ int memfd;
+
+ if ((dev->device_class & 0x00ffff00) !=
+ ((PCIC_DISPLAY << 16) | ( PCIS_DISPLAY_VGA << 8))) {
+ return ENOSYS;
+ }
+
+ memfd = open("/dev/mem", O_RDONLY);
+ if (memfd == -1)
+ return errno;
+
+ bios = mmap(NULL, dev->rom_size, PROT_READ, 0, memfd, 0xc0000);
+ if (bios == MAP_FAILED) {
+ close(memfd);
+ return errno;
+ }
+
+ memcpy(buffer, bios, dev->rom_size);
+
+ munmap(bios, dev->rom_size);
+ close(memfd);
+
+ return 0;
+}
+
+/** Returns the number of regions (base address registers) the device has */
+static int
+pci_device_x86_get_num_regions(uint8_t header_type)
+{
+ switch (header_type & 0x7f) {
+ case 0:
+ return 6;
+ case 1:
+ return 2;
+ case 2:
+ return 1;
+ default:
+ printf("unknown header type %02x\n", header_type);
+ return 0;
+ }
+}
+
+/** Masks out the flag bigs of the base address register value */
+static uint32_t
+get_map_base( uint32_t val )
+{
+ if (val & 0x01)
+ return val & ~0x03;
+ else
+ return val & ~0x0f;
+}
+
+/** Returns the size of a region based on the all-ones test value */
+static int
+get_test_val_size( uint32_t testval )
+{
+ int size = 1;
+
+ if (testval == 0)
+ return 0;
+
+ /* Mask out the flag bits */
+ testval = get_map_base( testval );
+ if (!testval)
+ return 0;
+
+ while ((testval & 1) == 0) {
+ size <<= 1;
+ testval >>= 1;
+ }
+
+ return size;
+}
+
+static int
+pci_device_x86_probe(struct pci_device *dev)
+{
+ uint8_t irq, hdrtype;
+ int err, i, bar;
+
+ /* Many of the fields were filled in during initial device enumeration.
+ * At this point, we need to fill in regions, rom_size, and irq.
+ */
+
+ err = pci_device_cfg_read_u8(dev, &irq, PCI_IRQ);
+ if (err)
+ return err;
+ dev->irq = irq;
+
+ err = pci_device_cfg_read_u8(dev, &hdrtype, PCI_HDRTYPE);
+ if (err)
+ return err;
+
+ bar = 0x10;
+ for (i = 0; i < pci_device_x86_get_num_regions(hdrtype); i++, bar += 4) {
+ uint32_t addr, testval;
+
+ /* Get the base address */
+ err = pci_device_cfg_read_u32(dev, &addr, bar);
+ if (err != 0)
+ continue;
+
+ /* Test write all ones to the register, then restore it. */
+ err = pci_device_cfg_write_u32(dev, 0xffffffff, bar);
+ if (err != 0)
+ continue;
+ pci_device_cfg_read_u32(dev, &testval, bar);
+ err = pci_device_cfg_write_u32(dev, addr, bar);
+
+ if (addr & 0x01)
+ dev->regions[i].is_IO = 1;
+ if (addr & 0x04)
+ dev->regions[i].is_64 = 1;
+ if (addr & 0x08)
+ dev->regions[i].is_prefetchable = 1;
+
+ /* Set the size */
+ dev->regions[i].size = get_test_val_size(testval);
+
+ /* Set the base address value */
+ if (dev->regions[i].is_64) {
+ uint32_t top;
+
+ err = pci_device_cfg_read_u32(dev, &top, bar + 4);
+ if (err != 0)
+ continue;
+
+ dev->regions[i].base_addr = ((uint64_t)top << 32) |
+ get_map_base(addr);
+ bar += 4;
+ i++;
+ } else {
+ dev->regions[i].base_addr = get_map_base(addr);
+ }
+ }
+
+ /* If it's a VGA device, set up the rom size for read_rom using the
+ * 0xc0000 mapping.
+ */
+ if ((dev->device_class & 0x00ffff00) ==
+ ((PCIC_DISPLAY << 16) | (PCIS_DISPLAY_VGA << 8)))
+ {
+ dev->rom_size = 64 * 1024;
+ }
+
+ return 0;
+}
+
+static int
+pci_device_x86_map_range(struct pci_device *dev,
+ struct pci_device_mapping *map)
+{
+ int memfd = open("/dev/mem", O_RDWR);
+ int prot = PROT_READ;
+
+ if (memfd == -1)
+ return errno;
+
+ if (map->flags & PCI_DEV_MAP_FLAG_WRITABLE)
+ prot |= PROT_WRITE;
+
+ map->memory = mmap(NULL, map->size, prot, MAP_SHARED, memfd, map->base);
+ close(memfd);
+ if (map->memory == MAP_FAILED)
+ return errno;
+
+ return 0;
+}
+
+static int
+pci_device_x86_read(struct pci_device *dev, void *data,
+ pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_read)
+{
+ struct pci_system_x86 *pci_sys_x86 = (struct pci_system_x86 *) pci_sys;
+ int err;
+
+ *bytes_read = 0;
+ while (size > 0) {
+ int toread = 4;
+ if (toread > size)
+ toread = size;
+ if (toread > 4 - (offset & 0x3))
+ toread = 4 - (offset & 0x3);
+
+ err = pci_sys_x86->read(dev->bus, dev->dev, dev->func, offset, data, toread);
+ if (err)
+ return err;
+
+ offset += toread;
+ data = (char*)data + toread;
+ size -= toread;
+ *bytes_read += toread;
+ }
+ return 0;
+}
+
+static int
+pci_device_x86_write(struct pci_device *dev, const void *data,
+ pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_written)
+{
+ struct pci_system_x86 *pci_sys_x86 = (struct pci_system_x86 *) pci_sys;
+ int err;
+
+ *bytes_written = 0;
+ while (size > 0) {
+ int towrite = 4;
+ if (towrite > size)
+ towrite = size;
+ if (towrite > 4 - (offset & 0x3))
+ towrite = 4 - (offset & 0x3);
+
+ err = pci_sys_x86->write(dev->bus, dev->dev, dev->func, offset, data, towrite);
+ if (err)
+ return err;
+
+ offset += towrite;
+ data = (const char*)data + towrite;
+ size -= towrite;
+ *bytes_written += towrite;
+ }
+ return 0;
+}
+
+static void
+pci_system_x86_destroy(void)
+{
+ x86_disable_io();
+}
+
+static const struct pci_system_methods x86_pci_methods = {
+ .destroy = pci_system_x86_destroy,
+ .read_rom = pci_device_x86_read_rom,
+ .probe = pci_device_x86_probe,
+ .map_range = pci_device_x86_map_range,
+ .unmap_range = pci_device_generic_unmap_range,
+ .read = pci_device_x86_read,
+ .write = pci_device_x86_write,
+ .fill_capabilities = pci_fill_capabilities_generic,
+};
+
+static int pci_probe(struct pci_system_x86 *pci_sys_x86)
+{
+ if (pci_x86_conf1_probe() == 0) {
+ pci_sys_x86->read = pci_x86_conf1_read;
+ pci_sys_x86->write = pci_x86_conf1_write;
+ if (pci_x86_check(pci_sys_x86) == 0)
+ return 0;
+ }
+
+ if (pci_x86_conf2_probe() == 0) {
+ pci_sys_x86->read = pci_x86_conf2_read;
+ pci_sys_x86->write = pci_x86_conf2_write;
+ if (pci_x86_check(pci_sys_x86) == 0)
+ return 0;
+ }
+
+ return ENODEV;
+}
+
+_pci_hidden int
+pci_system_x86_create(void)
+{
+ struct pci_device_private *device;
+ int ret, bus, dev, ndevs, func, nfuncs;
+ struct pci_system_x86 *pci_sys_x86;
+ uint32_t reg;
+
+ ret = x86_enable_io();
+ if (ret)
+ return ret;
+
+ pci_sys_x86 = calloc(1, sizeof(struct pci_system_x86));
+ if (pci_sys_x86 == NULL) {
+ x86_disable_io();
+ return ENOMEM;
+ }
+ pci_sys = &pci_sys_x86->system;
+
+ ret = pci_probe(pci_sys_x86);
+ if (ret)
+ return ret;
+
+ pci_sys->methods = &x86_pci_methods;
+
+ ndevs = 0;
+ for (bus = 0; bus < 256; bus++) {
+ for (dev = 0; dev < 32; dev++) {
+ nfuncs = pci_nfuncs(pci_sys_x86, bus, dev);
+ for (func = 0; func < nfuncs; func++) {
+ if (pci_sys_x86->read(bus, dev, func, PCI_VENDOR_ID, ®, sizeof(reg)) != 0)
+ continue;
+ if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID ||
+ PCI_VENDOR(reg) == 0)
+ continue;
+ ndevs++;
+ }
+ }
+ }
+
+ pci_sys->num_devices = ndevs;
+ pci_sys->devices = calloc(ndevs, sizeof(struct pci_device_private));
+ if (pci_sys->devices == NULL) {
+ x86_disable_io();
+ free(pci_sys);
+ return ENOMEM;
+ }
+
+ device = pci_sys->devices;
+ for (bus = 0; bus < 256; bus++) {
+ for (dev = 0; dev < 32; dev++) {
+ nfuncs = pci_nfuncs(pci_sys_x86, bus, dev);
+ for (func = 0; func < nfuncs; func++) {
+ if (pci_sys_x86->read(bus, dev, func, PCI_VENDOR_ID, ®, sizeof(reg)) != 0)
+ continue;
+ if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID ||
+ PCI_VENDOR(reg) == 0)
+ continue;
+ device->base.domain = 0;
+ device->base.bus = bus;
+ device->base.dev = dev;
+ device->base.func = func;
+ device->base.vendor_id = PCI_VENDOR(reg);
+ device->base.device_id = PCI_DEVICE(reg);
+
+ if (pci_sys_x86->read(bus, dev, func, PCI_CLASS, ®, sizeof(reg)) != 0)
+ continue;
+ device->base.device_class = reg >> 8;
+ device->base.revision = reg & 0xFF;
+
+ if (pci_sys_x86->read(bus, dev, func, PCI_SUB_VENDOR_ID, ®, sizeof(reg)) != 0)
+ continue;
+ device->base.subvendor_id = PCI_VENDOR(reg);
+ device->base.subdevice_id = PCI_DEVICE(reg);
+
+ device++;
+ }
+ }
+ }
+
+ return 0;
+}
--- End Message ---