From nobody Thu Jun 23 22:04: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 0E46F87EFEB; Thu, 23 Jun 2022 22:04:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTZ6T6f9Jz4qM2; Thu, 23 Jun 2022 22:04:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656021873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HJ6Rp5oKZELVccVpQTsSOqQtMi4uEn2+uUO3nhQpHs0=; b=GIcz1OHdEwn8W1+kuA8IyeeFfRRnYPtI9qLjWeU2g9P/udq2HOC7TkHLTgKIdb2aTCgJc2 cp5LQfwucIkr1+L6bitmPsNg47b2IkAoNfDuS1gcbYhYTw52khwVYCdxN913wm7orD1Mks RTn6M81nwWMCRyqZPgX2rwJ8DaswMA71sBpj0tEIjjcdble5CXcJ0NV5H9NsFhqpRepkgK iF5h+dzuDYpFdQUAbNdvdJDwj+tbRPChwqEZcPjJDU+fFUaHKpOYxKc/VV+MBvq/rsBNqq tJ+ixPADcnyQrH0iV29+INobL3HCXUgjvv/CCe+5l/3aMuFWKpwNdx/EH3hI7w== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 37420340F; Thu, 23 Jun 2022 22:04:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <169b730c-08df-d058-8337-d78f453c3c8d@FreeBSD.org> Date: Thu, 23 Jun 2022 15:04:32 -0700 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: git: b076d8d54c2f - main - mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. Content-Language: en-US To: FreeBSD User Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202206231752.25NHqa67086856@gitrepo.freebsd.org> <20220623235649.5ecbc03a@thor.intern.walstatt.dynvpn.de> From: John Baldwin In-Reply-To: <20220623235649.5ecbc03a@thor.intern.walstatt.dynvpn.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656021873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HJ6Rp5oKZELVccVpQTsSOqQtMi4uEn2+uUO3nhQpHs0=; b=SvWLahdXggVi4Io/3FuGi3Lth5HGLGWOkoQh155t159QwDEc5UWXI9+ImvbR6VoUG41mfR 1CXf4BhyJdlTiGpKPJZlS7lN4MAuRtcXqi4qzm8WGELtLJ0gaO/epRxVlvtxBrHgYbc38s eF27NQ/LZQ2w5+0vKiSxdsZMznfy3k+hflhFbJuouguTZoVfjYGbA5Zwnc7qvBCrSB25fL SXLZMG2XjUETx2tu4HNmPGpt3LHQZHljW1sQyrEMmJR8jkr1zrKH3tmdiILnCNbPnpcDUO DDoTWjxp3phgAu1SoI9PrdcucIcAwVQpKQw3BLJHtl7UtW1fK0Ep2cPUwuc8dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656021873; a=rsa-sha256; cv=none; b=vUYa3hJh7eutM8qGzAZM0XSiE1E4zoOIGqP9fBusV7muA//K9V/DhadPHz5P2LB0QR2W8H 64XgfQsMijaCdLwPprV1umleOUyr5JAFZPFXM/4we+Lxd/y9ERsHphxBPePRwkZFPmkFT5 RsdWkwYWsOwrsxZxDoh/lgaU6OliGmp5z09fdKakAP15GatvgerP832UDJEZDRMC8VHP2R NxAULkygun0i/CoDypr5ziBfvPtDggvrpvzb3vLNzcUIyW/EKUSsGRX9y4YkOLSJplGGnL jZfqXqfXkk2oqwgkyxexZ4vkdqbDKO0vrk+owF5ejDwyvIfExbbj7CWtGawTmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 6/23/22 2:56 PM, FreeBSD User wrote: > Am Thu, 23 Jun 2022 17:52:36 GMT > John Baldwin schrieb: > >> 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); >> > > I think this commit broke buildkernel on our hosts (custom kernel): > > > [...] > > /usr/src/sys/x86/x86/mptable.c:1253:13: error: implicit declaration of function > 'legacy_get_pcibus' is invalid in C99 [-Werror,-Wimplicit-function-declaration] args.bus = > legacy_get_pcibus(pcib) + pci0; ^ 1 error generated. *** [mptable.o] Error code 1 > > > Kind regards, Should be fixed by 15a6642da6b0b97de580e06349706cf7e660986c. -- John Baldwin