Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Jul 2023 17:10:18 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: e4017d9b6913 - main - qlnxe: Fix building as in-kernel component
Message-ID:  <202307011710.361HAIak047183@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=e4017d9b6913257b1ca6735ab1159f805419d2ec

commit e4017d9b6913257b1ca6735ab1159f805419d2ec
Author:     Mark O'Donovan <shiftee@posteo.net>
AuthorDate: 2023-07-01 17:06:51 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-07-01 17:06:59 +0000

    qlnxe: Fix building as in-kernel component
    
    Add some extra files for building the driver as part of the kernel.
    Change some #defines to match those used when building as a module.
    
    PR: 268354
    
    Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/779
---
 sys/conf/files.amd64       | 16 ++++++++++++++++
 sys/dev/qlnx/qlnxe/ecore.h |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index dd80c357a502..37e069da5918 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -297,6 +297,22 @@ dev/qlnx/qlnxe/ecore_sp_commands.c optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_spq.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_sriov.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_vf.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_ll2.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_iwarp.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_rdma.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_roce.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/ecore_ooo.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
+dev/qlnx/qlnxe/qlnx_rdma.c	optional	qlnxe pci \
+	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/qlnx_ioctl.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/qlnx_os.c	optional	qlnxe pci \
diff --git a/sys/dev/qlnx/qlnxe/ecore.h b/sys/dev/qlnx/qlnxe/ecore.h
index b83e777dac8e..3169e9cda6df 100644
--- a/sys/dev/qlnx/qlnxe/ecore.h
+++ b/sys/dev/qlnx/qlnxe/ecore.h
@@ -94,9 +94,10 @@ enum ecore_nvm_cmd {
 #define CONFIG_ECORE_SRIOV
 #define CONFIG_ECORE_ROCE
 #define CONFIG_ECORE_IWARP
-#define CONFIG_ECORE_FCOE
-#define CONFIG_ECORE_ISCSI
 #define CONFIG_ECORE_LL2
+#define CONFIG_ECORE_RDMA
+#define ECORE_CONFIG_DIRECT_HWFN
+#define QLNX_ENABLE_IWARP
 #endif
 #endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307011710.361HAIak047183>