The only difference between armv7 and arm64 fdt virtio attachments is an

uneeded include.  Remove the include and move to MI fdt directory.

5 files changed, 6 insertions, 465 deletions

diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64
index 69da0c54771..a939d877ef6 100644
--- a/sys/arch/arm64/conf/files.arm64
+++ b/sys/arch/arm64/conf/files.arm64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.arm64,v 1.7 2017/01/23 13:58:11 patrick Exp $
+# $OpenBSD: files.arm64,v 1.8 2017/01/26 01:46:19 jsg Exp $
 
 maxpartitions	16
 maxusers	2 8 64
@@ -130,6 +130,3 @@ file	arch/arm64/dev/bcm2836_intr.c		bcmintc
 include	"dev/usb/dwc2/files.dwc2"
 attach	dwctwo at fdt with bcmdwctwo
 file	arch/arm64/dev/bcm2835_dwctwo.c		bcmdwctwo	needs-flag
-
-attach	virtio at fdt with virtio_mmio
-file	arch/arm64/dev/virtio_mmio.c		virtio_mmio
diff --git a/sys/arch/armv7/vexpress/files.vexpress b/sys/arch/armv7/vexpress/files.vexpress
index fe96a02f7cf..c7ccff69af5 100644
--- a/sys/arch/armv7/vexpress/files.vexpress
+++ b/sys/arch/armv7/vexpress/files.vexpress
@@ -1,7 +1,4 @@
-#	$OpenBSD: files.vexpress,v 1.9 2016/10/09 01:40:43 jsg Exp $
-
-attach	virtio at fdt with virtio_mmio
-file	arch/armv7/vexpress/virtio_mmio.c	virtio_mmio
+#	$OpenBSD: files.vexpress,v 1.10 2017/01/26 01:46:19 jsg Exp $
 
 device sysreg
 attach sysreg at fdt
