The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=76f22e353f66d9ec1c1bea1d72eeec56078d4728
commit 76f22e353f66d9ec1c1bea1d72eeec56078d4728
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2024-04-09 22:02:58 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2024-04-09 22:02:58 +0000
NOTES: Add devices for iSCSI support
Reviewed by: imp
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D44688
---
sys/arm/conf/NOTES | 1 +
sys/conf/NOTES | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 9d084096e66f..db7da3ff1ea6 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -79,6 +79,7 @@ nooptions SDP
nooptions IPOIB
nooptions IPOIB_CM
+nodevice iser
nodevice sym
nodevice ccr
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e41e89c30130..b15f2fdd22f5 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1461,6 +1461,19 @@ options SCSI_PT_DEFAULT_TIMEOUT=60
# a topology with the SES device that's on the box these drives are in....
options SES_ENABLE_PASSTHROUGH
+# iSCSI
+#
+# iSCSI permits access to SCSI peripherals over a network connection
+# (e.g. via a TCP/IP socket)
+
+device cfiscsi # CAM Target Layer iSCSI target frontend
+device iscsi # iSCSI initiator
+device iser # iSCSI Extensions for RDMA (iSER) initiator
+
+# Options used in dev/iscsi (Software iSCSI stack)
+#
+options ISCSI_INITIATOR_DEBUG=9
+
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
@@ -1620,10 +1633,6 @@ options AHD_REG_PRETTY_PRINT
# Bitmap of units to enable targetmode operations.
options AHD_TMODE_ENABLE
-# Options used in dev/iscsi (Software iSCSI stack)
-#
-options ISCSI_INITIATOR_DEBUG=9
-
# Options used in dev/isp/ (Qlogic SCSI/FC driver).
#
# ISP_TARGET_MODE - enable target mode operation
