From nobody Mon Apr 11 14:54:36 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 4EA111AACCC5; Mon, 11 Apr 2022 14:54:52 +0000 (UTC) (envelope-from freebsd@oldach.net) Received: from nuc.oldach.net (hmo.in-vpn.de [IPv6:2001:67c:1407:60::1]) (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 (2048 bits) client-digest SHA256) (Client CN "nuc.oldach.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KcX2H04Ppz3hPy; Mon, 11 Apr 2022 14:54:46 +0000 (UTC) (envelope-from freebsd@oldach.net) Received: from nuc.oldach.net (localhost [127.0.0.1]) by nuc.oldach.net (8.17.1/8.17.1/hmo17dec20) with ESMTPS id 23BEsbo5031811 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 11 Apr 2022 16:54:37 +0200 (CEST) (envelope-from freebsd@oldach.net) Received: (from hmo@localhost) by nuc.oldach.net (8.17.1/8.17.1/Submit) id 23BEsbUe031810; Mon, 11 Apr 2022 16:54:37 +0200 (CEST) (envelope-from freebsd@oldach.net) Message-Id: <202204111454.23BEsbUe031810@nuc.oldach.net> Subject: Re: git: b9ec0b7e86ac - stable/13 - mii: include missing sources in loadable module In-Reply-To: <202204111405.23BE57SN056356@gitrepo.freebsd.org> from Mitchell Horne at "11 Apr 2022 14:05:07" To: mhorne@FreeBSD.org (Mitchell Horne) Date: Mon, 11 Apr 2022 16:54:36 +0200 (CEST) Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: freebsd@oldach.net (Helge Oldach) X-No-Archive: Yes 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=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: inspected by milter-greylist-4.6.4 (nuc.oldach.net [0.0.0.0]); Mon, 11 Apr 2022 16:54:37 +0200 (CEST) for IP:127.0.0.1 DOMAIN:localhost HELO:nuc.oldach.net FROM:freebsd@oldach.net RCPT: X-Rspamd-Queue-Id: 4KcX2H04Ppz3hPy X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=fail (mx1.freebsd.org: domain of freebsd@oldach.net does not designate 2001:67c:1407:60::1 as permitted sender) smtp.mailfrom=freebsd@oldach.net X-Spamd-Result: default: False [-0.48 / 15.00]; ARC_NA(0.00)[]; R_SPF_FAIL(1.00)[-all]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.44)[-0.443]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[oldach.net]; NEURAL_SPAM_MEDIUM(0.06)[0.065]; MID_RHS_MATCH_FROMTLD(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_NO_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-branches]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:29670, ipnet:2001:67c:1400::/45, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Mitchell Horne wrote on Mon, 11 Apr 2022 16:05:07 +0200 (CEST): > The branch stable/13 has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b9ec0b7e86ac01d3c8634d5b3a7658b5d9d34267 > > commit b9ec0b7e86ac01d3c8634d5b3a7658b5d9d34267 > Author: Milan Obuch > AuthorDate: 2022-04-02 18:28:33 +0000 > Commit: Mitchell Horne > CommitDate: 2022-04-11 14:04:08 +0000 > > mii: include missing sources in loadable module > > As of today, using 'kldload miibus' is not equivalent to using 'device > miibus' in a kernel config. Newly introduced PHY drivers (DP83822, > DP83867, VSCPHY) and source files/PHY driver for FDT-enabled kernels > are missing. Without including them, kernel modules using any function > from dev/mii/mii_fdt.c refuse to load. Additionally, miivar.h directly > includes opt_platform.h. > > Add the missing sources to the module build, with the FDT-only files > gated behind an OPT_FDT check. Maintain the alphabetical listing of > SRCS, but move the required header files to a separate line to improve > readability. > > Reviewed by: mhorne, mindal@semihalf.com > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D34256 > > (cherry picked from commit 517ea731d4e803450537e9369d6a16aa4081acd7) > --- > sys/modules/mii/Makefile | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile > index 348c9b7b2845..f53419974130 100644 > --- a/sys/modules/mii/Makefile > +++ b/sys/modules/mii/Makefile > @@ -3,15 +3,21 @@ > .PATH: ${SRCTOP}/sys/dev/mii > > KMOD= miibus > -SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c bus_if.h > -SRCS+= ciphy.c device_if.h > +SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c > +SRCS+= ciphy.c dp83822phy.c dp83867phy.c > SRCS+= e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c lxtphy.c > -SRCS+= miibus_if.c miibus_if.h mii.c miidevs.h mii_bitbang.c mii_physubr.c > -SRCS+= nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c qsphy.c > +SRCS+= miibus_if.c mii.c mii_bitbang.c mii_physubr.c > +SRCS+= nsgphy.c nsphy.c nsphyter.c pnaphy.c qsphy.c > SRCS+= rdcphy.c rgephy.c rlphy.c smcphy.c > SRCS+= smscphy.c tdkphy.c truephy.c > SRCS+= ukphy.c ukphy_subr.c > -SRCS+= xmphy.c > +SRCS+= vscphy.c xmphy.c > +SRCS+= bus_if.h device_if.h miibus_if.h miidevs.h opt_platform.h pci_if.h > + > +.if !empty(OPT_FDT) > +SRCS+= micphy.c mii_fdt.c > +SRCS+= ofw_bus_if.h > +.endif > > EXPORT_SYMS= YES > > ===> mii (all) make[4]: make[4]: don't know how to make dp83822phy.c. Stop make[4]: stopped in /usr/src/sys/modules/mii make[3]: stopped in /usr/src/sys/modules *** [modules-all] Error code 2 make[2]: stopped in /usr/obj/usr/src/arm64.aarch64/sys/GENERIC --- ata_da.o --- ctfconvert -L VERSION -g ata_da.o --- if_cgem.o --- ctfconvert -L VERSION -g if_cgem.o --- al_eth.o --- ctfconvert -L VERSION -g al_eth.o 1 error make[2]: stopped in /usr/obj/usr/src/arm64.aarch64/sys/GENERIC make[1]: stopped in /usr/src make: stopped in /usr/src