Module Name: src
Committed By: jakllsch
Date: Fri Jun 15 17:13:43 UTC 2018
Modified Files:
src/sys/dev/fdt: virtio_mmio_fdt.c
src/sys/dev/pci: virtio.c virtiovar.h
src/sys/dev/virtio: virtio_mmio.c
Log Message:
Add cfprint_t virtiobusprint() and use it for virtio_mmio.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/virtio_mmio_fdt.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/virtiovar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/virtio/virtio_mmio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/virtio_mmio_fdt.c
diff -u src/sys/dev/fdt/virtio_mmio_fdt.c:1.1 src/sys/dev/fdt/virtio_mmio_fdt.c:1.2
--- src/sys/dev/fdt/virtio_mmio_fdt.c:1.1 Wed Jun 6 20:35:36 2018
+++ src/sys/dev/fdt/virtio_mmio_fdt.c Fri Jun 15 17:13:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.1 2018/06/06 20:35:36 jakllsch Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.2 2018/06/15 17:13:43 jakllsch Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.1 2018/06/06 20:35:36 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.2 2018/06/15 17:13:43 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,11 +122,9 @@ virtio_mmio_fdt_rescan(device_t self, co
memset(&va, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found_ia(self, attr, &va, NULL);
+ config_found_ia(self, attr, &va, virtiobusprint);
if (vsc->sc_child == NULL) {
- aprint_error_dev(self,
- "no matching child driver; not configured\n");
return 0;
}
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.34 src/sys/dev/pci/virtio.c:1.35
--- src/sys/dev/pci/virtio.c:1.34 Fri Jun 15 01:37:40 2018
+++ src/sys/dev/pci/virtio.c Fri Jun 15 17:13:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.34 2018/06/15 01:37:40 jakllsch Exp $ */
+/* $NetBSD: virtio.c,v 1.35 2018/06/15 17:13:43 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.34 2018/06/15 01:37:40 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.35 2018/06/15 17:13:43 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -928,6 +928,17 @@ virtio_features(struct virtio_softc *sc)
return sc->sc_features;
}
+int
+virtiobusprint(void *aux, const char *pnp)
+{
+ struct virtio_attach_args * const va = aux;
+
+ if (pnp)
+ aprint_normal("Device ID %d at %s", va->sc_childdevid, pnp);
+
+ return UNCONF;
+}
+
MODULE(MODULE_CLASS_DRIVER, virtio, NULL);
#ifdef _MODULE
Index: src/sys/dev/pci/virtiovar.h
diff -u src/sys/dev/pci/virtiovar.h:1.11 src/sys/dev/pci/virtiovar.h:1.12
--- src/sys/dev/pci/virtiovar.h:1.11 Sat Jun 2 22:43:15 2018
+++ src/sys/dev/pci/virtiovar.h Fri Jun 15 17:13:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtiovar.h,v 1.11 2018/06/02 22:43:15 jakllsch Exp $ */
+/* $NetBSD: virtiovar.h,v 1.12 2018/06/15 17:13:43 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -224,6 +224,7 @@ uint32_t virtio_features(struct virtio_s
/* autoconf(9) common */
void virtio_set_status(struct virtio_softc *, int);
+int virtiobusprint(void *aux, const char *);
#define virtio_device_reset(sc) virtio_set_status((sc), 0)
Index: src/sys/dev/virtio/virtio_mmio.c
diff -u src/sys/dev/virtio/virtio_mmio.c:1.1 src/sys/dev/virtio/virtio_mmio.c:1.2
--- src/sys/dev/virtio/virtio_mmio.c:1.1 Wed Jun 6 20:35:36 2018
+++ src/sys/dev/virtio/virtio_mmio.c Fri Jun 15 17:13:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio.c,v 1.1 2018/06/06 20:35:36 jakllsch Exp $ */
+/* $NetBSD: virtio_mmio.c,v 1.2 2018/06/15 17:13:43 jakllsch Exp $ */
/* $OpenBSD: virtio_mmio.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */
/*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.1 2018/06/06 20:35:36 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.2 2018/06/15 17:13:43 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,6 @@ virtio_mmio_common_attach(struct virtio_
}
id = bus_space_read_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_DEVICE_ID);
- aprint_verbose_dev(vsc->sc_dev, "Virtio ID 0x%08x\n", id);
/* we could use PAGE_SIZE, but virtio(4) assumes 4KiB for now */
bus_space_write_4(sc->sc_iot, sc->sc_ioh, VIRTIO_MMIO_GUEST_PAGE_SIZE,
