From nobody Tue Jun 25 05:36:44 2024 X-Original-To: dev-commits-src-main@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 4W7YVN3kSSz5NmFZ; Tue, 25 Jun 2024 05:36:44 +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 4W7YVN2n0sz3wk5; Tue, 25 Jun 2024 05:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719293804; 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=SozgpupWF4SaeU4dfgGF5JKpunFhXzZFMeBYDsUu6p0=; b=CUiBdIUk6CDnuYelSgNiIIljM0g0v90N/bG3pOrCgTA5qQspUTddcxGHuXcEQxqwXSEqxi oKrrE8fjKJc+jZ7Bbft5sv/LPKF7vRJcM2hkSy11q6zkTw3xAcFis67BjmiTa3ejL7wf1p k99x6EjTzQFBSjK7Bgf+2KIEjwQQCq2zkw5ceoUmYWAViM3DNXXkCuZANtngp+T7xevUT/ hXvFeyepLKOcTK8DlcfFcphduJUzQCM7jSbXYMurPze2EdmF1orrvwmBbe4nN1a7JS1g/P kmX5ErJhLWUHq7Vj7xOfHHDFJohOADkd1Vc8rsvuoZ8DIHCfKRzqr5cVvf6oiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719293804; a=rsa-sha256; cv=none; b=G3EGrwErE8CY6GW/6wB1AswSAkOjNdYTzzJPqIb9r/b8ntQ4YU+RM2P1aRbFXA43PHYdRZ Mx6ELWNTranO4Zl2UESF6y6JCCLGwYsvgQ6gXUfdiKZEDfC6KXBpLMN+4cwViycPm4TJop AXTE5gpvv8s4i0/AC8BKnWrWYQtPyyAyMsdUDI4Yj/tcYWTq7mT/dxowERK0clshv+Fwwx L1OiR8qsnHoUlgTVnrGTmE31iLH8zq0SjRVIxCTABnbovL9hxc7RpUdBmURmv0VacTiJyk DBhIjVnMHaJ464+Ct17UGPWewp+ApL87wUd9FceABR9tug7lMe67KjyYfLp7og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719293804; 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=SozgpupWF4SaeU4dfgGF5JKpunFhXzZFMeBYDsUu6p0=; b=FsYslOlG297vMkPJc9pUfMWpnMiRiDXDMyaleVIQUhl4vcfq6raN3RWUg40Qq0tiUmleBc 10JgHISNGikEtCk80YvKDbLg6WDE2VnTQgMeF9l2gzlKV7mQbJJsDzj2ifalYw0jsKxQMf tnusAR8Y+B1VSRXvCo3B3x0oTdi5T/MJwoCrICEjs4P4kk1hOpFL09orxHkJJwJSsagBnj 18vC9n8HwTF/UVtSXRA6cd1FzVwf9NIeuoCar+ybu1n8jL3TXATaf1X/5lRypgCyxtHzY3 6uL9F9UH21h30jizjBe+h6eBWnicSwa38RcRyZII7+zmOyAUmfhvPaiImRTgOw== 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 4W7YVN2LS1zqBc; Tue, 25 Jun 2024 05:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45P5airT006445; Tue, 25 Jun 2024 05:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45P5aiRv006442; Tue, 25 Jun 2024 05:36:44 GMT (envelope-from git) Date: Tue, 25 Jun 2024 05:36:44 GMT Message-Id: <202406250536.45P5aiRv006442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bbecd3148abf - main - tpm: Fix acpi attachment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbecd3148abf68918b1aa5fc7750dd8ec17fea72 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bbecd3148abf68918b1aa5fc7750dd8ec17fea72 commit bbecd3148abf68918b1aa5fc7750dd8ec17fea72 Author: Warner Losh AuthorDate: 2024-06-25 05:35:30 +0000 Commit: Warner Losh CommitDate: 2024-06-25 05:35:30 +0000 tpm: Fix acpi attachment The third arg of the DRIVER_MODULE arg is the driver to use. We want to use the acpi bus version rather than the generic one. Otherwise, the ACPI specific probe and attach functions aren't used and we don't see the device. Sponsored by: Netflix --- sys/dev/tpm/tpm_tis_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/tpm/tpm_tis_acpi.c b/sys/dev/tpm/tpm_tis_acpi.c index 32c73e5f2483..1d76d4f73266 100644 --- a/sys/dev/tpm/tpm_tis_acpi.c +++ b/sys/dev/tpm/tpm_tis_acpi.c @@ -83,4 +83,4 @@ static device_method_t tpmtis_methods[] = { DEFINE_CLASS_2(tpmtis, tpmtis_acpi_driver, tpmtis_methods, sizeof(struct tpm_sc), tpmtis_driver, tpm_bus_driver); -DRIVER_MODULE(tpmtis, acpi, tpmtis_driver, 0, 0); +DRIVER_MODULE(tpmtis, acpi, tpmtis_acpi_driver, 0, 0);