From nobody Thu Jun 23 21:56:22 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 3D41387DC21; Thu, 23 Jun 2022 21:57:01 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4LTYxm1qLxz4pLT; Thu, 23 Jun 2022 21:56:59 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 8830F10A1E88; Thu, 23 Jun 2022 23:56:52 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id B052D10A1E85; Thu, 23 Jun 2022 23:56:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1656021410; 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=/V6ofYulfO8IuCCUHvLZ6PEXZmJL1LpSHaFBMUlmWg0=; b=nrtQX/QXxh5IXyUG0Ft6dcLm3f1yHBqPUIvWUnrH4y9CZ26e6MIyYL9Y0JpI9OA9TnO1Mg SJRYgLIL2tDBkjEVgbLivrygsggSIBA06+BjIWLdQd4te847hq7wPjNaYwNC462TlS7HWi N5BAVqcPToU4zqvfJIIuqINh50F6EAl4zVpBE8mOP+o6zc+2XnSpW6h6zLK+fwu9OCSw/4 /bvJ/luMUvDAjrXVGqMIVh+VWeNHRvmNJH/RaEqpnyHaU8PhVxG9dwYsr9HdkXLSFyTJ8l Jp/+aHJJhB02sxyt8VB33zUYAFwRhkJJzq+FfmlmIenmPaQIMng33D4d2fZDnQ== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-013-029-097.77.13.pool.telefonica.de [77.13.29.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 787AF10A32FA; Thu, 23 Jun 2022 23:56:50 +0200 (CEST) Date: Thu, 23 Jun 2022 23:56:22 +0200 From: FreeBSD User To: John Baldwin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b076d8d54c2f - main - mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. Message-ID: <20220623235649.5ecbc03a@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202206231752.25NHqa67086856@gitrepo.freebsd.org> References: <202206231752.25NHqa67086856@gitrepo.freebsd.org> Organization: walstatt-de.de 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=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 759603 X-Rspamd-UID: 132038 X-Rspamd-Queue-Id: 4LTYxm1qLxz4pLT X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=walstatt-de.de header.s=DKIM001 header.b="nrtQX/QX"; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@walstatt-de.de has no SPF policy when checking 2001:1640:5::8:30) smtp.mailfrom=freebsd@walstatt-de.de X-Spamd-Result: default: False [-1.51 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[walstatt-de.de:s=DKIM001]; RECEIVED_SPAMHAUS_PBL(0.00)[77.13.29.97:received]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[walstatt-de.de]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.89)[0.888]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[walstatt-de.de:+]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE]; RCVD_TLS_ALL(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[2001:1640:5::8:30:from] X-ThisMailContainsUnwantedMimeParts: N 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, oh -- O. Hartmann