From nobody Mon Jan 23 12:37:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0qPl69bmz3bT1n; Mon, 23 Jan 2023 12:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0qPl5YBWz3CdZ; Mon, 23 Jan 2023 12:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AhxYdR+56qKGnJvl8luUxIAantL3QLBVudDcHgUnFhU=; b=agUBf4LDpu4ADLkwBJvK3ctgkCYSgvSKKDqz2h2ic0yHUdvoCV+W6YU0i/cYbtAuTJD8J7 nACkewpKQN/D2NKuwDuqmsYgO3SRrBn/irEzEPG2t8ugRg8YR4d7Gc1S9lG9yN+kJ+qNZP O1Qn2vJRdO98btbC4NW8RE/Yrauvim7lv0CyX696/V5eobvqPEKBKtpCV5dJCZcTxgOtwt ajSCyDf5ViDUq2K/yLqzyaHcbjfaN60//PVEERLK6bj3bu2WJVVDiN5dbmcvgwOE21jZaQ KpxsoJHewsomEHqEK5Vf0QAix418h0ueYFAu0l0CSeVTg4lHNWTTkFOi3OYJOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AhxYdR+56qKGnJvl8luUxIAantL3QLBVudDcHgUnFhU=; b=oledyKwSQHZ4zchamjZ7aXTOJhzGBgO65P5nRiY5qJeUD3P7H80zKNg2fWhxAzCE3/Cvra 9d9gY3Oof7pdXo31f2cx56QykKxWpO4bQaphAKxba7a43Ja1pSjmr2BlknpXbLn5cF6EOj VVrJLGHZf0IIcSfnSD6LasWnnrhNzuVJLUiSAqqBbfmjQUhoX4Mfo4hrlMONM2pqaz9oFg voqSIbEHqLrotFbq5pRWvKJ17KNEv7uihr+iKWDLlCvI0CcF3X0WC1TKvlo/NP699MY6ih ktgpfxp+CWjRw5NJpaORnrDIPtvqxVyw5yCWHuAyo5pWNNpGxYEFg3O2RN65Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477467; a=rsa-sha256; cv=none; b=X/3GUAAhJoA5qW8mxiHNd0Sqh0TIWbioyeQaYZSULL4EEghtJb3KbF4x3d2yGolvvaHViO JVYpb/yZ7SF+WkBZDzj05PY5rjPYDUc+fO09AlAJQghg9XRljEllmhxKpqQd5uNpfYD9on Ce51Z9hd2C9LKbMMYnr2N6WqqoONp2rZUfbMt1iSzflxoV9A1etdhWCFiN6o/XBZIdRswb NzDSiUdVtP5cE3JaPTWhlS3m6bjepidvf+T0n9G82/4E0iGyp118AwBRIUiBC3LSenwq7f 40+zg2kjqyXOZM3Jzm7OrSxlJx22jpHKwMtRXea6LgiFQ5tFQTKoEnorsX57MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0qPl4fxVzVMJ; Mon, 23 Jan 2023 12:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NCblfm085577; Mon, 23 Jan 2023 12:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCblLF085576; Mon, 23 Jan 2023 12:37:47 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:47 GMT Message-Id: <202301231237.30NCblLF085576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 52583b734d7f - stable/13 - Check for more XHCI ACPI IDs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 52583b734d7fcb7f98024bed0f3ed2d6bedd6277 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=52583b734d7fcb7f98024bed0f3ed2d6bedd6277 commit 52583b734d7fcb7f98024bed0f3ed2d6bedd6277 Author: Andrew Turner AuthorDate: 2023-01-04 12:33:08 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:28 +0000 Check for more XHCI ACPI IDs The Windows Dev Kit 2023 uses the XHCI-compliant USB controller without standard debug ID in its ACPI tables. Check for both ID values found on [1] in the XHCI ACPI attachment. [1] https://learn.microsoft.com/en-us/windows-hardware/drivers/bringup/device-management-namespace-objects Tested by: Robert Clausecker Sponsored by: Arm Ltd (cherry picked from commit 8793196ca28f7b78f04ca479fe60b7d7af6b20e1) --- sys/dev/usb/controller/generic_xhci_acpi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c b/sys/dev/usb/controller/generic_xhci_acpi.c index 80ad8ca4e8a4..aa96c3f40fee 100644 --- a/sys/dev/usb/controller/generic_xhci_acpi.c +++ b/sys/dev/usb/controller/generic_xhci_acpi.c @@ -53,13 +53,16 @@ __FBSDID("$FreeBSD$"); #include "generic_xhci.h" +static char *xhci_ids[] = { + "PNP0D10", + "PNP0D15", + NULL, +}; + static int generic_xhci_acpi_probe(device_t dev) { - ACPI_HANDLE h; - - if ((h = acpi_get_handle(dev)) == NULL || - acpi_MatchHid(h, "PNP0D10") == ACPI_MATCHHID_NOMATCH) + if (ACPI_ID_PROBE(device_get_parent(dev), dev, xhci_ids, NULL) >= 0) return (ENXIO); device_set_desc(dev, XHCI_HC_DEVSTR);