Skip to content

Commit 932d999

Browse files
committed
ice: fix reservation of resources for RDMA when disabled
jira LE-4694 Rebuild_History Non-Buildable kernel-6.12.0-55.43.1.el10_0 commit-author Jesse Brandeburg <jbrandeburg@cloudflare.com> commit 7fd71f3 If the CONFIG_INFINIBAND_IRDMA symbol is not enabled as a module or a built-in, then don't let the driver reserve resources for RDMA. The result of this change is a large savings in resources for older kernels, and a cleaner driver configuration for the IRDMA=n case for old and new kernels. Implement this by avoiding enabling the RDMA capability when scanning hardware capabilities. Note: Loading the out-of-tree irdma driver in connection to the in-kernel ice driver, is not supported, and should not be attempted, especially when disabling IRDMA in the kernel config. Fixes: d25a0fc ("ice: Initialize RDMA support") Signed-off-by: Jesse Brandeburg <jbrandeburg@cloudflare.com> Acked-by: Dave Ertman <david.m.ertman@intel.com> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> (cherry picked from commit 7fd71f3) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent ca7f4c1 commit 932d999

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/ethernet/intel/ice/ice_common.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2157,7 +2157,8 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps,
21572157
caps->nvm_unified_update);
21582158
break;
21592159
case ICE_AQC_CAPS_RDMA:
2160-
caps->rdma = (number == 1);
2160+
if (IS_ENABLED(CONFIG_INFINIBAND_IRDMA))
2161+
caps->rdma = (number == 1);
21612162
ice_debug(hw, ICE_DBG_INIT, "%s: rdma = %d\n", prefix, caps->rdma);
21622163
break;
21632164
case ICE_AQC_CAPS_MAX_MTU:

0 commit comments

Comments
 (0)