From nobody Sun Apr 3 15:30: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 0D0541A40FE5; Sun, 3 Apr 2022 15:30:23 +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 4KWdC26pt0z4VJW; Sun, 3 Apr 2022 15:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648999823; 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=eizZiba/IuES2x+GPXhJkhldlVeURQyrq60OcDjlBtk=; b=iM2UrIM1imuwvst0uCaHErivjXheO0W0nRQJ72j3tvg8QqCoTBf6g4LDUxbm94lvJwp7j0 2jLK0m49+vZJO2L6eWdgVqV9pD0/6UbY90+0QDa5GoqCegEYB9fdNdwJ/GR4AXzz/ZBNQS y5Kt1QNU416nE3BL//UBFtKC3n1CJW8Byan69QQJtKv3xgMuuJ3ROXSAY59YvxYm2LX0Zj pxLAaSM4qh5OfQsJxYeMYCtYBDwmvo8XceMkuZfppFeeq+IKtqqap0C4VJvMW0guEPGnB3 eFRWTB5XvbSP8F39E1HKbaBV0fsXrXp+16KWkuz/jGu3WiKS7dx5FED5PHB/AA== 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 B83571FEF7; Sun, 3 Apr 2022 15:30:22 +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 233FUM8M006067; Sun, 3 Apr 2022 15:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233FUM95006066; Sun, 3 Apr 2022 15:30:22 GMT (envelope-from git) Date: Sun, 3 Apr 2022 15:30:22 GMT Message-Id: <202204031530.233FUM95006066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 517ea731d4e8 - main - mii: include missing sources in loadable module 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 517ea731d4e803450537e9369d6a16aa4081acd7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648999823; 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=eizZiba/IuES2x+GPXhJkhldlVeURQyrq60OcDjlBtk=; b=abEW2CwkpT87gLZ52nzEsQMpMkGoSxFAPDVY77B8frrHjfDuemFUhkn0ZqRMkPiUs5LMwE Bwbu2ZM3FZ0Q4O4pwIk2UCTkHWcTozRlO+YKvizs+uoOyTwbNqJnvUVyJX+8+di1kxXdT6 nK6ajAkwxR+ohaqXtJ/KFWBvNaWIppan0M2AMFPYGDJMgyFe9e3+Mlp5G/O2f+vhXBBvZY 4fHngPz5a9/g2gEdm7m65uLbfBYjlLbihkPSX15UwPnrKn0uNQy/wO5maD0xDKi6+CNNtw vFQfiYTQvR3JDv+G6kTS85MSk0eCLmbq8vWsvpx8BUj+/+chthCdBQN53Tl88g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648999823; a=rsa-sha256; cv=none; b=a/B2FzQ6t6kJIFFFFmO73e6TYH4juQni5dB+bJz8w/7SxtC1hmcLNjQaDxZkpw2dWZvUe6 BHUinqAUd08PuSdcE7HNdP7O1ziDCaTR5+neVw1WE0nAyqrVBn3/YNSKbHcaK2S2U/dXdu oD2T6FYBYb3tBFhxlxUhpfcZu8zyuSM0IJSpDECQTDgjaMgW8cpLWnQ4yFTEdf/gHgU6Bk bzEl2vjmOFq/L4F75OxvwyRzQpWzs2XGXw/9CYmQz6nuFC4uMtt+pyjBmB2YsqEt2XTlw/ pylo2uFHPIYtEuyLxMeniDC8JWMukGlusluY9pd2exIJ8Tgi5uJgnJNLwb20Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=517ea731d4e803450537e9369d6a16aa4081acd7 commit 517ea731d4e803450537e9369d6a16aa4081acd7 Author: Milan Obuch AuthorDate: 2022-04-02 18:28:33 +0000 Commit: Mitchell Horne CommitDate: 2022-04-03 15:28:37 +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 --- 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