[PATCH 1/4] bringup.goals: Make siw settings more generic

[cel@kernel.org]

From: Chuck Lever <chuck.lever@oracle.com>

I'm about to introduce another option for software RDMA. Rename
the siw Makefile and Kconfig options to make way for this new
option.

Since only one type of emulated RDMA device can be attached to an
Ethernet device at a time, make the Kconfig logic choose between
no device, siw, or, when it's added, rxe.

NB: This patch replaces CONFIG_KDEVOPS_SETUP_SIW. If you have
enabled siw in your configuration, please visit the config setting
for software RDMA after applying this patch.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 Makefile                                |  2 +-
 kconfigs/Kconfig.bringup.goals          | 26 +++++++++++++++++++------
 scripts/{siw.Makefile => rdma.Makefile} |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
 rename scripts/{siw.Makefile => rdma.Makefile} (79%)

diff --git a/Makefile b/Makefile
index 266eccd90111..20c2081118a9 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ ifeq (y,$(CONFIG_WORKFLOWS))
 include workflows/Makefile
 endif # CONFIG_WORKFLOWS
 
-include scripts/siw.Makefile
+include scripts/rdma.Makefile
 include scripts/ktls.Makefile
 include scripts/nfsd.Makefile
 include scripts/smbd.Makefile
diff --git a/kconfigs/Kconfig.bringup.goals b/kconfigs/Kconfig.bringup.goals
index e6d3b1815f3b..e8629ebea5e0 100644
--- a/kconfigs/Kconfig.bringup.goals
+++ b/kconfigs/Kconfig.bringup.goals
@@ -77,16 +77,30 @@ config KDEVOPS_TRY_INSTALL_KDEV_TOOLS
 	  most kernel developers might prefer to have installed on target
 	  systems.
 
-config KDEVOPS_SETUP_SIW
-	bool "Configure soft iWARP on all test systems"
-	default n
+choice
+	prompt "Configure an RDMA device"
+	default KDEVOPS_SETUP_RDMA_NONE
 	help
-	  Configure software-emulated RDMA on all target hosts via the
+	  Provision an RDMA device on target nodes. The default is to
+	  provision no additional RDMA devices.
+
+config KDEVOPS_SETUP_RDMA_NONE
+	bool "none"
+	help
+	  Do not provision an additional RDMA device on target nodes.
+	  This is the default behavior.
+
+config KDEVOPS_SETUP_RDMA_SIW
+	bool "siw"
+	help
+	  Provision software-emulated RDMA on target nodes via the
 	  kernel siw.ko driver. siw can be used with any standard
 	  Ethernet device, including virtio-net devices.
 
-	  Because siw is currently not enabled in most Linux distro
-	  kernels, this option defaults to N.
+	  To use this device driver, enable the CONFIG_RDMA_SIW
+	  option in your test kernels.
+
+endchoice
 
 config KDEVOPS_SETUP_KTLS
 	bool "Configure ktls on the hosts with self-signed CA"
diff --git a/scripts/siw.Makefile b/scripts/rdma.Makefile
similarity index 79%
rename from scripts/siw.Makefile
rename to scripts/rdma.Makefile
index d09d1a2f82ac..d7cdf0062638 100644
--- a/scripts/siw.Makefile
+++ b/scripts/rdma.Makefile
@@ -1,4 +1,4 @@
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW))
+ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_SIW))
 
 siw:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
-- 
2.45.1