From nobody Wed Jul 13 16:47:45 2022 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 DF61B17FCC33; Wed, 13 Jul 2022 16:47:45 +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 4Ljk7j3nWsz3Wnd; Wed, 13 Jul 2022 16:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730865; 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=D41obEy/vPbXwtww/PX681JQuCwH4tBIztlAYa5p+tg=; b=eSyEz3Zs+PrMLl7y6A+y6K30F9oRQtPgLK86jbP29zUlMsp86C+KROTDK54W0ernASpN5P pJ+rSPNDWtoL5eLzXFHEI/J1G9P6y3z0GJt7i+29XGYqGsEmvpubZOKWGzHEFyf9PiEUqW Sc+A7rczk5fKId2el0F6W6JwpkwnH9oSza5qZHWuQFUzg8n7ZEjGlGWjv+rDtrcy3058cQ P5aoG6ckDwjPwJkaRKlCM2C6wDJpRc1DnjCi75a5TnwYh/Npxf/YSEdOaOr2PWw4W9Nowk toMaZuRAk7R0aEOLEOGRUIgUbkhdfKveiINZPg+fBTs4D4Xqoc1OdnOyJlbGWA== 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 4Ljk7j2tRGzWC2; Wed, 13 Jul 2022 16:47:45 +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 26DGljiV052353; Wed, 13 Jul 2022 16:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DGlj1r052352; Wed, 13 Jul 2022 16:47:45 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:47:45 GMT Message-Id: <202207131647.26DGlj1r052352@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: 516846b25648 - stable/13 - mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 516846b256483cbce82933e1cb9ba0cf7b5279ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730865; 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=D41obEy/vPbXwtww/PX681JQuCwH4tBIztlAYa5p+tg=; b=uSvghlrbbzhv3qpT9kOVoOlvQsa3EJGtwZAJZhvyaYfKuPZgWzAlhBeBmp1CWff2oddX78 Nog9x7uUGA40y+McZZbrkpkj7xu+oinZlyHTe8mRg6rW0VPpG2gwCIPHYGolStdFiuMX4+ F61TCB/43XWkoKpLCZpDdT7iO/ESUDsKDksiyEeFX1ltiU2c5JdtpjMAw/l2t5lB5sqH+7 nh/gdg4NJKEd/qCv9z+Y+dhDtP6WK0ywAFOpKAHl2FtN8BjEhefaEstNxuSBwxjwcBI0z/ 29z9OzyESN4424CXfP5dt1gpfiF/BQkwk6T1f+BikqCehteZlRWsDm+L9xrcgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657730865; a=rsa-sha256; cv=none; b=BXnxGV2qktwvzjAthjit2B4ICa1dwmWJcSWIP8YP1XcayLG88y9AzTY47VXr6YCzdMS0hz k21vq+H5/caQ/b/uJzWfXFMw/Av4Cj34SniLUBpKFvluq+Q1uUgXETskLo3SdWCDeUs1TW pPYjMQTjg3BKfoiykFES1cT3FUbvjudBZHUhSJYwxbmGZ/6b+5iJUFckPlHMTGHVaUnXYQ qrRyOXeHpyvqcfTMog+uHeE3xGvHIyn9lOFQKyzt7Q7c/0kp0c2k+k6kVceG78c3vnrnMf l6gmnubv835FuazV05fkWWaKVJARg19PAI3I4EgPvoI5rLAdsVFgILb3iYTBJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=516846b256483cbce82933e1cb9ba0cf7b5279ec commit 516846b256483cbce82933e1cb9ba0cf7b5279ec Author: John Baldwin AuthorDate: 2022-06-23 17:49:09 +0000 Commit: John Baldwin CommitDate: 2022-07-13 16:21:10 +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 5cc42863cf38..c5f113c55a2b 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -1250,7 +1250,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 d4bda2183ba1..b1cd1feb1160 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);