From nobody Mon Apr 11 14:05:07 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 A512E1A968AE; Mon, 11 Apr 2022 14:05:07 +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 4KcVwz3ykbz3GpJ; Mon, 11 Apr 2022 14:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649685907; 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=lrkQ+3boSiFkShWEYrjU7QsYAKhMlK4Hi41xICGFbDI=; b=jIJf+f3/RGVI0H5UDoGU0CvICOwuOOqmqwMq5qr43LLuqKT46CGSbfJazFBA7iGj7r4soh lIWQ757h37c/7/CMfHmhH1KvpHvQ9kU4QhYMgmE9MQMps/vCPZCmEXS2NCVl2E225SWwPF TB4rwvaxWeI4+PKOJRmTtrQwJOMYjNTWjfGkCEwoziXd+dApAvaobctePyIH0OsX9qABgW iwVgPinoksadfkWavv+5K+Pe4x4DxROAzjdbO+3TwFDr9r6FUfmEVw/mBHNh4MpCw0+a6K a86X09Io9a4OQxU+AFtsnfn0bW+HJ+K1qbZSeIyQAJfxXdd9alXClEtozU59YQ== 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 5F48824527; Mon, 11 Apr 2022 14:05:07 +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 23BE57hS056357; Mon, 11 Apr 2022 14:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BE57SN056356; Mon, 11 Apr 2022 14:05:07 GMT (envelope-from git) Date: Mon, 11 Apr 2022 14:05:07 GMT Message-Id: <202204111405.23BE57SN056356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b9ec0b7e86ac - stable/13 - mii: include missing sources in loadable module 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9ec0b7e86ac01d3c8634d5b3a7658b5d9d34267 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649685907; 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=lrkQ+3boSiFkShWEYrjU7QsYAKhMlK4Hi41xICGFbDI=; b=FtUKb3lboQNPyNkztoXu57tJzXr9hjUs6ypcL3UlFCJboFpRmAejeXvR8XbZoJOkf+5Kw0 u0GNtKJsTpxjNrn8RQbQJzY3f/o82dgPMfERNaqAMpWOKUVNw1hHia68IKkKaD3dsTYCca F3/f1u++QnU9YnokTEQzQRPFs5E4ErYPDOqEfU7fTYACvpUIpHsoP3vAAuyns3ZNJu8eT+ nxtcmE03HtJtacDxG9qHmo69WZLJa5kdRlrTeJv7V5qmoOxHRkvdzvb5PVp+RxQirvFyoA s+0+fj9Udn8eJ7DRGdnoHC1DUA2JneB1y0cjIDxks8Jl6ZAvyCHucoBlLeEVUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649685907; a=rsa-sha256; cv=none; b=SOrjO0hfK5ReYVLjh2maSk5TbO0GZpy7QMV5VtlYWK1FSYCP6MmSB2EN39wIUiCmFXFpem K+nr7AVmjkKG6oKoM/mKbsW/IymZkCOkS42RSTveOhNjNUOal8B0DqgHwInCea6SXjaCe2 v+SFGsCaEzPa+RIuIg/s2/7LhZGfHFxObmbYPpE2boSoviJs+AB6cp6LPfE5+DiJabcLII SatVrfcFINE4xyI0BlzpIYTHgGUahFtJdNRVI4sA7zg6NM1oDpaWGO21d6uq2Bj2xjWjp/ Htq3/HTowcU7LOblx8YLHnY0zdwuzaSoUPe1hQ9b4tqo740bl9UsD3RW1yEH7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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