Module Name: src
Committed By: jmcneill
Date: Fri Oct 26 23:33:38 UTC 2018
Modified Files:
src/sys/dev/acpi: ehci_acpi.c files.acpi
Added Files:
src/sys/dev/acpi: acpi_usb.c acpi_usb.h xhci_acpi.c
Log Message:
Add xhci at acpi glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/acpi_usb.c \
src/sys/dev/acpi/acpi_usb.h src/sys/dev/acpi/xhci_acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/ehci_acpi.c
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/acpi/files.acpi
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/ehci_acpi.c
diff -u src/sys/dev/acpi/ehci_acpi.c:1.1 src/sys/dev/acpi/ehci_acpi.c:1.2
--- src/sys/dev/acpi/ehci_acpi.c:1.1 Fri Oct 26 10:46:21 2018
+++ src/sys/dev/acpi/ehci_acpi.c Fri Oct 26 23:33:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_acpi.c,v 1.1 2018/10/26 10:46:21 jmcneill Exp $ */
+/* $NetBSD: ehci_acpi.c,v 1.2 2018/10/26 23:33:38 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.1 2018/10/26 10:46:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.2 2018/10/26 23:33:38 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -46,12 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-
-/* Windows-defined USB subsystem device-specific method (_DSM) */
-static UINT8 ehci_acpi_dsm_uuid[ACPI_UUID_LENGTH] = {
- 0x85, 0xe3, 0x2e, 0xce, 0xe6, 0x00, 0xcb, 0x48,
- 0x9f, 0x05, 0x2e, 0xdb, 0x92, 0x7c, 0x48, 0x99
-};
+#include <dev/acpi/acpi_usb.h>
static const char * const compatible[] = {
"PNP0D20", /* EHCI-compliant USB controller without standard debug */
@@ -158,32 +153,6 @@ static void
ehci_acpi_init(struct ehci_softc *sc)
{
struct ehci_acpi_softc * const asc = (struct ehci_acpi_softc *)sc;
- ACPI_OBJECT_LIST objs;
- ACPI_OBJECT obj[4];
- ACPI_HANDLE method;
-
- /*
- * Invoke the _DSM control method for post-reset processing function
- * for dual-role USB controllers. If supported, this will perform any
- * controller-specific initialization required to put the dual-role
- * device into host mode.
- */
-
- objs.Count = 4;
- objs.Pointer = obj;
- obj[0].Type = ACPI_TYPE_BUFFER;
- obj[0].Buffer.Length = ACPI_UUID_LENGTH;
- obj[0].Buffer.Pointer = ehci_acpi_dsm_uuid;
- obj[1].Type = ACPI_TYPE_INTEGER;
- obj[1].Integer.Value = 0; /* Revision ID = 0 */
- obj[2].Type = ACPI_TYPE_INTEGER;
- obj[2].Integer.Value = 1; /* Function index = 1 */
- obj[3].Type = ACPI_TYPE_PACKAGE;
- obj[3].Package.Count = 0; /* Empty package (not used) */
- obj[3].Package.Elements = NULL;
-
- if (ACPI_FAILURE(AcpiGetHandle(asc->sc_handle, "_DSM", &method)))
- return;
- (void)AcpiEvaluateObject(method, NULL, &objs, NULL);
+ acpi_usb_post_reset(asc->sc_handle);
}
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.112 src/sys/dev/acpi/files.acpi:1.113
--- src/sys/dev/acpi/files.acpi:1.112 Fri Oct 26 10:46:21 2018
+++ src/sys/dev/acpi/files.acpi Fri Oct 26 23:33:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.112 2018/10/26 10:46:21 jmcneill Exp $
+# $NetBSD: files.acpi,v 1.113 2018/10/26 23:33:38 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
@@ -32,6 +32,7 @@ file dev/acpi/acpi_resource.c acpi
file dev/acpi/acpi_srat.c acpi
file dev/acpi/acpi_slit.c acpi
file dev/acpi/acpi_timer.c acpi
+file dev/acpi/acpi_usb.c acpi
file dev/acpi/acpi_util.c acpi
file dev/acpi/acpi_wakedev.c acpi
file dev/acpi/acpi_verbose.c acpi & acpiverbose
@@ -259,4 +260,8 @@ file dev/acpi/virtio_acpi.c virtio_acpi
attach ehci at acpinodebus with ehci_acpi
file dev/acpi/ehci_acpi.c ehci_acpi
+# XHCI-compliant USB controller
+attach xhci at acpinodebus with xhci_acpi
+file dev/acpi/xhci_acpi.c xhci_acpi
+
include "dev/acpi/wmi/files.wmi"
Added files:
Index: src/sys/dev/acpi/acpi_usb.c
diff -u /dev/null src/sys/dev/acpi/acpi_usb.c:1.1
--- /dev/null Fri Oct 26 23:33:38 2018
+++ src/sys/dev/acpi/acpi_usb.c Fri Oct 26 23:33:38 2018
@@ -0,0 +1,84 @@
+/* $NetBSD: acpi_usb.c,v 1.1 2018/10/26 23:33: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.
+ */
+
+/*
+ * USB Device-Specific Method (_DSM) support:
+ *
+ * https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/usb-device-specific-method---dsm-
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: acpi_usb.c,v 1.1 2018/10/26 23:33:38 jmcneill Exp $");
+
+#include <sys/param.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpi_usb.h>
+
+/* Windows-defined USB subsystem device-specific method (_DSM) */
+static UINT8 ehci_acpi_dsm_uuid[ACPI_UUID_LENGTH] = {
+ 0x85, 0xe3, 0x2e, 0xce, 0xe6, 0x00, 0xcb, 0x48,
+ 0x9f, 0x05, 0x2e, 0xdb, 0x92, 0x7c, 0x48, 0x99
+};
+
+void
+acpi_usb_post_reset(ACPI_HANDLE handle)
+{
+ ACPI_OBJECT_LIST objs;
+ ACPI_OBJECT obj[4];
+ ACPI_HANDLE method;
+
+ /*
+ * Invoke the _DSM control method for post-reset processing function
+ * for dual-role USB controllers. If supported, this will perform any
+ * controller-specific initialization required to put the dual-role
+ * device into host mode.
+ */
+
+ objs.Count = 4;
+ objs.Pointer = obj;
+ obj[0].Type = ACPI_TYPE_BUFFER;
+ obj[0].Buffer.Length = ACPI_UUID_LENGTH;
+ obj[0].Buffer.Pointer = ehci_acpi_dsm_uuid;
+ obj[1].Type = ACPI_TYPE_INTEGER;
+ obj[1].Integer.Value = 0; /* Revision ID = 0 */
+ obj[2].Type = ACPI_TYPE_INTEGER;
+ obj[2].Integer.Value = 1; /* Function index = 1 */
+ obj[3].Type = ACPI_TYPE_PACKAGE;
+ obj[3].Package.Count = 0; /* Empty package (not used) */
+ obj[3].Package.Elements = NULL;
+
+ if (ACPI_FAILURE(AcpiGetHandle(handle, "_DSM", &method)))
+ return;
+
+ (void)AcpiEvaluateObject(method, NULL, &objs, NULL);
+}
Index: src/sys/dev/acpi/acpi_usb.h
diff -u /dev/null src/sys/dev/acpi/acpi_usb.h:1.1
--- /dev/null Fri Oct 26 23:33:38 2018
+++ src/sys/dev/acpi/acpi_usb.h Fri Oct 26 23:33:38 2018
@@ -0,0 +1,37 @@
+/* $NetBSD: acpi_usb.h,v 1.1 2018/10/26 23:33: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.
+ */
+
+#ifndef _DEV_ACPI_ACPI_USB_H
+#define _DEV_ACPI_ACPI_USB_H
+
+void acpi_usb_post_reset(ACPI_HANDLE);
+
+#endif /* !_DEV_ACPI_ACPI_USB_H */
Index: src/sys/dev/acpi/xhci_acpi.c
diff -u /dev/null src/sys/dev/acpi/xhci_acpi.c:1.1
--- /dev/null Fri Oct 26 23:33:38 2018
+++ src/sys/dev/acpi/xhci_acpi.c Fri Oct 26 23:33:38 2018
@@ -0,0 +1,155 @@
+/* $NetBSD: xhci_acpi.c,v 1.1 2018/10/26 23:33: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: xhci_acpi.c,v 1.1 2018/10/26 23:33:38 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/xhcireg.h>
+#include <dev/usb/xhcivar.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpi_usb.h>
+
+static const char * const compatible[] = {
+ "PNP0D10", /* EHCI-compliant USB controller without standard debug */
+ "PNP0D15", /* EHCI-compliant USB controller with standard debug */
+ NULL
+};
+
+struct xhci_acpi_softc {
+ struct xhci_softc sc_xhci;
+ ACPI_HANDLE sc_handle;
+};
+
+static int xhci_acpi_match(device_t, cfdata_t, void *);
+static void xhci_acpi_attach(device_t, device_t, void *);
+
+static void xhci_acpi_init(struct xhci_softc *);
+
+CFATTACH_DECL2_NEW(xhci_acpi, sizeof(struct xhci_acpi_softc),
+ xhci_acpi_match, xhci_acpi_attach, NULL,
+ xhci_activate, NULL, xhci_childdet);
+
+static int
+xhci_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
+xhci_acpi_attach(device_t parent, device_t self, void *aux)
+{
+ struct xhci_acpi_softc * const asc = device_private(self);
+ struct xhci_softc * const sc = &asc->sc_xhci;
+ 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;
+
+ asc->sc_handle = aa->aa_node->ad_handle;
+
+ sc->sc_dev = self;
+ sc->sc_bus.ub_hcpriv = sc;
+ sc->sc_bus.ub_dmatag = aa->aa_dmat;
+ sc->sc_bus.ub_revision = USBREV_3_0;
+ sc->sc_quirks = 0;
+ sc->sc_vendor_init = xhci_acpi_init;
+
+ rv = acpi_resource_parse(sc->sc_dev, asc->sc_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 (mem == NULL) {
+ aprint_error_dev(self, "couldn't find irq resource\n");
+ goto done;
+ }
+
+ sc->sc_ios = mem->ar_length;
+ sc->sc_iot = aa->aa_memt;
+ error = bus_space_map(sc->sc_iot, mem->ar_base, mem->ar_length, 0, &sc->sc_ioh);
+ if (error) {
+ aprint_error_dev(self, "couldn't map registers\n");
+ return;
+ }
+
+ const int type = (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL;
+ ih = intr_establish(irq->ar_irq, IPL_USB, type, xhci_intr, sc);
+ if (ih == NULL) {
+ aprint_error_dev(self, "couldn't establish interrupt\n");
+ return;
+ }
+
+ error = xhci_init(sc);
+ if (error) {
+ aprint_error_dev(self, "init failed, error = %d\n", error);
+ return;
+ }
+
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+ sc->sc_child2 = config_found(self, &sc->sc_bus2, usbctlprint);
+
+done:
+ acpi_resource_cleanup(&res);
+}
+
+static void
+xhci_acpi_init(struct xhci_softc *sc)
+{
+ struct xhci_acpi_softc * const asc = (struct xhci_acpi_softc *)sc;
+
+ acpi_usb_post_reset(asc->sc_handle);
+}
