[PATCH] RDMA/irdma: fix Kconfig dependency

[PATCH] RDMA/irdma: fix Kconfig dependency

[Wentao Guan]

Any combination of (IDPF || ICE || I40E) can register auxiliary_dev,
so use '||' instead of '&&' in IRDMA config.

Cc: stable@vger.kernel.org
Fixes: 060842fed53f ("RDMA/irdma: Update Kconfig")
Fixes: fa0cf568fd76 ("RDMA/irdma: Add irdma Kconfig/Makefile and remove i40iw")
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

---
PS: found in stable v6.12.58, it makes IRDMA be removed when select ICE+I40E+(!IDPF).
---
---
 drivers/infiniband/hw/irdma/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/irdma/Kconfig b/drivers/infiniband/hw/irdma/Kconfig
index 0bd7e3fca1fbb..83a55b23c1325 100644
--- a/drivers/infiniband/hw/irdma/Kconfig
+++ b/drivers/infiniband/hw/irdma/Kconfig
@@ -4,7 +4,7 @@ config INFINIBAND_IRDMA
 	depends on INET
 	depends on IPV6 || !IPV6
 	depends on PCI
-	depends on IDPF && ICE && I40E
+	depends on IDPF || ICE || I40E
 	select GENERIC_ALLOCATOR
 	select AUXILIARY_BUS
 	select CRC32

base-commit: 9b9e43704d2b05514aeeaea36311addba2c72408
-- 
2.20.1

RE: [PATCH] RDMA/irdma: fix Kconfig dependency

[Nikolova, Tatyana E]

> -----Original Message-----
> From: Wentao Guan <guanwentao@uniontech.com>
> Sent: Monday, November 17, 2025 6:06 AM
> To: leon@kernel.org
> Cc: shiraz.saleem@intel.com; Nikolova, Tatyana E
> <tatyana.e.nikolova@intel.com>; linux-rdma@vger.kernel.org; linux-
> kernel@vger.kernel.org; zhanjun@uniontech.com;
> niecheng1@uniontech.com; Wentao Guan <guanwentao@uniontech.com>;
> stable@vger.kernel.org
> Subject: [PATCH] RDMA/irdma: fix Kconfig dependency
> 
> Any combination of (IDPF || ICE || I40E) can register auxiliary_dev, so use '||'
> instead of '&&' in IRDMA config.
> 
> Cc: stable@vger.kernel.org
> Fixes: 060842fed53f ("RDMA/irdma: Update Kconfig")
> Fixes: fa0cf568fd76 ("RDMA/irdma: Add irdma Kconfig/Makefile and remove
> i40iw")
> Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
> 
> ---
> PS: found in stable v6.12.58, it makes IRDMA be removed when select
> ICE+I40E+(!IDPF).


Hi Wentao, 

Thank you for finding this. The Kconfig dependency change 060842fed53f ("RDMA/irdma: Update Kconfig") went in linux kernel 6.18 where RDMA IDPF support was merged. 

Even though IDPF driver exists in older kernels, it doesn't provide RDMA support so there is no need for IRDMA to depend on IDPF in kernels <= 6.17.

060842fed53f ("RDMA/irdma: Update Kconfig") patch shouldn't have been backported in kernels <= 6.17 and it should be reverted.

Then the line "depends on ICE && I40E" should resolve the issue you are seeing.

diff --git a/drivers/infiniband/hw/irdma/Kconfig b/drivers/infiniband/hw/irdma/Kconfig
index 5f49a58590ed7..0bd7e3fca1fbb 100644
--- a/drivers/infiniband/hw/irdma/Kconfig
+++ b/drivers/infiniband/hw/irdma/Kconfig
@@ -4,10 +4,11 @@ config INFINIBAND_IRDMA
 	depends on INET
 	depends on IPV6 || !IPV6
 	depends on PCI
-	depends on ICE && I40E
+	depends on IDPF && ICE && I40E
 	select GENERIC_ALLOCATOR
 	select AUXILIARY_BUS
 	select CRC32
 	help
-	  This is an Intel(R) Ethernet Protocol Driver for RDMA driver
-	  that support E810 (iWARP/RoCE) and X722 (iWARP) network devices.
+	  This is an Intel(R) Ethernet Protocol Driver for RDMA that
+	  supports IPU E2000 (RoCEv2), E810 (iWARP/RoCEv2) and X722 (iWARP)
+	  network devices.


Thank you,
Tatyana











> ---
> ---
>  drivers/infiniband/hw/irdma/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/infiniband/hw/irdma/Kconfig
> b/drivers/infiniband/hw/irdma/Kconfig
> index 0bd7e3fca1fbb..83a55b23c1325 100644
> --- a/drivers/infiniband/hw/irdma/Kconfig
> +++ b/drivers/infiniband/hw/irdma/Kconfig
> @@ -4,7 +4,7 @@ config INFINIBAND_IRDMA
>  	depends on INET
>  	depends on IPV6 || !IPV6
>  	depends on PCI
> -	depends on IDPF && ICE && I40E
> +	depends on IDPF || ICE || I40E
>  	select GENERIC_ALLOCATOR
>  	select AUXILIARY_BUS
>  	select CRC32
> 
> base-commit: 9b9e43704d2b05514aeeaea36311addba2c72408
> --
> 2.20.1

Re:RE: [PATCH] RDMA/irdma: fix Kconfig dependency

[Wentao Guan]

Fine, thanks.

BRs
Wentao Guan