Commit 7fd71f31 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

ice: fix reservation of resources for RDMA when disabled 



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: d25a0fc4 ("ice: Initialize RDMA support")
Signed-off-by: default avatarJesse Brandeburg <jbrandeburg@cloudflare.com>
Acked-by: default avatarDave Ertman <david.m.ertman@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 53ce7166

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

+2 −1
Original line number Diff line number Diff line
@@ -2271,6 +2271,7 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, 
			  caps->nvm_unified_update);

		break;

	case ICE_AQC_CAPS_RDMA:

		if (IS_ENABLED(CONFIG_INFINIBAND_IRDMA))

			caps->rdma = (number == 1);

		ice_debug(hw, ICE_DBG_INIT, "%s: rdma = %d\n", prefix, caps->rdma);

		break;