diff --git a/sys/arch/armv7/vexpress/virtio_mmio.c b/sys/arch/armv7/vexpress/virtio_mmio.c
deleted file mode 100644
index 42371110c12..00000000000
--- a/sys/arch/armv7/vexpress/virtio_mmio.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/*	$OpenBSD: virtio_mmio.c,v 1.6 2017/01/21 11:29:52 reyk Exp $	*/
-/*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
-
-/*
- * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
- * Copyright (c) 2012 Stefan Fritsch.
- * Copyright (c) 2010 Minoura Makoto.
- * 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 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/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-#include <sys/mutex.h>
-
-#include <dev/pv/virtioreg.h>
-#include <dev/pv/virtiovar.h>
-
-#include <machine/fdt.h>
-#include <armv7/armv7/armv7var.h>
-
-#include <dev/ofw/fdt.h>
-#include <dev/ofw/openfirm.h>
-
-#define VIRTIO_MMIO_MAGIC		('v' | 'i' << 8 | 'r' << 16 | 't' << 24)
-
-#define VIRTIO_MMIO_MAGIC_VALUE		0x000
-#define VIRTIO_MMIO_VERSION		0x004
-#define VIRTIO_MMIO_DEVICE_ID		0x008
-#define VIRTIO_MMIO_VENDOR_ID		0x00c
-#define VIRTIO_MMIO_HOST_FEATURES	0x010
-#define VIRTIO_MMIO_HOST_FEATURES_SEL	0x014
-#define VIRTIO_MMIO_GUEST_FEATURES	0x020
-#define VIRTIO_MMIO_GUEST_FEATURES_SEL	0x024
-#define VIRTIO_MMIO_GUEST_PAGE_SIZE	0x028
-#define VIRTIO_MMIO_QUEUE_SEL		0x030
-#define VIRTIO_MMIO_QUEUE_NUM_MAX	0x034
-#define VIRTIO_MMIO_QUEUE_NUM		0x038
-#define VIRTIO_MMIO_QUEUE_ALIGN		0x03c
-#define VIRTIO_MMIO_QUEUE_PFN		0x040
-#define VIRTIO_MMIO_QUEUE_NOTIFY	0x050
-#define VIRTIO_MMIO_INTERRUPT_STATUS	0x060
-#define VIRTIO_MMIO_INTERRUPT_ACK	0x064
-#define VIRTIO_MMIO_STATUS		0x070
-#define VIRTIO_MMIO_CONFIG		0x100
-
-#define VIRTIO_MMIO_INT_VRING		(1 << 0)
-#define VIRTIO_MMIO_INT_CONFIG		(1 << 1)
-
-#define DEVNAME(sc) (sc)->sc_dev.dv_xname
-
-/*
- * XXX: Before being used on big endian arches, the access to config registers
- * XXX: needs to be reviewed/fixed. The non-device specific registers are
- * XXX: PCI-endian while the device specific registers are native endian.
- */
-
-#define virtio_set_status(sc, s) virtio_mmio_set_status(sc, s)
-#define virtio_device_reset(sc) virtio_set_status((sc), 0)
-
-int		virtio_mmio_match(struct device *, void *, void *);
-void		virtio_mmio_attach(struct device *, struct device *, void *);
-int		virtio_mmio_detach(struct device *, int);
-
-void		virtio_mmio_kick(struct virtio_softc *, uint16_t);
-uint8_t		virtio_mmio_read_device_config_1(struct virtio_softc *, int);
-uint16_t	virtio_mmio_read_device_config_2(struct virtio_softc *, int);
-uint32_t	virtio_mmio_read_device_config_4(struct virtio_softc *, int);
-uint64_t	virtio_mmio_read_device_config_8(struct virtio_softc *, int);
-void		virtio_mmio_write_device_config_1(struct virtio_softc *, int, uint8_t);
-void		virtio_mmio_write_device_config_2(struct virtio_softc *, int, uint16_t);
-void		virtio_mmio_write_device_config_4(struct virtio_softc *, int, uint32_t);
-void		virtio_mmio_write_device_config_8(struct virtio_softc *, int, uint64_t);
-uint16_t	virtio_mmio_read_queue_size(struct virtio_softc *, uint16_t);
-void		virtio_mmio_setup_queue(struct virtio_softc *, uint16_t, uint32_t);
-void		virtio_mmio_set_status(struct virtio_softc *, int);
-uint32_t	virtio_mmio_negotiate_features(struct virtio_softc *, uint32_t,
-					      const struct virtio_feature_name *);
-int		virtio_mmio_intr(void *);
-
-struct virtio_mmio_softc {
-	struct virtio_softc	sc_sc;
-
-	bus_space_tag_t		sc_iot;
-	bus_space_handle_t	sc_ioh;
-	bus_size_t		sc_iosize;
-	bus_dma_tag_t		sc_dmat;
-
-	void			*sc_ih;
-
-	int			sc_config_offset;
-};
-
-struct cfattach virtio_mmio_ca = {
-	sizeof(struct virtio_mmio_softc),
-	virtio_mmio_match,
-	virtio_mmio_attach,
-	virtio_mmio_detach,
-	NULL
-};
-
-struct cfattach virtio_mmio_fdt_ca = {
-	sizeof(struct virtio_mmio_softc),
-	NULL,
-	virtio_mmio_attach,
-	virtio_mmio_detach,
-	NULL
-};
-
-struct virtio_ops virtio_mmio_ops = {
-	virtio_mmio_kick,
-	virtio_mmio_read_device_config_1,
-	virtio_mmio_read_device_config_2,
-	virtio_mmio_read_device_config_4,
-	virtio_mmio_read_device_config_8,
-	virtio_mmio_write_device_config_1,
-	virtio_mmio_write_device_config_2,
-	virtio_mmio_write_device_config_4,
-	virtio_mmio_write_device_config_8,
-	virtio_mmio_read_queue_size,
-	virtio_mmio_setup_queue,
-	virtio_mmio_set_status,
-	virtio_mmio_negotiate_features,
-	virtio_mmio_intr,
-};
-
-uint16_t
-virtio_mmio_read_queue_size(struct virtio_softc *vsc, uint16_t idx)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_SEL, idx);
-	return bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-	    VIRTIO_MMIO_QUEUE_NUM_MAX);
-}
-
-void
-virtio_mmio_setup_queue(struct virtio_softc *vsc, uint16_t idx, uint32_t addr)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_SEL, idx);
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_NUM,
-	    bus_space_read_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_NUM_MAX));
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_ALIGN,
-	    PAGE_SIZE);
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_PFN, addr);
-}
-
-void
-virtio_mmio_set_status(struct virtio_softc *vsc, int status)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	int old = 0;
-
-	if (status != 0)
-		old = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-				       VIRTIO_MMIO_STATUS);
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_STATUS,
-			  status|old);
-}
-
-int
-virtio_mmio_match(struct device *parent, void *cfdata, void *aux)
-{
-	struct fdt_attach_args *faa = aux;
-
-	return OF_is_compatible(faa->fa_node, "virtio,mmio");
-}
-
-void
-virtio_mmio_attach(struct device *parent, struct device *self, void *aux)
-{
-	struct fdt_attach_args *faa = aux;
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)self;
-	struct virtio_softc *vsc = &sc->sc_sc;
-	uint32_t id, magic, version;
-
-	if (faa->fa_nreg < 1) {
-		printf(": no register data\n");
-		return;
-	}
-
-	sc->sc_iosize = faa->fa_reg[0].size;
-	sc->sc_iot = faa->fa_iot;
-	sc->sc_dmat = faa->fa_dmat;
-	if (bus_space_map(sc->sc_iot, faa->fa_reg[0].addr, faa->fa_reg[0].size,
-	    0, &sc->sc_ioh))
-		panic("%s: bus_space_map failed!", __func__);
-
-	magic = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-	    VIRTIO_MMIO_MAGIC_VALUE);
-	if (magic != VIRTIO_MMIO_MAGIC) {
-		printf(": wrong magic value 0x%08x; giving up\n", magic);
-		return;
-	}
-
-	version = bus_space_read_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_VERSION);
-	if (version != 1) {
-		printf(": unknown version 0x%02x; giving up\n", version);
-		return;
-	}
-
-	id = bus_space_read_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_DEVICE_ID);
-	printf(": Virtio %s Device", virtio_device_string(id));
-
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_GUEST_PAGE_SIZE,
-	    PAGE_SIZE);
-
-	printf("\n");
-
-	/* No device connected. */
-	if (id == 0)
-		return;
-
-	vsc->sc_ops = &virtio_mmio_ops;
-	vsc->sc_dmat = sc->sc_dmat;
-	sc->sc_config_offset = VIRTIO_MMIO_CONFIG;
-
-	virtio_device_reset(vsc);
-	virtio_mmio_set_status(vsc, VIRTIO_CONFIG_DEVICE_STATUS_ACK);
-	virtio_mmio_set_status(vsc, VIRTIO_CONFIG_DEVICE_STATUS_DRIVER);
-
-	/* XXX: use softc as aux... */
-	vsc->sc_childdevid = id;
-	vsc->sc_child = NULL;
-	config_found(self, sc, NULL);
-	if (vsc->sc_child == NULL) {
-		printf("%s: no matching child driver; not configured\n",
-		    vsc->sc_dev.dv_xname);
-		goto fail_1;
-	}
-	if (vsc->sc_child == VIRTIO_CHILD_ERROR) {
-		printf("%s: virtio configuration failed\n",
-		    vsc->sc_dev.dv_xname);
-		goto fail_1;
-	}
-
-	sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, vsc->sc_ipl,
-	    virtio_mmio_intr, sc, vsc->sc_dev.dv_xname);
-	if (sc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt\n",
-		    vsc->sc_dev.dv_xname);
-		goto fail_2;
-	}
-
-	virtio_set_status(vsc, VIRTIO_CONFIG_DEVICE_STATUS_DRIVER_OK);
-	return;
-
-fail_2:
-	config_detach(vsc->sc_child, 0);
-fail_1:
-	/* no mmio_mapreg_unmap() or mmio_intr_unmap() */
-	virtio_set_status(vsc, VIRTIO_CONFIG_DEVICE_STATUS_FAILED);
-}
-
-int
-virtio_mmio_detach(struct device *self, int flags)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)self;
-	struct virtio_softc *vsc = &sc->sc_sc;
-	int r;
-
-	if (vsc->sc_child != 0 && vsc->sc_child != VIRTIO_CHILD_ERROR) {
-		r = config_detach(vsc->sc_child, flags);
-		if (r)
-			return r;
-	}
-	KASSERT(vsc->sc_child == 0 || vsc->sc_child == VIRTIO_CHILD_ERROR);
-	KASSERT(vsc->sc_vqs == 0);
-	arm_intr_disestablish(sc->sc_ih);
-	sc->sc_ih = 0;
-	if (sc->sc_iosize)
-		bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
-	sc->sc_iosize = 0;
-
-	return 0;
-}
-
-/*
- * Feature negotiation.
- * Prints available / negotiated features if guest_feature_names != NULL and
- * VIRTIO_DEBUG is 1
- */
-uint32_t
-virtio_mmio_negotiate_features(struct virtio_softc *vsc, uint32_t guest_features,
-			  const struct virtio_feature_name *guest_feature_names)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	uint32_t host, neg;
-
-	/*
-	 * indirect descriptors can be switched off by setting bit 1 in the
-	 * driver flags, see config(8)
-	 */
-	if (!(vsc->sc_dev.dv_cfdata->cf_flags & 1) &&
-	    !(vsc->sc_child->dv_cfdata->cf_flags & 1)) {
-		guest_features |= VIRTIO_F_RING_INDIRECT_DESC;
-	} else {
-		printf("RingIndirectDesc disabled by UKC\n");
-	}
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-	    VIRTIO_MMIO_HOST_FEATURES_SEL, 0);
-	host = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-				VIRTIO_MMIO_HOST_FEATURES);
-	neg = host & guest_features;
-#if VIRTIO_DEBUG
-	if (guest_feature_names)
-		virtio_log_features(host, neg, guest_feature_names);
-#endif
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-	    VIRTIO_MMIO_GUEST_FEATURES_SEL, 0);
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-			  VIRTIO_MMIO_GUEST_FEATURES, neg);
-	vsc->sc_features = neg;
-	if (neg & VIRTIO_F_RING_INDIRECT_DESC)
-		vsc->sc_indirect = 1;
-	else
-		vsc->sc_indirect = 0;
-
-	return neg;
-}
-
-/*
- * Device configuration registers.
- */
-uint8_t
-virtio_mmio_read_device_config_1(struct virtio_softc *vsc, int index)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	return bus_space_read_1(sc->sc_iot, sc->sc_ioh,
-				sc->sc_config_offset + index);
-}
-
-uint16_t
-virtio_mmio_read_device_config_2(struct virtio_softc *vsc, int index)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	return bus_space_read_2(sc->sc_iot, sc->sc_ioh,
-				sc->sc_config_offset + index);
-}
-
-uint32_t
-virtio_mmio_read_device_config_4(struct virtio_softc *vsc, int index)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	return bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-				sc->sc_config_offset + index);
-}
-
-uint64_t
-virtio_mmio_read_device_config_8(struct virtio_softc *vsc, int index)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	uint64_t r;
-
-	r = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-			     sc->sc_config_offset + index + sizeof(uint32_t));
-	r <<= 32;
-	r += bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-			      sc->sc_config_offset + index);
-	return r;
-}
-
-void
-virtio_mmio_write_device_config_1(struct virtio_softc *vsc,
-			     int index, uint8_t value)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh,
-			  sc->sc_config_offset + index, value);
-}
-
-void
-virtio_mmio_write_device_config_2(struct virtio_softc *vsc,
-			     int index, uint16_t value)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_2(sc->sc_iot, sc->sc_ioh,
-			  sc->sc_config_offset + index, value);
-}
-
-void
-virtio_mmio_write_device_config_4(struct virtio_softc *vsc,
-			     int index, uint32_t value)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-			  sc->sc_config_offset + index, value);
-}
-
-void
-virtio_mmio_write_device_config_8(struct virtio_softc *vsc,
-			     int index, uint64_t value)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-			  sc->sc_config_offset + index,
-			  value & 0xffffffff);
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-			  sc->sc_config_offset + index + sizeof(uint32_t),
-			  value >> 32);
-}
-
-/*
- * Interrupt handler.
- */
-int
-virtio_mmio_intr(void *arg)
-{
-	struct virtio_mmio_softc *sc = arg;
-	struct virtio_softc *vsc = &sc->sc_sc;
-	int isr, r = 0;
-
-	/* check and ack the interrupt */
-	isr = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-			       VIRTIO_MMIO_INTERRUPT_STATUS);
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
-			  VIRTIO_MMIO_INTERRUPT_ACK, isr);
-	if ((isr & VIRTIO_MMIO_INT_CONFIG) &&
-	    (vsc->sc_config_change != NULL))
-		r = (vsc->sc_config_change)(vsc);
-	if ((isr & VIRTIO_MMIO_INT_VRING))
-		r |= virtio_check_vqs(vsc);
-
-	return r;
-}
-
-void
-virtio_mmio_kick(struct virtio_softc *vsc, uint16_t idx)
-{
-	struct virtio_mmio_softc *sc = (struct virtio_mmio_softc *)vsc;
-	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_QUEUE_NOTIFY,
-	    idx);
-}
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 9b229ee282e..6cff53c7d06 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.fdt,v 1.4 2017/01/25 10:14:40 jsg Exp $
+#	$OpenBSD: files.fdt,v 1.5 2017/01/26 01:46:19 jsg Exp $
 #
 # Config file and device description for machine-independent FDT code.
 # Included by ports that need it.
@@ -40,3 +40,5 @@ device	psci
 attach	psci at fdt
 file	dev/fdt/psci.c			psci
 
+attach	virtio at fdt with virtio_mmio
+file	dev/fdt/virtio_mmio.c		virtio_mmio
diff --git a/sys/arch/arm64/dev/virtio_mmio.c b/sys/dev/fdt/virtio_mmio.c
index b191399ebb3..cf00276dd0f 100644
--- a/sys/arch/arm64/dev/virtio_mmio.c
+++ b/sys/dev/fdt/virtio_mmio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio_mmio.c,v 1.2 2017/01/21 11:29:52 reyk Exp $	*/
+/*	$OpenBSD: virtio_mmio.c,v 1.1 2017/01/26 01:46:19 jsg Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -38,7 +38,6 @@
 #include <dev/pv/virtiovar.h>
 
 #include <machine/fdt.h>
-#include <arm64/arm64/arm64var.h>
 
 #include <dev/ofw/fdt.h>
 #include <dev/ofw/openfirm.h>