From nobody Wed Jul 13 17:53:32 2022 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 79ABE1D02F49; Wed, 13 Jul 2022 17:53:32 +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 4Ljlbc2tHnz3nXb; Wed, 13 Jul 2022 17:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657734812; 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=FmdzRxlPVZIAs85LDFZxdfKnF16EG5It80IsVbJrbp4=; b=lDGI/IIZSIBF9uTf4+iZU7NcStFc3IKwq40rVIFCiZLVJwxqdQpzrFjJEaN5mZauLMr/KC oxLCwfXigDOpTvR2NH6mka3fbCNgejYPH0GDmour+o/vK0zvvl1siCWHwWGKXdRtCyKB6j st5WbAV/x18IXGhKsubRYsYMP0AQzqoPb1hn3nUx02rLrnDgp+RH0jka7x6hcOYm4NpYuI vIzRW2b2wXSxwjMClmoyt3UPG8lAvNj8NtKYa2I24kMw6JtdmNj3wGhjDF0GjOEJOoKO06 zO7Iac5vTIQyhJas8GCRnFwk64OyxztAzsoVRWZzqUBaEM7CWD6k6u6/hfAaPQ== 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 4Ljlbc1wjNzY3c; Wed, 13 Jul 2022 17:53:32 +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 26DHrWQo046833; Wed, 13 Jul 2022 17:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DHrWZ3046832; Wed, 13 Jul 2022 17:53:32 GMT (envelope-from git) Date: Wed, 13 Jul 2022 17:53:32 GMT Message-Id: <202207131753.26DHrWZ3046832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ece27cdfb33c - stable/12 - mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ece27cdfb33cc5dc2420653d7f86bff4f5aa344a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657734812; 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=FmdzRxlPVZIAs85LDFZxdfKnF16EG5It80IsVbJrbp4=; b=axBc4vZMWJhSHJRjuAQUMQOXYyaJ1DTlNS9tpDNB/6knerploEvnxWc3Rj8K8OeVtuyUHE RVDmsuhQdKl4e610QqtUmZNVkuCZorBvdvD/GR7CKJoeZ7D2Wz45TOzCuLplqLq0FGi9Kd 18x6CfCWDIcP1LircwXGgCiFJFHjg9M+LaDYKqqYcKQ5PX6F7etOZMQjeN7NhlLPW8hvEp i+t/g2iqBh/pmuFHYUq8pPVlio9nJPfaKrOL5G/X/HXmj8WiWFufA+WaR2e3YzKPmxaGex BeE4tozAKWNtHXQF6N7chVjyS5unqINV8rjfMBogbq32lHi24e9CDPJ4/gRKbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657734812; a=rsa-sha256; cv=none; b=kVbDro/VWkij4YQJsEXjIQADBpoBkWEyAYxERqYIGu8M6Po+3CXaE2zDV7zwuhCKCMnBTx CqQsDD+vP4CXFwVvBU2NJC+J/JT4Q5fpCtD4rJwGzOHa+igts+NdiwPABMm0QHpEMgzQJX ig+CEN/LzA38KAgxSygS/eN+Tvq6IU0X65xfwA4c3/7UAPIxl2ClPF1qokllxqbGAe2CUc 3GLIbvFoXtEgRWnUTKD9L+5vL6l4SjbneBh7pd1uI1tzfMNvpfscj0TUVXWaBQ2hCHb8gW ZqkEpkiMfIxSnQh83dcK07bTLe1L8GFAmVb/yoxpaFPq1AoVNe5cD56vIjjrBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ece27cdfb33cc5dc2420653d7f86bff4f5aa344a commit ece27cdfb33cc5dc2420653d7f86bff4f5aa344a Author: John Baldwin AuthorDate: 2022-06-23 17:49:09 +0000 Commit: John Baldwin CommitDate: 2022-07-13 16:52:58 +0000 mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. The mptable_hostb driver is a child of legacy0 and has legacy bus ivars, not PCI or PCI bridge ivars. PR: 264819 Reported by: Dennis Clarke Diagnosed by: avg Reviewed by: avg Differential Revision: https://reviews.freebsd.org/D35548 (cherry picked from commit b076d8d54c2fd91a35aad6931d0bfa2aa0122036) --- sys/x86/x86/mptable.c | 2 +- sys/x86/x86/mptable_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index 81e9157c3ba6..d6e5cbc27235 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -1252,7 +1252,7 @@ mptable_pci_host_res_init(device_t pcib) struct host_res_args args; KASSERT(pci0 != -1, ("do not know how to map PCI bus IDs")); - args.bus = pci_get_bus(pcib) + pci0; + args.bus = legacy_get_pcibus(pcib) + pci0; args.dev = pcib; args.sc = device_get_softc(pcib); if (pcib_host_res_init(pcib, &args.sc->sc_host_res) != 0) diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c index bb5ec4fac66f..97001ed17bcb 100644 --- a/sys/x86/x86/mptable_pci.c +++ b/sys/x86/x86/mptable_pci.c @@ -57,7 +57,7 @@ mptable_hostb_probe(device_t dev) if (pci_cfgregopen() == 0) return (ENXIO); - if (mptable_pci_probe_table(pcib_get_bus(dev)) != 0) + if (mptable_pci_probe_table(legacy_get_pcibus(dev)) != 0) return (ENXIO); device_set_desc(dev, "MPTable Host-PCI bridge"); return (0);