From nobody Sun Apr 30 06:58:02 2023 X-Original-To: dev-commits-src-branches@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 4Q8HGy47VWz48sDL; Sun, 30 Apr 2023 06:58:02 +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 4Q8HGy2sVZz3N3m; Sun, 30 Apr 2023 06:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837882; 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=HVprLkdEcw7w1zyvMJLrzqbEErn7SGSY3b7+du38nbc=; b=tTCdiSJ0Q8gRt3kIqVwwSSXUUgSijvpRdYEJL+Hi+ug2GYo62Sn2aCCse6miP2SZUTV36C 048lISieiI80f3310JEQ5p9I2d7dkp7lsGvDxQ1vqyoTtzBLzE/IJqu5G3v0SHSvfHmkyp l+pkNlsfN1V1yAlFFHPpe+pIv847q7W7jVwpY6OqZCruKRRdmi51K6uC0CwvCrxLD5uyPN nYSMiZbhmqUGffod7V8RaCfznCM/ThxZe8EAl/qwIjscGvFOI8MrQV9tTL7BPb/IsU/gpl dj8EbFegQk0B2+qKVKFS4wyQHVFsMAfdaiKZ+EEObAL9t/AHcjO4pY3G4c5aHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837882; 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=HVprLkdEcw7w1zyvMJLrzqbEErn7SGSY3b7+du38nbc=; b=AZcFZ0+86/9eKKRzVSl5aeT5Q2qYwXel1tHuwwwO/klp94c87I7z7yfo4zp1NqM3J7dyGN jJCO7bav4PvFWoB2jV1R1nqCIJTaeNzuQD8qN8BJXqUX8CIsFTx1IkVPK11reCdUAwbgHo xvGc/W/nJKdxba6WWOHvSNXx/OUdtB5AJFMc9SNOC3/k+NNFMoraQV08lS0hJ1MtlCEuxK YydumIKloZnVgskWShkdxX6OAj/nl7WVqRoi6NF46UT8vDrZaZx9k5CE9Z4NvHjm+Id1Q5 nEZFo2+Sjbtj/smsMUxSDui0TDPByrYxDOVB+4ts7I/GzKh0ZXQadl2nyI0WSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682837882; a=rsa-sha256; cv=none; b=DSneL06pnTbEmaeqVmMvFenf7sZQRvegzwbd4WasGGvNnW4b0NjQd0AJqM2s6KHKnNAM7A 28HQEzkxM67dQ9b3BLMTfCLLOoZhXDCYUyPrCw3hH5TKHPgGvOFToYI8eACGUIjEUJQs4/ daaxOMJ37jDEPbX+xo3S/0ReOYtt/QNPeugnozjdjzruB22LFXuFtJ8kRad4ELGiVcn9e+ Lu/4+eORhVe2vfdMwug+s+7bbiPoQJoilkSXBVpQkiNkWTZJVoUlwP8HbYOIC6mU8WuDx1 JHHfdysJ+fRLXiU2Xor4huEeG8hV2fhJzpv5KGwr96L/Wa9P+1l8P0ZlnTYMcw== 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 4Q8HGy1ySlzDg2; Sun, 30 Apr 2023 06:58:02 +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 33U6w2MG071701; Sun, 30 Apr 2023 06:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33U6w2G1071700; Sun, 30 Apr 2023 06:58:02 GMT (envelope-from git) Date: Sun, 30 Apr 2023 06:58:02 GMT Message-Id: <202304300658.33U6w2G1071700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 0e81f07f3653 - stable/13 - USB: adjust the Generic XHCI ACPI probe return value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e81f07f36533b47da917a98e3c4d7c2308adf08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=0e81f07f36533b47da917a98e3c4d7c2308adf08 commit 0e81f07f36533b47da917a98e3c4d7c2308adf08 Author: Bjoern A. Zeeb AuthorDate: 2021-10-01 13:37:01 +0000 Commit: Hans Petter Selasky CommitDate: 2023-04-30 06:56:17 +0000 USB: adjust the Generic XHCI ACPI probe return value Change the probe return value from BUS_PROBE_DEFAULT to BUS_PROBE_GENERIC given this is the "generic" attach method. This allows individual drivers using XHCI generic but needing their own intialisation to gain priority for attaching over the generic implementation. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D32257 (cherry picked from commit 76f3b8cb640536de2c370cc2bd60382bbc35cf5d) --- sys/dev/usb/controller/generic_xhci_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c b/sys/dev/usb/controller/generic_xhci_acpi.c index aa96c3f40fee..09add23de5af 100644 --- a/sys/dev/usb/controller/generic_xhci_acpi.c +++ b/sys/dev/usb/controller/generic_xhci_acpi.c @@ -67,7 +67,7 @@ generic_xhci_acpi_probe(device_t dev) device_set_desc(dev, XHCI_HC_DEVSTR); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_GENERIC); } static device_method_t xhci_acpi_methods[] = {