OSDN Git Service

Add NetBSD support
authorJuan RP <xtraeme@gmail.com>
Sat, 11 Oct 2008 18:28:03 +0000 (20:28 +0200)
committerJulien Cristau <jcristau@debian.org>
Sat, 11 Oct 2008 18:31:04 +0000 (20:31 +0200)
It's based in the OpenBSD code, but with differences because on NetBSD,
to set MTRRs we have to use i386/x86_64_set_mtrr() and link to libi386
or libx86_64.

X.Org bug#17931 <http://bugs.freedesktop.org/show_bug.cgi?id=17931>

configure.ac
src/Makefile.am
src/common_init.c
src/common_interface.c
src/netbsd_pci.c [new file with mode: 0644]
src/pciaccess_private.h

index 1cceb14..5c71758 100644 (file)
@@ -90,6 +90,17 @@ case $host_os in
        *linux*)
                linux=yes
                ;;
+       *netbsd*)
+               case $host in
+               *i386*)
+                       PCIACCESS_LIBS="-li386"
+                       ;;
+               *x86_64*|*amd64*)
+                       PCIACCESS_LIBS="-lx86_64"
+                       ;;
+               esac
+               netbsd=yes
+               ;;
        *openbsd*)
                openbsd=yes
                ;;
@@ -101,6 +112,7 @@ esac
 
 AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
 AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
+AM_CONDITIONAL(NETBSD, [test "x$netbsd" = xyes])
 AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
 AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
 
index 8c53de5..3e50406 100644 (file)
@@ -33,6 +33,10 @@ if FREEBSD
 OS_SUPPORT = freebsd_pci.c
 endif
 
+if NETBSD
+OS_SUPPORT = netbsd_pci.c
+endif
+
 if OPENBSD
 OS_SUPPORT = openbsd_pci.c
 endif
index 0b799ff..6b83d97 100644 (file)
@@ -56,6 +56,8 @@ pci_system_init( void )
     err = pci_system_linux_sysfs_create();
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     err = pci_system_freebsd_create();
+#elif defined(__NetBSD__)
+    err = pci_system_netbsd_create();
 #elif defined(__OpenBSD__)
     err = pci_system_openbsd_create();
 #elif defined(__sun)
index 663ab44..649ca47 100644 (file)
@@ -64,7 +64,7 @@
 #define HTOLE_16(x)    htole16(x)
 #define HTOLE_32(x)    htole32(x)
 
-#if defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
 #define LETOH_16(x)    le16toh(x)
 #define LETOH_32(x)    le32toh(x)
 #else
