Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi Add xhci at acpi glue



details:   https://anonhg.NetBSD.org/src/rev/b34ea8a71c6c
branches:  trunk
changeset: 445388:b34ea8a71c6c
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Oct 26 23:33:38 2018 +0000

description:
Add xhci at acpi glue

diffstat:

 sys/dev/acpi/acpi_usb.c  |   84 +++++++++++++++++++++++++
 sys/dev/acpi/acpi_usb.h  |   37 +++++++++++
 sys/dev/acpi/ehci_acpi.c |   39 +----------
 sys/dev/acpi/files.acpi  |    7 +-
 sys/dev/acpi/xhci_acpi.c |  155 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 286 insertions(+), 36 deletions(-)

diffs (truncated from 380 to 300 lines):

diff -r afddc3cf5799 -r b34ea8a71c6c sys/dev/acpi/acpi_usb.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/acpi_usb.c   Fri Oct 26 23:33:38 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>.
+ *
+ * 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);
+}
diff -r afddc3cf5799 -r b34ea8a71c6c sys/dev/acpi/acpi_usb.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/acpi_usb.h   Fri Oct 26 23:33:38 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>.
+ *
+ * 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 */
diff -r afddc3cf5799 -r b34ea8a71c6c sys/dev/acpi/ehci_acpi.c
--- a/sys/dev/acpi/ehci_acpi.c  Fri Oct 26 22:28:59 2018 +0000
+++ b/sys/dev/acpi/ehci_acpi.c  Fri Oct 26 23:33:38 2018 +0000
@@ -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 @@
 
 #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 @@
 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);
 }
diff -r afddc3cf5799 -r b34ea8a71c6c sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Fri Oct 26 22:28:59 2018 +0000
+++ b/sys/dev/acpi/files.acpi   Fri Oct 26 23:33:38 2018 +0000
@@ -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_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 @@
 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"
diff -r afddc3cf5799 -r b34ea8a71c6c sys/dev/acpi/xhci_acpi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/xhci_acpi.c  Fri Oct 26 23:33:38 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>.
+ *
+ * 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;
+



Home | Main Index | Thread Index | Old Index