Commit 2be29286 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen

ice: alloc id for RDMA using xa_array

Use xa_array instead of deprecated ida to alloc id for RDMA aux driver.
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2b8db6af
......@@ -6,7 +6,7 @@
#include "ice_lib.h"
#include "ice_dcb_lib.h"
static DEFINE_IDA(ice_aux_ida);
static DEFINE_XARRAY_ALLOC1(ice_aux_id);
/**
* ice_get_auxiliary_drv - retrieve iidc_auxiliary_drv struct
......@@ -349,8 +349,9 @@ int ice_init_rdma(struct ice_pf *pf)
return 0;
}
pf->aux_idx = ida_alloc(&ice_aux_ida, GFP_KERNEL);
if (pf->aux_idx < 0) {
ret = xa_alloc(&ice_aux_id, &pf->aux_idx, NULL, XA_LIMIT(1, INT_MAX),
GFP_KERNEL);
if (ret) {
dev_err(dev, "Failed to allocate device ID for AUX driver\n");
return -ENOMEM;
}
......@@ -371,7 +372,7 @@ int ice_init_rdma(struct ice_pf *pf)
ice_free_rdma_qvector(pf);
err_reserve_rdma_qvector:
pf->adev = NULL;
ida_free(&ice_aux_ida, pf->aux_idx);
xa_erase(&ice_aux_id, pf->aux_idx);
return ret;
}
......@@ -386,5 +387,5 @@ void ice_deinit_rdma(struct ice_pf *pf)
ice_unplug_aux_dev(pf);
ice_free_rdma_qvector(pf);
ida_free(&ice_aux_ida, pf->aux_idx);
xa_erase(&ice_aux_id, pf->aux_idx);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment