diff options
| author | Dave Ertman <[email protected]> | 2025-04-16 02:15:49 +0000 |
|---|---|---|
| committer | Tony Nguyen <[email protected]> | 2025-05-09 18:35:43 +0000 |
| commit | c24a65b6a27c78d8540409800886b6622ea86ebf (patch) | |
| tree | 98d942b4809897d9c0fc85de3d820b1eb239622a /drivers/net/ethernet/intel/ice/ice_ethtool.c | |
| parent | ice: Replace ice specific DSCP mapping num with a kernel define (diff) | |
| download | kernel-c24a65b6a27c78d8540409800886b6622ea86ebf.tar.gz kernel-c24a65b6a27c78d8540409800886b6622ea86ebf.zip | |
iidc/ice/irdma: Update IDC to support multiple consumers
In preparation of supporting more than a single core PCI driver
for RDMA, move ice specific structs like qset_params, qos_info
and qos_params from iidc_rdma.h to iidc_rdma_ice.h.
Previously, the ice driver was just exporting its entire PF struct
to the auxiliary driver, but since each core driver will have its own
different PF struct, implement a universal struct that all core drivers
can provide to the auxiliary driver through the probe call.
Reviewed-by: Przemek Kitszel <[email protected]>
Signed-off-by: Dave Ertman <[email protected]>
Co-developed-by: Mustafa Ismail <[email protected]>
Signed-off-by: Mustafa Ismail <[email protected]>
Co-developed-by: Shiraz Saleem <[email protected]>
Signed-off-by: Shiraz Saleem <[email protected]>
Co-developed-by: Tatyana Nikolova <[email protected]>
Signed-off-by: Tatyana Nikolova <[email protected]>
Signed-off-by: Tony Nguyen <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index 7c2dc347e4e5..46fbcd391a80 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -3964,11 +3964,11 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch) return -EINVAL; } - if (pf->adev) { + if (pf->cdev_info && pf->cdev_info->adev) { mutex_lock(&pf->adev_mutex); - device_lock(&pf->adev->dev); + device_lock(&pf->cdev_info->adev->dev); locked = true; - if (pf->adev->dev.driver) { + if (pf->cdev_info->adev->dev.driver) { netdev_err(dev, "Cannot change channels when RDMA is active\n"); ret = -EBUSY; goto adev_unlock; @@ -3987,7 +3987,7 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch) adev_unlock: if (locked) { - device_unlock(&pf->adev->dev); + device_unlock(&pf->cdev_info->adev->dev); mutex_unlock(&pf->adev_mutex); } return ret; |