From nobody Tue Apr 09 22:03:47 2024 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 4VDg2q5dVKz5G6SS; Tue, 9 Apr 2024 22:03:47 +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 4VDg2q2BzRz58dW; Tue, 9 Apr 2024 22:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712700227; 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=qDckFs347SEnxoMGl633XsO6YpwsYZjeWiJT4upuNNo=; b=qYweuBM3tGhfTlKXCyZVeqCxzdS2I6FTx8bf+rB4jt2cB48rCHyD40NX4pdLPi+fSPC4bl pnXgPTN8YfwdAU0MqaRkbN1h2TA69OokhAYbtw3cK/BtZ73srovprJJoytZyVHFEevCAYE 0dE0Ik8ocZUJ5+MLSVx8eTGfTbH07bS7S1ZENpbdsBFTzkeMrZ7V848HewThCJjT1fDb8G T8ZtBdKUuL1znbq2VO6y8UwJydgMh3wrMggvyDiy+GNRuumNksrvZRzjrPIgwZ9OXE+2w4 pYfCGhWhDmAMhs/mp/ELBdAZ9dIISB2Fc47PFz0vBpQmP9V1jP7zXhsqF/IsuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712700227; a=rsa-sha256; cv=none; b=UgzlVEwn/p7MNLl6VEP5DofV9prPBzJVwd6VROAaRBWUvljfyeQjBPwtN+FTnYTlMFUpCz +aEftqZX+gLtfF+BdJ0JLtCNtaJ3qMuwLKpbOVFL7Xjg0UKWOG76RGllhKbOELYlBv7jj/ Al0+GkL7wIj5LgeHFsHAWUlDDrA9RXPz1Bcii1NyysKcj2bCQGy75KVQGhuJcD9TlCVEL7 mojFliDMuVqjs7fBagrqVYIi8kPuPZch04sdFD8P94Y43ILwAEtwiIkdgCe7rlQnLEltPQ awn0uX0HttgaG2Rkkue6W2r3Cnyho+AZAEIYNDLgmCNERJUEnN0ZGmt+bJSdxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712700227; 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=qDckFs347SEnxoMGl633XsO6YpwsYZjeWiJT4upuNNo=; b=edee8Nz1J7LfiCVI8/isXXwGEatveIVSENUtqrKPrGCX7Wb6++rV+Rroocps8YbK2UjwPN svDh2/D5li/UcrGqSFT5z2RZOpPuSIjK4iQfYGIu+lnx8OFT9QK+ak8FZMz2VACQz3Fvh2 smZ2aNaFffpHIU4YTwPmZlaTFGUirbu0lgHcTOQsMTrklcfjFaQ5yCdu74ElkpU6t0g676 p6w4tCqI482XLZERutJq7YuE6tjCzmWkV3Oc8B3YqipljaDa0lR+2sVVWh609u7FIxNLHe Ki96zppdP/GtO8JbbY8DJpOJJ9H96hEINPgWqb8Oc9IsOiIl19mNAOSK4C3c+w== 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 4VDg2q1pmMz1BFS; Tue, 9 Apr 2024 22:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 439M3lqj049575; Tue, 9 Apr 2024 22:03:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439M3lcJ049572; Tue, 9 Apr 2024 22:03:47 GMT (envelope-from git) Date: Tue, 9 Apr 2024 22:03:47 GMT Message-Id: <202404092203.439M3lcJ049572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 16e846fa1ed3 - main - sys: Enable NVMe drivers on all architectures 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: dev-commits-src-all+owner@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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16e846fa1ed3c97419b55b292f77b0f4209f0875 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=16e846fa1ed3c97419b55b292f77b0f4209f0875 commit 16e846fa1ed3c97419b55b292f77b0f4209f0875 Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-04-09 22:02:58 +0000 sys: Enable NVMe drivers on all architectures The NVMe drivers are portable and are already included statically in GENERIC on other architectures such as aarch64 and riscv64. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44690 --- share/man/man4/Makefile | 11 ++--------- sys/modules/Makefile | 8 ++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index c3f5e3223bf9..b668cccf50ae 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -404,9 +404,9 @@ MAN= aac.4 \ ${_if_ntb.4} \ null.4 \ numa.4 \ - ${_nvd.4} \ + nvd.4 \ ${_nvdimm.4} \ - ${_nvme.4} \ + nvme.4 \ ${_nvram.4} \ oce.4 \ ocs_fc.4\ @@ -836,8 +836,6 @@ _ntb_hw_amd.4= ntb_hw_amd.4 _ntb_hw_intel.4= ntb_hw_intel.4 _ntb_hw_plx.4= ntb_hw_plx.4 _ntb_transport.4=ntb_transport.4 -_nvd.4= nvd.4 -_nvme.4= nvme.4 _nvram.4= nvram.4 _padlock.4= padlock.4 _pchtherm.4= pchtherm.4 @@ -885,11 +883,6 @@ _vmm.4= vmm.4 .endif .endif -.if ${MACHINE_CPUARCH} == "powerpc" -_nvd.4= nvd.4 -_nvme.4= nvme.4 -.endif - .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "aarch64" _gve.4= gve.4 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 748b0b18a14d..aab0865a842d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -290,9 +290,9 @@ SUBDIR= \ nmdm \ nullfs \ ${_ntb} \ - ${_nvd} \ + nvd \ ${_nvdimm} \ - ${_nvme} \ + nvme \ ${_nvram} \ oce \ ${_ocs_fc} \ @@ -795,8 +795,6 @@ _iwmfw= iwmfw _iwnfw= iwnfw .endif _nfe= nfe -_nvd= nvd -_nvme= nvme _nvram= nvram .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock @@ -880,8 +878,6 @@ _cfi= cfi _cpufreq= cpufreq _exca= exca _ffec= ffec -_nvd= nvd -_nvme= nvme .endif .if ${MACHINE_ARCH:Mpowerpc64*} != ""