Module Name: src
Committed By: jmcneill
Date: Sun Oct 21 12:26:38 UTC 2018
Modified Files:
src/sys/dev/acpi: files.acpi
Added Files:
src/sys/dev/acpi: virtio_acpi.c
Log Message:
Add ACPI attach glue for virtio_mmio.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/virtio_acpi.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/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.108 src/sys/dev/acpi/files.acpi:1.109
--- src/sys/dev/acpi/files.acpi:1.108 Fri Oct 19 21:09:10 2018
+++ src/sys/dev/acpi/files.acpi Sun Oct 21 12:26:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.108 2018/10/19 21:09:10 jakllsch Exp $
+# $NetBSD: files.acpi,v 1.109 2018/10/21 12:26:38 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
@@ -245,4 +245,8 @@ file dev/acpi/dwiic_acpi.c dwiic_acpi
attach amdccp at acpinodebus with amdccp_acpi
file dev/acpi/amdccp_acpi.c amdccp_acpi
+# QEMU Virtio
+attach virtio at acpinodebus with virtio_acpi
+file dev/acpi/virtio_acpi.c virtio_acpi
+
include "dev/acpi/wmi/files.wmi"
Added files:
Index: src/sys/dev/acpi/virtio_acpi.c
diff -u /dev/null src/sys/dev/acpi/virtio_acpi.c:1.1
--- /dev/null Sun Oct 21 12:26:38 2018
+++ src/sys/dev/acpi/virtio_acpi.c Sun Oct 21 12:26:38 2018
@@ -0,0 +1,185 @@
+/* $NetBSD: virtio_acpi.c,v 1.1 2018/10/21 12:26:38 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill <[email protected]>.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.1 2018/10/21 12:26:38 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#define VIRTIO_PRIVATE
+#include <dev/virtio/virtio_mmiovar.h>
+
+struct virtio_acpi_softc {
+ struct virtio_mmio_softc sc_msc;
+ int sc_irq;
+ int sc_irqtype;
+};
+
+static int virtio_acpi_match(device_t, cfdata_t, void *);
+static void virtio_acpi_attach(device_t, device_t, void *);
+static int virtio_acpi_rescan(device_t, const char *, const int *);
+static int virtio_acpi_detach(device_t, int);
+
+static int virtio_acpi_setup_interrupts(struct virtio_mmio_softc *);
+static void virtio_acpi_free_interrupts(struct virtio_mmio_softc *);
+
+CFATTACH_DECL3_NEW(virtio_acpi, sizeof(struct virtio_acpi_softc),
+ virtio_acpi_match, virtio_acpi_attach, virtio_acpi_detach, NULL,
+ virtio_acpi_rescan, (void *)voidop, DVF_DETACH_SHUTDOWN);
+
+static const char * const compatible[] = {
+ "LNRO0005",
+ NULL
+};
+
+static int
+virtio_acpi_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct acpi_attach_args *aa = aux;
+
+ if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+ return 0;
+
+ return acpi_match_hid(aa->aa_node->ad_devinfo, compatible);
+}
+
+static void
+virtio_acpi_attach(device_t parent, device_t self, void *aux)
+{
+ struct virtio_acpi_softc * const sc = device_private(self);
+ struct virtio_mmio_softc * const msc = &sc->sc_msc;
+ struct virtio_softc * const vsc = &msc->sc_sc;
+ struct acpi_attach_args *aa = aux;
+ struct acpi_resources res;
+ struct acpi_mem *mem;
+ struct acpi_irq *irq;
+ ACPI_STATUS rv;
+ int error;
+
+ msc->sc_iot = aa->aa_memt;
+ vsc->sc_dev = self;
+ vsc->sc_dmat = aa->aa_dmat;
+
+ rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
+ &res, &acpi_resource_parse_ops_default);
+ if (ACPI_FAILURE(rv))
+ return;
+
+ mem = acpi_res_mem(&res, 0);
+ if (mem == NULL) {
+ aprint_error_dev(self, "couldn't find mem resource\n");
+ goto done;
+ }
+
+ irq = acpi_res_irq(&res, 0);
+ if (irq == NULL) {
+ aprint_error_dev(self, "couldn't find irq resource\n");
+ goto done;
+ }
+ sc->sc_irq = irq->ar_irq;
+ sc->sc_irqtype = (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL;
+
+ error = bus_space_map(msc->sc_iot, mem->ar_base, mem->ar_length, 0, &msc->sc_ioh);
+ if (error) {
+ aprint_error_dev(self, "couldn't map registers\n");
+ return;
+ }
+ msc->sc_iosize = mem->ar_length;
+
+ msc->sc_setup_interrupts = virtio_acpi_setup_interrupts;
+ msc->sc_free_interrupts = virtio_acpi_free_interrupts;
+
+ virtio_mmio_common_attach(msc);
+ virtio_acpi_rescan(self, "virtio", NULL);
+
+done:
+ acpi_resource_cleanup(&res);
+}
+
+static int
+virtio_acpi_detach(device_t self, int flags)
+{
+ struct virtio_acpi_softc * const sc = device_private(self);
+ struct virtio_mmio_softc * const msc = &sc->sc_msc;
+
+ return virtio_mmio_common_detach(msc, flags);
+}
+
+static int
+virtio_acpi_rescan(device_t self, const char *ifattr, const int *locs)
+{
+ struct virtio_acpi_softc * const sc = device_private(self);
+ struct virtio_mmio_softc * const msc = &sc->sc_msc;
+ struct virtio_softc * const vsc = &msc->sc_sc;
+ struct virtio_attach_args va;
+
+ if (vsc->sc_child)
+ return 0;
+
+ memset(&va, 0, sizeof(va));
+ va.sc_childdevid = vsc->sc_childdevid;
+
+ config_found_ia(self, ifattr, &va, virtiobusprint);
+
+ return 0;
+}
+
+static int
+virtio_acpi_setup_interrupts(struct virtio_mmio_softc *msc)
+{
+ struct virtio_acpi_softc * const sc = (struct virtio_acpi_softc *)msc;
+ struct virtio_softc * const vsc = &msc->sc_sc;
+
+ msc->sc_ih = intr_establish(sc->sc_irq, IPL_VM, sc->sc_irqtype, virtio_mmio_intr, msc);
+ if (msc->sc_ih == NULL) {
+ aprint_error_dev(vsc->sc_dev, "couldn't install interrupt handler\n");
+ return -1;
+ }
+
+ aprint_normal_dev(vsc->sc_dev, "interrupting on irq %d\n", sc->sc_irq);
+
+ return 0;
+}
+
+static void
+virtio_acpi_free_interrupts(struct virtio_mmio_softc *msc)
+{
+ if (msc->sc_ih != NULL) {
+ intr_disestablish(msc->sc_ih);
+ msc->sc_ih = NULL;
+ }
+}
