From nobody Sat Apr 16 19:19:04 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 E2833EAF38C; Sat, 16 Apr 2022 19:19:04 +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 4Kgjfw57xTz3FJp; Sat, 16 Apr 2022 19:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650136744; 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=ftapuaT5Ks/s1IqjhDiaA9RDNPDMyL/oZCzvpKP7gEE=; b=H9YnxZ2nzLxwcf6TI/NYNEBNHWzNgRMNsqyZcBJbqdcSGALk8TTsVDUeDsC1jH0Mgofn+j KeYtsRNgDiPPTs/Gkts+vZhzeqh2DkGO8nvYt1xl0zY+1Z3civA5DBOsITV6Z58aODqSE2 8/X2ZmOe5uN5c7AYG5hbnFDKvox6OGGcsD+DCOfUvNDXigKqD1ggLUrTGYop3olccmgwY8 j75XvLHh4sDawLFwX/dgkppDJQenNXdeJzfJ+FfOsrBSF3t+diCvTTaU2jBaZUbzWjB7eB x52bfcbmKTLUo0M/lY727bgk5+0yFYdOeZmtnH3azjVzPOIa9fwR/1eDZIsc6Q== 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 8D31E7B73; Sat, 16 Apr 2022 19:19:04 +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 23GJJ4wi010800; Sat, 16 Apr 2022 19:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23GJJ4Vj010799; Sat, 16 Apr 2022 19:19:04 GMT (envelope-from git) Date: Sat, 16 Apr 2022 19:19:04 GMT Message-Id: <202204161919.23GJJ4Vj010799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 9ef382e06546 - stable/13 - MFC: 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ef382e06546dd2234319bf2625a3f89e60764a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650136744; 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=ftapuaT5Ks/s1IqjhDiaA9RDNPDMyL/oZCzvpKP7gEE=; b=VRUmM57HgpSoT0s8SdlAfH9Zg8dlSe83RNdqwJeqDYzmFXRyI5PqEAlThm6IYYEUWr7SL5 bDPllgyG8qtB49VsYq+1uBy5s8N35l/A4WTxZ7Buuy1LTd5YEfJ1nAdJoLSSkvKaQAu6NO PS1xBrM5qNbyj+SGaYKTxbbnE/4gCq4055MEi9vBbJVYsgNW5Gn+XuGHpru2fkiZfi+ZTH wwX8TGlc39gMdl1T7qEmo9V9SblssHouqjuM4GYg0RhIR8/uHQMb5rHYQQ4JefDDmtc6/E qJcuxmlnT9MAjPZvgYB8o0J3fulOLdClRykAAYGgYBkHN9Hd3+dGF9ca19iT9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650136744; a=rsa-sha256; cv=none; b=hKSO3D22YvWudFoAYBdu2kPPVGW3aZbj5dVQeWiQMKykru9p6vmRiFd5ZYMikqEKMcjcNw OvNk94mvQROXORhLL1Q1LKBK3btqgSZ1SJ15TWC1Vf9cvmK7K8E4OeSr5b8qKWin8ChGDd lmu36Xq4YddaoaEKMgqnK+qw0prltlG8z7DbuKxE+uzIS2Lpqy8EMUmXrPR+6/zhP/Pnha PBSXqCm27nABoZEo/WYuCf59TiX3xvx6bYmRdkB59As93Yrp+V3YE3q0F6YvjYv3eeWlXt yhUsFXMFjGoF/yjtALs0zvYRKk/b/4Ofp2wdbvoEGiBmKdspjl+yUQ/Ojyp8DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef382e06546dd2234319bf2625a3f89e60764a3 commit 9ef382e06546dd2234319bf2625a3f89e60764a3 Author: Milan Obuch AuthorDate: 2022-04-02 18:28:33 +0000 Commit: Eugene Grosbein CommitDate: 2022-04-16 19:18:14 +0000 MFC: 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 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