From nobody Wed Jan  4 17:04:15 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 4NnGCz2L7fz2qynq;
	Wed,  4 Jan 2023 17:04:15 +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 4NnGCz1mRhz46dp;
	Wed,  4 Jan 2023 17:04:15 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1672851855;
	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=9B0ZneMnhjVd1Xjzidse6EFlolGo83R+tj1PhwEpvIs=;
	b=lNqDrtGoPa0BfklaghohK/UDotvKmpI/yC1m8bRSDqK8aERw1A0LTbf/hqObIewmqsj6Ak
	8Wp7wdWo3EoS2Fjqc3qCh+gG9EvyTcNuMvNt8p60JgSjRP+NtrfkD1gA0f30y/DUVh1iJD
	m+Z7L0UdNyXBaAGwPKdInkfXGzCvJdZFn995UQrDtN111uhzYZ+ZN6pSES2Y/Uc6ddY2w9
	2UNcRXtJLj1QCawtb/5mKx/oKnmppqtvWJVfnbEeZqpZFyy7M+xUK/REx16MqY1mYSMkHc
	0TPj0tWOR6KrJsFvwANgkVjKPSj5mEY1v+xOFQSNN00+qpfWNrG3DWHj8xMtCA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1672851855;
	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=9B0ZneMnhjVd1Xjzidse6EFlolGo83R+tj1PhwEpvIs=;
	b=VT3esESKqopyd5m1NQA0s4McNUzVfdENVAG7Pi5IFmvqQfCH/6wMzJEv3Ju4VF749/Q5QP
	2f4tayvGir0/60vXYncT6dUC6pi52Fe5684v/RbJk60dehJudNFdGZzd8ngivRxckg6BGc
	ctpXBYeB+w7RyYAkC1+C4bDwFk27+HA2Xp3FRhUl1LRDk1ZGgenbXPFd8SIxp0lmhtkPSL
	p9TJra1AFFaQrlidTDeYs2VrH2TZ5X+NyzNU6bnIjEA5QthiXcM8AwYx7JYoo1BENkNH29
	mIeDvCuAfDlAT4+Yrc25+QEAqJrkbtixFRzdnSL+ipi0mJW6uQBDN7Hf2Rwf0A==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672851855; a=rsa-sha256; cv=none;
	b=c73OVJs16Y29i9kr/xHURUnTT+WXFJlVrBeegKnEHjQI0l0qok8FtprBdt0gX8g63slcaY
	XsWEhatwBn6ptMYNcs17giDZ637Oeqg5YfhVdNIK0nLf0n2Pk/NGCnZ41zDtUQZNkQp3VD
	bNl+DtqYcwgxn9L81Ldwx7tfM+8rTTK/sIibojRJiCo/lc7IebXvH2h3lmBRLXH7f0Dn0Z
	PVDtiNatWlthpp84QVtO304r/NWbv5AOPHcVBvfS3oi1w2ffWY/GAEiq6hd1d/Xxgx3lKl
	DiWpxM9EMwpvufS+jM3WRj2NGnHRPwGDHTCT2L3hacO+yxSbMOUuBb8W9/hp7Q==
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 4NnGCz0nZyzJjk;
	Wed,  4 Jan 2023 17:04:15 +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 304H4FSC002734;
	Wed, 4 Jan 2023 17:04:15 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304H4FcC002733;
	Wed, 4 Jan 2023 17:04:15 GMT
	(envelope-from git)
Date: Wed, 4 Jan 2023 17:04:15 GMT
Message-Id: <202301041704.304H4FcC002733@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: 8793196ca28f - main - Check for more XHCI ACPI IDs
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/main
X-Git-Reftype: branch
X-Git-Commit: 8793196ca28f7b78f04ca479fe60b7d7af6b20e1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=8793196ca28f7b78f04ca479fe60b7d7af6b20e1

commit 8793196ca28f7b78f04ca479fe60b7d7af6b20e1
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2023-01-04 12:33:08 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2023-01-04 16:54:05 +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 <fuz@fuz.su>
    Sponsored by:   Arm Ltd
---
 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 b354c3227b98..b5fa9d7009b9 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);