Module Name: src
Committed By: jmcneill
Date: Fri Dec 24 00:24:50 UTC 2021
Modified Files:
src/sys/arch/evbarm/conf: GENERIC64
src/sys/dev/acpi: files.acpi
Added Files:
src/sys/dev/acpi: ohci_acpi.c
Log Message:
Add ohci at acpi bindings. No known PNP IDs for this, so match using _CLS
and the PCI class/subclass/interface codes. Maybe this will take off.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/ohci_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/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.188 src/sys/arch/evbarm/conf/GENERIC64:1.189
--- src/sys/arch/evbarm/conf/GENERIC64:1.188 Sat Nov 27 19:55:20 2021
+++ src/sys/arch/evbarm/conf/GENERIC64 Fri Dec 24 00:24:49 2021
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.188 2021/11/27 19:55:20 ryo Exp $
+# $NetBSD: GENERIC64,v 1.189 2021/12/24 00:24:49 jmcneill Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -515,6 +515,7 @@ ehci* at acpi? # EHCI
motg* at fdt? # Mentor Graphics USB OTG
ohci* at fdt? # OHCI
ohci* at pci? # OHCI
+ohci* at acpi? # OHCI
xhci* at fdt? # XHCI
xhci* at pci? # XHCI
xhci* at acpi? # XHCI
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.120 src/sys/dev/acpi/files.acpi:1.121
--- src/sys/dev/acpi/files.acpi:1.120 Sun Jan 24 18:02:51 2021
+++ src/sys/dev/acpi/files.acpi Fri Dec 24 00:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.120 2021/01/24 18:02:51 jmcneill Exp $
+# $NetBSD: files.acpi,v 1.121 2021/12/24 00:24:49 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
@@ -277,6 +277,10 @@ file dev/acpi/amdccp_acpi.c amdccp_acpi
attach virtio at acpinodebus with virtio_acpi
file dev/acpi/virtio_acpi.c virtio_acpi
+# OHCI-compliant USB controller
+attach ohci at acpinodebus with ohci_acpi
+file dev/acpi/ohci_acpi.c ohci_acpi
+
# EHCI-compliant USB controller
attach ehci at acpinodebus with ehci_acpi
file dev/acpi/ehci_acpi.c ehci_acpi
Added files:
Index: src/sys/dev/acpi/ohci_acpi.c
diff -u /dev/null src/sys/dev/acpi/ohci_acpi.c:1.1
--- /dev/null Fri Dec 24 00:24:50 2021
+++ src/sys/dev/acpi/ohci_acpi.c Fri Dec 24 00:24:49 2021
@@ -0,0 +1,142 @@
+/* $NetBSD: ohci_acpi.c,v 1.1 2021/12/24 00:24:49 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill <jmcne...@invisible.ca>.
+ *
+ * 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: ohci_acpi.c,v 1.1 2021/12/24 00:24:49 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
+#include <dev/usb/usb_mem.h>
+#include <dev/usb/ohcireg.h>
+#include <dev/usb/ohcivar.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpi_intr.h>
+#include <dev/acpi/acpi_usb.h>
+
+#include <dev/pci/pcireg.h>
+
+static int ohci_acpi_match(device_t, cfdata_t, void *);
+static void ohci_acpi_attach(device_t, device_t, void *);
+
+CFATTACH_DECL2_NEW(ohci_acpi, sizeof(struct ohci_softc),
+ ohci_acpi_match, ohci_acpi_attach, NULL,
+ ohci_activate, NULL, ohci_childdet);
+
+static int
+ohci_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_class(aa->aa_node->ad_handle,
+ PCI_CLASS_SERIALBUS,
+ PCI_SUBCLASS_SERIALBUS_USB,
+ PCI_INTERFACE_OHCI);
+}
+
+static void
+ohci_acpi_attach(device_t parent, device_t self, void *aux)
+{
+ struct ohci_softc * const sc = device_private(self);
+ struct acpi_attach_args *aa = aux;
+ struct acpi_resources res;
+ struct acpi_mem *mem;
+ struct acpi_irq *irq;
+ ACPI_STATUS rv;
+ int error;
+ void *ih;
+
+ sc->sc_dev = self;
+ sc->sc_bus.ub_hcpriv = sc;
+ sc->sc_bus.ub_dmatag = aa->aa_dmat;
+ sc->sc_bus.ub_revision = USBREV_1_0;
+
+ rv = acpi_resource_parse(sc->sc_dev, 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_size = mem->ar_length;
+ sc->iot = aa->aa_memt;
+ error = bus_space_map(sc->iot, mem->ar_base, mem->ar_length, 0, &sc->ioh);
+ if (error) {
+ aprint_error_dev(self, "couldn't map registers\n");
+ goto done;
+ }
+
+ /* Disable interrupts */
+ bus_space_write_4(sc->iot, sc->ioh, OHCI_INTERRUPT_DISABLE,
+ OHCI_ALL_INTRS);
+
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
+ IPL_USB, true, ohci_intr, sc, device_xname(self));
+ if (ih == NULL) {
+ aprint_error_dev(self, "couldn't establish interrupt\n");
+ goto done;
+ }
+
+ error = ohci_init(sc);
+ if (error) {
+ aprint_error_dev(self, "init failed, error = %d\n", error);
+ acpi_intr_disestablish(ih);
+ goto done;
+ }
+
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
+
+done:
+ acpi_resource_cleanup(&res);
+}
