Module Name: src
Committed By: pooka
Date: Fri Apr 4 12:53:59 UTC 2014
Added Files:
src/sys/rump/dev/lib/libpci: Makefile PCI.ioconf pci_at_mainbus.c
pci_user.h rumpdev_bus_dma.c rumpdev_bus_space.c rumpdev_pci.c
shlib_version
src/sys/rump/dev/lib/libpci/opt: opt_pci.h
Log Message:
Add a rump kernel component for the PCI bus. It works both in Xen DomU
(via Xen's PCI passthrough) and Linux userspace (via uio_pci_generic).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci/Makefile \
src/sys/rump/dev/lib/libpci/PCI.ioconf \
src/sys/rump/dev/lib/libpci/pci_at_mainbus.c \
src/sys/rump/dev/lib/libpci/pci_user.h \
src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c \
src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c \
src/sys/rump/dev/lib/libpci/rumpdev_pci.c \
src/sys/rump/dev/lib/libpci/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci/opt/opt_pci.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libpci/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci/Makefile:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/Makefile Fri Apr 4 12:53:59 2014
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2014/04/04 12:53:59 pooka Exp $
+#
+
+RUMPTOP= ${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci
+IOCONF= PCI.ioconf
+
+SRCS+= pci.c pci_map.c pci_quirks.c pci_subr.c pci_stub.c pci_usrreq.c
+SRCS+= pcibusprint.c
+
+SRCS+= rumpdev_pci.c
+
+# ok, these don't _really_ belong here, but it's the only
+# place they're currently useful, so let it slide
+SRCS+= rumpdev_bus_space.c
+SRCS+= rumpdev_bus_dma.c
+
+SRCS+= pci_at_mainbus.c
+
+CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
+
+#RUMPCOMP_USER_SRCS= pci_user.c
+
+.include "${RUMPTOP}/Makefile.rump"
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libpci/PCI.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci/PCI.ioconf:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/PCI.ioconf Fri Apr 4 12:53:59 2014
@@ -0,0 +1,12 @@
+# $NetBSD: PCI.ioconf,v 1.1 2014/04/04 12:53:59 pooka Exp $
+#
+
+ioconf pci
+
+include "conf/files"
+include "dev/pci/files.pci"
+include "rump/dev/files.rump"
+
+pseudo-root mainbus*
+
+pci* at mainbus? bus ?
Index: src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u /dev/null src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Fri Apr 4 12:53:59 2014
@@ -0,0 +1,75 @@
+/* $NetBSD: pci_at_mainbus.c,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.1 2014/04/04 12:53:59 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mbuf.h>
+#include <sys/stat.h>
+#include <sys/bus.h>
+
+#include <dev/pci/pcivar.h>
+#include <machine/bus_private.h>
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_pci,
+ cfattach_ioconf_pci, cfdata_ioconf_pci);
+}
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERMAINBUS)
+{
+ struct pcibus_attach_args pba;
+ device_t mainbus;
+
+ /* XXX: attach args should come from elsewhere */
+ memset(&pba, 0, sizeof(pba));
+ pba.pba_iot = (bus_space_tag_t)0;
+ pba.pba_memt = (bus_space_tag_t)1;
+ pba.pba_dmat = (void *)0x20;
+#ifdef _LP64
+ pba.pba_dmat64 = (void *)0x40;
+#endif
+ pba.pba_flags = PCI_FLAGS_MEM_OKAY |
+ PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;;
+#if 0
+ pba.pba_flags |= PCI_FLAGS_IO_OKAY;
+#endif
+
+ mainbus = device_find_by_driver_unit("mainbus", 0);
+ if (!mainbus)
+ panic("no mainbus. use maintaxi instead?");
+ config_found_ia(mainbus, "pcibus", &pba, pcibusprint);
+}
Index: src/sys/rump/dev/lib/libpci/pci_user.h
diff -u /dev/null src/sys/rump/dev/lib/libpci/pci_user.h:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/pci_user.h Fri Apr 4 12:53:59 2014
@@ -0,0 +1,11 @@
+void *rumpcomp_pci_map(unsigned long, unsigned long);
+int rumpcomp_pci_confread(unsigned, unsigned, unsigned, int, unsigned int *);
+int rumpcomp_pci_confwrite(unsigned, unsigned, unsigned, int, unsigned int);
+
+void *rumpcomp_pci_irq_establish(int, int (*)(void *), void *);
+
+/* XXX: needs work: support boundary-restricted allocations */
+int rumpcomp_pci_dmalloc(size_t, size_t, unsigned long *);
+
+void *rumpcomp_pci_mach_to_virt(unsigned long);
+unsigned long rumpcomp_pci_virt_to_mach(void *);
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
diff -u /dev/null src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Fri Apr 4 12:53:59 2014
@@ -0,0 +1,548 @@
+/* $NetBSD: rumpdev_bus_dma.c,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2013 Antti Kantee
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * bus_dma(9) implementation which runs on top of rump kernel hypercalls.
+ * It's essentially the same as the PowerPC implementation its based on,
+ * except with some indirection and PowerPC MD features removed.
+ * This should/could be expected to run on x86, other archs may need
+ * some cache flushing hooks.
+ *
+ * From sys/arch/powerpc/powerpc/bus_dma.c:
+ * NetBSD: bus_dma.c,v 1.46 2012/02/01 09:54:03 matt Exp
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/kmem.h>
+#include <sys/proc.h>
+#include <sys/mbuf.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
+
+#include <uvm/uvm.h>
+
+#include "pci_user.h"
+
+#define EIEIO membar_sync()
+
+int _bus_dmamap_load_buffer (bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct vmspace *, int, paddr_t *, int *, int);
+
+#undef PHYS_TO_BUS_MEM
+#define PHYS_TO_BUS_MEM(_t_, _a_) rumpcomp_pci_virt_to_mach((void *)_a_)
+#undef BUS_MEM_TO_PHYS
+#define BUS_MEM_TO_PHYS(_t_, _a_) rumpcomp_pci_mach_to_virt(_a_)
+
+/*
+ * Common function for DMA map creation. May be called by bus-specific
+ * DMA map creation functions.
+ */
+int
+bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
+ bus_size_t maxsegsz, bus_size_t boundary, int flags,
+ bus_dmamap_t *dmamp)
+{
+ bus_dmamap_t map;
+ void *mapstore;
+ size_t mapsize;
+
+ /*
+ * Allocate and initialize the DMA map. The end of the map
+ * is a variable-sized array of segments, so we allocate enough
+ * room for them in one shot.
+ *
+ * Note we don't preserve the WAITOK or NOWAIT flags. Preservation
+ * of ALLOCNOW notifies others that we've reserved these resources,
+ * and they are not to be freed.
+ *
+ * The bus_dmamap_t includes one bus_dma_segment_t, hence
+ * the (nsegments - 1).
+ */
+ mapsize = sizeof(*map) + sizeof(bus_dma_segment_t [nsegments - 1]);
+ if ((mapstore = kmem_intr_alloc(mapsize,
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
+ return (ENOMEM);
+
+ memset(mapstore, 0, mapsize);
+ map = (void *)mapstore;
+ map->_dm_size = size;
+ map->_dm_segcnt = nsegments;
+ map->_dm_maxmaxsegsz = maxsegsz;
+ map->_dm_boundary = boundary;
+ map->_dm_bounce_thresh = 0;
+ map->_dm_flags = flags & ~(BUS_DMA_WAITOK|BUS_DMA_NOWAIT);
+ map->dm_maxsegsz = maxsegsz;
+ map->dm_mapsize = 0; /* no valid mappings */
+ map->dm_nsegs = 0;
+
+ *dmamp = map;
+ return (0);
+}
+
+/*
+ * Common function for DMA map destruction. May be called by bus-specific
+ * DMA map destruction functions.
+ */
+void
+bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
+{
+
+ size_t mapsize = sizeof(*map)
+ + sizeof(bus_dma_segment_t [map->_dm_segcnt - 1]);
+ kmem_intr_free(map, mapsize);
+}
+
+/*
+ * Utility function to load a linear buffer. lastaddrp holds state
+ * between invocations (for multiple-buffer loads). segp contains
+ * the starting segment on entrance, and the ending segment on exit.
+ * first indicates if this is the first invocation of this function.
+ */
+int
+_bus_dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map,
+ void *buf, bus_size_t buflen, struct vmspace *vm, int flags,
+ paddr_t *lastaddrp, int *segp, int first)
+{
+ bus_size_t sgsize;
+ bus_addr_t curaddr, lastaddr, baddr, bmask;
+ vaddr_t vaddr = (vaddr_t)buf;
+ int seg;
+
+// printf("%s(%p,%p,%p,%u,%p,%#x,%p,%p,%u)\n", __func__,
+// t, map, buf, buflen, vm, flags, lastaddrp, segp, first);
+
+ lastaddr = *lastaddrp;
+ bmask = ~(map->_dm_boundary - 1);
+
+ for (seg = *segp; buflen > 0 ; ) {
+ /*
+ * Get the physical address for this segment.
+ */
+ if (!VMSPACE_IS_KERNEL_P(vm))
+ (void) pmap_extract(vm_map_pmap(&vm->vm_map),
+ vaddr, (void *)&curaddr);
+ else
+ curaddr = vtophys(vaddr);
+
+ /*
+ * If we're beyond the bounce threshold, notify
+ * the caller.
+ */
+ if (map->_dm_bounce_thresh != 0 &&
+ curaddr >= map->_dm_bounce_thresh)
+ return (EINVAL);
+
+ /*
+ * Compute the segment size, and adjust counts.
+ */
+ sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET);
+ if (buflen < sgsize)
+ sgsize = buflen;
+ sgsize = min(sgsize, map->dm_maxsegsz);
+
+ /*
+ * Make sure we don't cross any boundaries.
+ */
+ if (map->_dm_boundary > 0) {
+ baddr = (curaddr + map->_dm_boundary) & bmask;
+ if (sgsize > (baddr - curaddr))
+ sgsize = (baddr - curaddr);
+ }
+
+ /*
+ * Insert chunk into a segment, coalescing with
+ * the previous segment if possible.
+ */
+ if (first) {
+ map->dm_segs[seg].ds_addr = PHYS_TO_BUS_MEM(t, curaddr);
+ map->dm_segs[seg].ds_len = sgsize;
+ first = 0;
+ } else {
+ if (curaddr == lastaddr &&
+ (map->dm_segs[seg].ds_len + sgsize) <=
+ map->dm_maxsegsz &&
+ (map->_dm_boundary == 0 ||
+ (map->dm_segs[seg].ds_addr & bmask) ==
+ (PHYS_TO_BUS_MEM(t, curaddr) & bmask)))
+ map->dm_segs[seg].ds_len += sgsize;
+ else {
+ if (++seg >= map->_dm_segcnt)
+ break;
+ map->dm_segs[seg].ds_addr =
+ PHYS_TO_BUS_MEM(t, curaddr);
+ map->dm_segs[seg].ds_len = sgsize;
+ }
+ }
+
+ lastaddr = curaddr + sgsize;
+ vaddr += sgsize;
+ buflen -= sgsize;
+ }
+
+ *segp = seg;
+ *lastaddrp = lastaddr;
+
+ /*
+ * Did we fit?
+ */
+ if (buflen != 0)
+ return (EFBIG); /* XXX better return value here? */
+
+ return (0);
+}
+
+/*
+ * Common function for loading a DMA map with a linear buffer. May
+ * be called by bus-specific DMA map load functions.
+ */
+int
+bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map,
+ void *buf, bus_size_t buflen, struct proc *p, int flags)
+{
+ paddr_t lastaddr = 0;
+ int seg, error;
+ struct vmspace *vm;
+
+ /*
+ * Make sure that on error condition we return "no valid mappings".
+ */
+ map->dm_mapsize = 0;
+ map->dm_nsegs = 0;
+ KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
+
+ if (buflen > map->_dm_size)
+ return (EINVAL);
+
+ if (p != NULL) {
+ vm = p->p_vmspace;
+ } else {
+ vm = vmspace_kernel();
+ }
+
+ seg = 0;
+ error = _bus_dmamap_load_buffer(t, map, buf, buflen, vm, flags,
+ &lastaddr, &seg, 1);
+ if (error == 0) {
+ map->dm_mapsize = buflen;
+ map->dm_nsegs = seg + 1;
+ }
+ return (error);
+}
+
+/*
+ * Like _bus_dmamap_load(), but for mbufs.
+ */
+int
+bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map,
+ struct mbuf *m0, int flags)
+{
+ paddr_t lastaddr = 0;
+ int seg, error, first;
+ struct mbuf *m;
+
+ /*
+ * Make sure that on error condition we return "no valid mappings."
+ */
+ map->dm_mapsize = 0;
+ map->dm_nsegs = 0;
+ KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
+
+#ifdef DIAGNOSTIC
+ if ((m0->m_flags & M_PKTHDR) == 0)
+ panic("_bus_dmamap_load_mbuf: no packet header");
+#endif
+
+ if (m0->m_pkthdr.len > map->_dm_size)
+ return (EINVAL);
+
+ first = 1;
+ seg = 0;
+ error = 0;
+ for (m = m0; m != NULL && error == 0; m = m->m_next, first = 0) {
+ if (m->m_len == 0)
+ continue;
+#ifdef POOL_VTOPHYS
+ /* XXX Could be better about coalescing. */
+ /* XXX Doesn't check boundaries. */
+ switch (m->m_flags & (M_EXT|M_CLUSTER)) {
+ case M_EXT|M_CLUSTER:
+ /* XXX KDASSERT */
+ KASSERT(m->m_ext.ext_paddr != M_PADDR_INVALID);
+ lastaddr = m->m_ext.ext_paddr +
+ (m->m_data - m->m_ext.ext_buf);
+ have_addr:
+ if (first == 0 && ++seg >= map->_dm_segcnt) {
+ error = EFBIG;
+ continue;
+ }
+ map->dm_segs[seg].ds_addr =
+ PHYS_TO_BUS_MEM(t, lastaddr);
+ map->dm_segs[seg].ds_len = m->m_len;
+ lastaddr += m->m_len;
+ continue;
+
+ case 0:
+ lastaddr = m->m_paddr + M_BUFOFFSET(m) +
+ (m->m_data - M_BUFADDR(m));
+ goto have_addr;
+
+ default:
+ break;
+ }
+#endif
+ error = _bus_dmamap_load_buffer(t, map, m->m_data,
+ m->m_len, vmspace_kernel(), flags, &lastaddr, &seg, first);
+ }
+ if (error == 0) {
+ map->dm_mapsize = m0->m_pkthdr.len;
+ map->dm_nsegs = seg + 1;
+ }
+ return (error);
+}
+
+/*
+ * Like _bus_dmamap_load(), but for uios.
+ */
+int
+bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t map,
+ struct uio *uio, int flags)
+{
+ paddr_t lastaddr = 0;
+ int seg, i, error, first;
+ bus_size_t minlen, resid;
+ struct iovec *iov;
+ void *addr;
+
+ /*
+ * Make sure that on error condition we return "no valid mappings."
+ */
+ map->dm_mapsize = 0;
+ map->dm_nsegs = 0;
+ KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
+
+ resid = uio->uio_resid;
+ iov = uio->uio_iov;
+
+ first = 1;
+ seg = 0;
+ error = 0;
+ for (i = 0; i < uio->uio_iovcnt && resid != 0 && error == 0; i++) {
+ /*
+ * Now at the first iovec to load. Load each iovec
+ * until we have exhausted the residual count.
+ */
+ minlen = resid < iov[i].iov_len ? resid : iov[i].iov_len;
+ addr = (void *)iov[i].iov_base;
+
+ error = _bus_dmamap_load_buffer(t, map, addr, minlen,
+ uio->uio_vmspace, flags, &lastaddr, &seg, first);
+ first = 0;
+
+ resid -= minlen;
+ }
+ if (error == 0) {
+ map->dm_mapsize = uio->uio_resid;
+ map->dm_nsegs = seg + 1;
+ }
+ return (error);
+}
+
+/*
+ * Like _bus_dmamap_load(), but for raw memory allocated with
+ * bus_dmamem_alloc().
+ */
+int
+bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map,
+ bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
+{
+
+ panic("_bus_dmamap_load_raw: not implemented");
+}
+
+/*
+ * Common function for unloading a DMA map. May be called by
+ * chipset-specific DMA map unload functions.
+ */
+void
+bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
+{
+
+ /*
+ * No resources to free; just mark the mappings as
+ * invalid.
+ */
+ map->dm_maxsegsz = map->_dm_maxmaxsegsz;
+ map->dm_mapsize = 0;
+ map->dm_nsegs = 0;
+}
+
+void
+bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map,
+ bus_addr_t offset, bus_size_t len, int ops)
+{
+
+ /* XXX: this might need some MD tweaks */
+ membar_sync();
+}
+
+/*
+ * Common function for freeing DMA-safe memory. May be called by
+ * bus-specific DMA memory free functions.
+ */
+void
+bus_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs)
+{
+
+ panic("bus_dmamem_free not implemented");
+}
+
+/*
+ * Don't have hypercall for mapping scatter-gather memory.
+ * So just simply fail if there's more than one segment to map
+ */
+int
+bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
+ size_t size, void **kvap, int flags)
+{
+
+ if (nsegs != 1)
+ panic("bus_dmamem_map: only nsegs == 1 supported");
+ *kvap = rumpcomp_pci_mach_to_virt(segs[0].ds_addr);
+
+ return 0;
+}
+
+/*
+ * Common function for unmapping DMA-safe memory. May be called by
+ * bus-specific DMA memory unmapping functions.
+ */
+void
+bus_dmamem_unmap(bus_dma_tag_t t, void *kva, size_t size)
+{
+
+ /* nothing to do as long as bus_dmamem_map() is what it is */
+}
+
+paddr_t
+bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
+ off_t off, int prot, int flags)
+{
+
+ panic("bus_dmamem_mmap not supported");
+}
+
+/*
+ * Allocate physical memory from the given physical address range.
+ * Called by DMA-safe memory allocation methods.
+ */
+int
+bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
+ bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
+ int flags)
+{
+ paddr_t curaddr, lastaddr, pa;
+ int curseg, error;
+
+ /* Always round the size. */
+ size = round_page(size);
+
+ /*
+ * Allocate pages from the VM system.
+ */
+#if 0
+ error = uvm_pglistalloc(size, low, high, alignment, boundary,
+ &mlist, nsegs, (flags & BUS_DMA_NOWAIT) == 0);
+#else
+ /* XXX: ignores boundary, nsegs, etc. */
+ //printf("dma allocation %lx %lx %d\n", alignment, boundary, nsegs);
+ error = rumpcomp_pci_dmalloc(size, alignment, &pa);
+#endif
+ if (error)
+ return (error);
+
+ /*
+ * Compute the location, size, and number of segments actually
+ * returned by the VM code.
+ */
+ curseg = 0;
+ lastaddr = segs[curseg].ds_addr = pa;
+ segs[curseg].ds_len = PAGE_SIZE;
+ size -= PAGE_SIZE;
+ pa += PAGE_SIZE;
+
+ for (; size; pa += PAGE_SIZE, size -= PAGE_SIZE) {
+ curaddr = pa;
+ if (curaddr == (lastaddr + PAGE_SIZE) &&
+ (lastaddr & boundary) == (curaddr & boundary)) {
+ segs[curseg].ds_len += PAGE_SIZE;
+ } else {
+ curseg++;
+ if (curseg >= nsegs)
+ return EFBIG;
+ segs[curseg].ds_addr = curaddr;
+ segs[curseg].ds_len = PAGE_SIZE;
+ }
+ lastaddr = curaddr;
+ }
+ *rsegs = curseg + 1;
+
+ return (0);
+}
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
diff -u /dev/null src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Fri Apr 4 12:53:59 2014
@@ -0,0 +1,177 @@
+/* $NetBSD: rumpdev_bus_space.c,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2013 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+#include <sys/param.h>
+
+#include <dev/pci/pcivar.h>
+
+#include "pci_user.h"
+
+int
+bus_space_map(bus_space_tag_t bst, bus_addr_t address, bus_size_t size,
+ int flags, bus_space_handle_t *handlep)
+{
+ int rv;
+
+ /*
+ * I/O space we just "let it bli" in case someone wants to
+ * map it (e.g. on Xen)
+ *
+ * Memory space needs to be mapped into our guest, so we
+ * make a hypercall to request it.
+ */
+ if (bst == 0) {
+ *handlep = address;
+ rv = 0;
+ } else {
+ *handlep = (bus_space_handle_t)rumpcomp_pci_map(address, size);
+ rv = *handlep ? 0 : EINVAL;
+ }
+
+ return rv;
+}
+
+uint8_t
+bus_space_read_1(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset)
+{
+ uint8_t rv;
+
+ if (bst == 0) {
+ panic("8bit IO space not supported");
+ } else {
+ rv = *(volatile uint8_t *)(bsh + offset);
+ }
+
+ return rv;
+}
+
+uint16_t
+bus_space_read_2(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset)
+{
+ uint16_t rv;
+
+ if (bst == 0) {
+ panic("16bit IO space not supported");
+ } else {
+ rv = *(volatile uint16_t *)(bsh + offset);
+ }
+
+ return rv;
+}
+
+uint32_t
+bus_space_read_4(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset)
+{
+ uint32_t rv;
+
+ if (bst == 0) {
+#if 1
+ panic("IO space not supported in this build");
+#else
+ unsigned short addr = bsh + offset;
+ __asm__ __volatile__("inl %1, %0" : "=a"(rv) : "d"(addr));
+#endif
+ } else {
+ rv = *(volatile uint32_t *)(bsh + offset);
+ }
+
+ return rv;
+}
+
+void
+bus_space_write_1(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint8_t v)
+{
+
+ if (bst == 0) {
+#if 1
+ panic("IO space not supported in this build");
+#endif
+ } else {
+ *(volatile uint8_t *)(bsh + offset) = v;
+ }
+}
+
+void
+bus_space_write_2(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint16_t v)
+{
+
+ if (bst == 0) {
+#if 1
+ panic("IO space not supported in this build");
+#endif
+ } else {
+ *(volatile uint16_t *)(bsh + offset) = v;
+ }
+}
+
+void
+bus_space_write_4(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint32_t v)
+{
+
+ if (bst == 0) {
+#if 1
+ panic("IO space not supported in this build");
+#else
+ unsigned short addr = bsh + offset;
+ __asm__ __volatile__("outl %0, %1" :: "a"(v), "d"(addr));
+#endif
+ } else {
+ *(volatile uint32_t *)(bsh + offset) = v;
+ }
+}
+
+paddr_t
+bus_space_mmap(bus_space_tag_t bst, bus_addr_t addr, off_t off,
+ int prot, int flags)
+{
+
+ panic("%s: unimplemented", __func__);
+}
+
+int
+bus_space_subregion(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, bus_size_t size, bus_space_handle_t *nhandlep)
+{
+
+ panic("%s: unimplemented", __func__);
+}
+
+void
+bus_space_unmap(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t size)
+{
+
+ panic("%s: unimplemented", __func__);
+}
Index: src/sys/rump/dev/lib/libpci/rumpdev_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_pci.c Fri Apr 4 12:53:59 2014
@@ -0,0 +1,139 @@
+/* $NetBSD: rumpdev_pci.c,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
+
+/*
+ * Copyright (c) 2013 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rumpdev_pci.c,v 1.1 2014/04/04 12:53:59 pooka Exp $");
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+
+#include <dev/pci/pcivar.h>
+
+#include "pci_user.h"
+
+void
+pci_attach_hook(device_t parent, device_t self, struct pcibus_attach_args *pba)
+{
+
+ /* nada */
+}
+
+int
+pci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
+{
+
+ return 32;
+}
+
+pcitag_t
+pci_make_tag(pci_chipset_tag_t pc, int bus, int device, int function)
+{
+ pcitag_t pt;
+ int *tag;
+ unsigned csr;
+ int rv;
+
+ CTASSERT(sizeof(pt) >= sizeof(int));
+
+ /* a "bit" ugly, but keeps us MI */
+ tag = (int *)&pt;
+ *tag = (bus << 16) | (device << 8) | (function << 0);
+
+ /*
+ * On Xen, we need to enable the device io/mem space.
+ * Doesn't really belong here, but we need to do it somewhere.
+ */
+ rv = rumpcomp_pci_confread(bus, device, function,
+ PCI_COMMAND_STATUS_REG, &csr);
+ if (rv == 0 && (csr & PCI_COMMAND_MEM_ENABLE) == 0) {
+ rumpcomp_pci_confwrite(bus, device, function,
+ PCI_COMMAND_STATUS_REG, csr | PCI_COMMAND_MEM_ENABLE);
+ }
+
+ return pt;
+}
+
+pcireg_t
+pci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
+{
+ unsigned int rv;
+ int bus, device, fun;
+
+ pci_decompose_tag(pc, tag, &bus, &device, &fun);
+ rumpcomp_pci_confread(bus, device, fun, reg, &rv);
+ return rv;
+}
+
+void
+pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t data)
+{
+ int bus, device, fun;
+
+ pci_decompose_tag(pc, tag, &bus, &device, &fun);
+ rumpcomp_pci_confwrite(bus, device, fun, reg, data);
+}
+
+void
+pci_decompose_tag(pci_chipset_tag_t pc, pcitag_t tag,
+ int *bp, int *dp, int *fp)
+{
+ int *t = (int *)&tag;
+
+ *bp = (*t >> 16) & 0xff;
+ *dp = (*t >> 8) & 0xff;
+ *fp = (*t >> 0) & 0xff;
+}
+
+int
+pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ih)
+{
+
+ *ih = pa->pa_intrline;
+ return 0;
+}
+
+const char *
+pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
+{
+
+ return "pausebreak";
+}
+
+void *
+pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih,
+ int level, int (*func)(void *), void *arg)
+{
+
+ return rumpcomp_pci_irq_establish(ih, func, arg);
+}
+
+void
+pci_intr_disestablish(pci_chipset_tag_t pc, void *ih)
+{
+
+ panic("%s: unimplemented", __func__);
+}
Index: src/sys/rump/dev/lib/libpci/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci/shlib_version:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/shlib_version Fri Apr 4 12:53:59 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libpci/opt/opt_pci.h
diff -u /dev/null src/sys/rump/dev/lib/libpci/opt/opt_pci.h:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/opt/opt_pci.h Fri Apr 4 12:53:59 2014
@@ -0,0 +1 @@
+/* $NetBSD: opt_pci.h,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
