From nobody Thu Jun 23 17:52:36 2022 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 72319871FBD; Thu, 23 Jun 2022 17:52:36 +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 4LTSWm2Q5pz3Jcs; Thu, 23 Jun 2022 17:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656006756; 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=fvtZNKvEfxLLz1GGhxCpPkripz2X7t83Q2pxHZAx0ko=; b=E+JHB7uK8cKYfh+EuJzN0hdaOZCYkWRYEYtZvBw955tCnPwcqizg7PWI8ZZL7R+DlW2onD gf90bsQldSAk7mfdIaYMlfwgdMHfNxtS5tCjD+y5qtuXLnng5tNuyZfuWQZkvUxk26hZzD hdF/s5U34JCUCcDhYHwWUclSGZKAfhD1WnGkG8ElKirfpindV5FuwMwXRCl6wuZrY2tD0K SQdxi6o18XsYyzejSvFx5UENMSA8nrSd6HmPNnhcutPVNV3Yf4zH5cSn/Y/wko3LcICwJI fq+ruWGye/4NM5Lna74r4761MvS7AWAz/c40xFjM5bYVcqiDIjljF4L+OK/Xiw== 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 330AE1F8F7; Thu, 23 Jun 2022 17:52:36 +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 25NHqa9r086857; Thu, 23 Jun 2022 17:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NHqa67086856; Thu, 23 Jun 2022 17:52:36 GMT (envelope-from git) Date: Thu, 23 Jun 2022 17:52:36 GMT Message-Id: <202206231752.25NHqa67086856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b076d8d54c2f - main - mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b076d8d54c2fd91a35aad6931d0bfa2aa0122036 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656006756; 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=fvtZNKvEfxLLz1GGhxCpPkripz2X7t83Q2pxHZAx0ko=; b=HNbLqVz8gWSW8Fgh1bYWTNUieh1KTmrRwKm1jGlxUmfMA2RnSW7ltfKP2RkvWMo1jcrCx6 uVrgyVdg7SQHJZ0Xg+wq/GUK0U9LYty3E3/VReGW+97Ugxsq9epxPte9n1k5TZk0XGPlhz KUwqD+mwARgqFbzywI9sU2AXhtiDnQ0jeA8vCNwXURFi1e/1FHTbVEACO5OkCPZj4Rb2z0 7K4bPgRILyGIJws1Zizq7Pe5e/UxzkLHobv6gmKiBeb6DLJoVDIuReLg5rI6ERRhPNdjJm 024/ajCGaAARJiEYuwfKP3V/XUVpKwAo9ZV3OZitRRAM4zEQilARWjEcrt8F/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656006756; a=rsa-sha256; cv=none; b=lUPBweIf6Xl+mrEC7/rez6e8I8O/g3HoI9bd3RiolMAKgIVi4Yxys3dSu763vcuhROFGjY AvAWvcaum7znb6TQC77AmOZMEDPoQ4s3v9p/Gv1BKKSYPbx1dB5Utar6g/7eskEUL78CeI FRoI4GDcuzBAd6zgTATw4K5N7yk7mqCW96/uYeOAJMELsYT/EVrW76i+Twqv36RLjGb13V 1T4e2b0Cy+uPggac5gb/phsAtIM+d7wH2LAnKZnoUFGSd9i4m0chw27R9aRtnOZ6j14J6v Amxy5JsqJDQk96DNXFWtfX6Sz/AebxYJR/7XQZM4Lw03NVQMRb6tSzxPFCSDoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b076d8d54c2fd91a35aad6931d0bfa2aa0122036 commit b076d8d54c2fd91a35aad6931d0bfa2aa0122036 Author: John Baldwin AuthorDate: 2022-06-23 17:49:09 +0000 Commit: John Baldwin CommitDate: 2022-06-23 17:49:09 +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 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35548 --- 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 1a1d98eafc39..8a1d2abe46fe 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);