diff --git a/src/netbsd_pci.c b/src/netbsd_pci.c
new file mode 100644 (file)
index 0000000..8b39edf
--- /dev/null
@@ -0,0 +1,409 @@
+/*
+ * 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.
+ */
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+
+#include <machine/sysarch.h>
+#include <machine/mtrr.h>
+
+#include <dev/pci/pciio.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcidevs.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+
+#include "pciaccess.h"
+#include "pciaccess_private.h"
+
+static int pcifd;
+
+static int
+pci_read(int bus, int dev, int func, uint32_t reg, uint32_t *val)
+{
+       struct pciio_bdf_cfgreg io;
+       int err;
+
+       bzero(&io, sizeof(io));
+       io.bus = bus;
+       io.device = dev;
+       io.function = func;
+       io.cfgreg.reg = reg;
+
+       err = ioctl(pcifd, PCI_IOC_BDF_CFGREAD, &io);
+       if (err)
+               return (err);
+
+       *val = io.cfgreg.val;
+
+       return 0;
+}
+
+static int
+pci_write(int bus, int dev, int func, uint32_t reg, uint32_t val)
+{
+       struct pciio_bdf_cfgreg io;
+
+       bzero(&io, sizeof(io));
+       io.bus = bus;
+       io.device = dev;
+       io.function = func;
+       io.cfgreg.reg = reg;
+       io.cfgreg.val = val;
+
+       return ioctl(pcifd, PCI_IOC_BDF_CFGWRITE, &io);
+}
+
+static int
+pci_nfuncs(int bus, int dev)
+{
+       uint32_t hdr;
+
+       if (pci_read(bus, dev, 0, PCI_BHLC_REG, &hdr) != 0)
+               return -1;
+
+       return (PCI_HDRTYPE_MULTIFN(hdr) ? 8 : 1);
+}
+
+static int
+pci_device_netbsd_map_range(struct pci_device *dev,
+    struct pci_device_mapping *map)
+{
+       struct mtrr mtrr;
+       int fd, error, nmtrr, prot = PROT_READ;
+
+       if ((fd = open("/dev/mem", O_RDWR)) == -1)
+               return errno;
+
+       if (map->flags & PCI_DEV_MAP_FLAG_WRITABLE)
+               prot |= PROT_WRITE;
+
+       map->memory = mmap(NULL, map->size, prot, MAP_SHARED,
+           fd, map->base);
+       if (map->memory == MAP_FAILED)
+               return errno;
+
+       /* No need to set an MTRR if it's the default mode. */
+       if ((map->flags & PCI_DEV_MAP_FLAG_CACHABLE) ||
+           (map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE)) {
+               mtrr.base = map->base;
+               mtrr.len = map->size;
+               mtrr.flags = MTRR_VALID;
+
+               if (map->flags & PCI_DEV_MAP_FLAG_CACHABLE)
+                       mtrr.type = MTRR_TYPE_WB;
+               if (map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE)
+                       mtrr.type = MTRR_TYPE_WC;
+#ifdef __i386__
+               error = i386_set_mtrr(&mtrr, &nmtrr);
+#endif
+#ifdef __amd64__
+               error = x86_64_set_mtrr(&mtrr, &nmtrr);
+#endif
+               if (error) {
+                       close(fd);
+                       return errno;
+               }
+       }
+
+       close(fd);
+
+       return 0;
+}
+
+static int
+pci_device_netbsd_unmap_range(struct pci_device *dev,
+    struct pci_device_mapping *map)
+{
+       struct mtrr mtrr;
+       int nmtrr, error;
+
+       if ((map->flags & PCI_DEV_MAP_FLAG_CACHABLE) ||
+           (map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE)) {
+               mtrr.base = map->base;
+               mtrr.len = map->size;
+               mtrr.type = MTRR_TYPE_UC;
+               mtrr.flags = 0; /* clear/set MTRR */
+#ifdef __i386__
+               error = i386_set_mtrr(&mtrr, &nmtrr);
+#endif
+#ifdef __amd64__
+               error = x86_64_set_mtrr(&mtrr, &nmtrr);
+#endif
+               if (error)
+                       return errno;
+       }
+
+       return pci_device_generic_unmap_range(dev, map);
+}
+
+static int
+pci_device_netbsd_read(struct pci_device *dev, void *data,
+    pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_read)
+{
+       struct pciio_bdf_cfgreg io;
+
+       io.bus = dev->bus;
+       io.device = dev->dev;
+       io.function = dev->func;
+
+       *bytes_read = 0;
+       while (size > 0) {
+               int toread = MIN(size, 4 - (offset & 0x3));
+
+               io.cfgreg.reg = (offset & ~0x3);
+
+               if (ioctl(pcifd, PCI_IOC_BDF_CFGREAD, &io) == -1)
+                       return errno;
+
+               io.cfgreg.val = htole32(io.cfgreg.val);
+               io.cfgreg.val >>= ((offset & 0x3) * 8);
+
+               memcpy(data, &io.cfgreg.val, toread);
+
+               offset += toread;
+               data = (char *)data + toread;
+               size -= toread;
+               *bytes_read += toread;
+       }
+
+       return 0;
+}
+
+static int
+pci_device_netbsd_write(struct pci_device *dev, const void *data,
+    pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_written)
+{
+       struct pciio_bdf_cfgreg io;
+
+       if ((offset % 4) == 0 || (size % 4) == 0)
+               return EINVAL;
+
+       io.bus = dev->bus;
+       io.device = dev->dev;
+       io.function = dev->func;
+
+       *bytes_written = 0;
+       while (size > 0) {
+               io.cfgreg.reg = offset;
+               memcpy(&io.cfgreg.val, data, 4);
+
+               if (ioctl(pcifd, PCI_IOC_BDF_CFGWRITE, &io) == -1) 
+                       return errno;
+
+               offset += 4;
+               data = (char *)data + 4;
+               size -= 4;
+               *bytes_written += 4;
+       }
+
+       return 0;
+}
+
+static void
+pci_system_netbsd_destroy(void)
+{
+       close(pcifd);
+       free(pci_sys);
+       pci_sys = NULL;
+}
+
+static int
+pci_device_netbsd_probe(struct pci_device *device)
+{
+       struct pci_device_private *priv = (struct pci_device_private *)device;
+       struct pci_mem_region *region;
+       uint64_t reg64, size64;
+       uint32_t bar, reg, size;
+       int bus, dev, func, err;
+
+       bus = device->bus;
+       dev = device->dev;
+       func = device->func;
+
+       err = pci_read(bus, dev, func, PCI_BHLC_REG, &reg);
+       if (err)
+               return err;
+
+       priv->header_type = PCI_HDRTYPE_TYPE(reg);
+       if (priv->header_type != 0)
+               return 0;
+
+       region = device->regions;
+       for (bar = PCI_MAPREG_START; bar < PCI_MAPREG_END;
+            bar += sizeof(uint32_t), region++) {
+               err = pci_read(bus, dev, func, bar, &reg);
+               if (err)
+                       return err;
+
+               /* Probe the size of the region. */
+               err = pci_write(bus, dev, func, bar, ~0);
+               if (err)
+                       return err;
+               pci_read(bus, dev, func, bar, &size);
+               pci_write(bus, dev, func, bar, reg);
+
+               if (PCI_MAPREG_TYPE(reg) == PCI_MAPREG_TYPE_IO) {
+                       region->is_IO = 1;
+                       region->base_addr = PCI_MAPREG_IO_ADDR(reg);
+                       region->size = PCI_MAPREG_IO_SIZE(size);
+               } else {
+                       if (PCI_MAPREG_MEM_PREFETCHABLE(reg))
+                               region->is_prefetchable = 1;
+                       switch(PCI_MAPREG_MEM_TYPE(reg)) {
+                       case PCI_MAPREG_MEM_TYPE_32BIT:
+                       case PCI_MAPREG_MEM_TYPE_32BIT_1M:
+                               region->base_addr = PCI_MAPREG_MEM_ADDR(reg);
+                               region->size = PCI_MAPREG_MEM_SIZE(size);
+                               break;
+                       case PCI_MAPREG_MEM_TYPE_64BIT:
+                               region->is_64 = 1;
+
+                               reg64 = reg;
+                               size64 = size;
+
+                               bar += sizeof(uint32_t);
+
+                               err = pci_read(bus, dev, func, bar, &reg);
+                               if (err)
+                                       return err;
+                               reg64 |= (uint64_t)reg << 32;
+
+                               err = pci_write(bus, dev, func, bar, ~0);
+                               if (err)
+                                       return err;
+                               pci_read(bus, dev, func, bar, &size);
+                               pci_write(bus, dev, func, bar, reg64 >> 32);
+                               size64 |= (uint64_t)size << 32;
+
+                               region->base_addr = PCI_MAPREG_MEM64_ADDR(reg64);
+                               region->size = PCI_MAPREG_MEM64_SIZE(size64);
+                               region++;
+                               break;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+static const struct pci_system_methods netbsd_pci_methods = {
+       pci_system_netbsd_destroy,
+       NULL,
+       NULL,
+       pci_device_netbsd_probe,
+       pci_device_netbsd_map_range,
+       pci_device_netbsd_unmap_range,
+       pci_device_netbsd_read,
+       pci_device_netbsd_write,
+       pci_fill_capabilities_generic
+};
+
+int
+pci_system_netbsd_create(void)
+{
+       struct pci_device_private *device;
+       int bus, dev, func, ndevs, nfuncs;
+       uint32_t reg;
+
+       pcifd = open("/dev/pci0", O_RDWR);
+       if (pcifd == -1)
+               return ENXIO;
+
+       pci_sys = calloc(1, sizeof(struct pci_system));
+       if (pci_sys == NULL) {
+               close(pcifd);
+               return ENOMEM;
+       }
+
+       pci_sys->methods = &netbsd_pci_methods;
+
+       ndevs = 0;
+       for (bus = 0; bus < 256; bus++) {
+               for (dev = 0; dev < 32; dev++) {
+                       nfuncs = pci_nfuncs(bus, dev);
+                       for (func = 0; func < nfuncs; func++) {
+                               if (pci_read(bus, dev, func, PCI_ID_REG,
+                                   &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) {
+               free(pci_sys);
+               close(pcifd);
+               return ENOMEM;
+       }
+
+       device = pci_sys->devices;
+       for (bus = 0; bus < 256; bus++) {
+               for (dev = 0; dev < 32; dev++) {
+                       nfuncs = pci_nfuncs(bus, dev);
+                       for (func = 0; func < nfuncs; func++) {
+                               if (pci_read(bus, dev, func, PCI_ID_REG,
+                                   &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_PRODUCT(reg);
+
+                               if (pci_read(bus, dev, func, PCI_CLASS_REG,
+                                   &reg) != 0)
+                                       continue;
+
+                               device->base.device_class =
+                                   PCI_INTERFACE(reg) | PCI_CLASS(reg) << 16 |
+                                   PCI_SUBCLASS(reg) << 8;
+                               device->base.revision = PCI_REVISION(reg);
+
+                               if (pci_read(bus, dev, func, PCI_SUBSYS_ID_REG,
+                                   &reg) != 0)
+                                       continue;
+
+                               device->base.subvendor_id = PCI_VENDOR(reg);
+                               device->base.subdevice_id = PCI_PRODUCT(reg);
+
+                               device++;
+                       }
+               }
+       }
+
+       return 0;
+}
index 6048af1..bff6903 100644 (file)
@@ -136,6 +136,7 @@ extern struct pci_system * pci_sys;
 
 extern int pci_system_linux_sysfs_create( void );
 extern int pci_system_freebsd_create( void );
+extern int pci_system_netbsd_create( void );
 extern int pci_system_openbsd_create( void );
 extern void pci_system_openbsd_init_dev_mem( int );
 extern int pci_system_solx_devfs_create( void );